From patchwork Thu Mar 4 16:27:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jussi Kivilinna X-Patchwork-Id: 83630 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o24GRGjJ012655 for ; Thu, 4 Mar 2010 16:27:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755068Ab0CDQ1P (ORCPT ); Thu, 4 Mar 2010 11:27:15 -0500 Received: from sypressi.dnainternet.net ([83.102.40.135]:46007 "EHLO sypressi.dnainternet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754869Ab0CDQ1O (ORCPT ); Thu, 4 Mar 2010 11:27:14 -0500 Received: from localhost (localhost [127.0.0.1]) by sypressi.dnainternet.net (Postfix) with ESMTP id 7D5BFC615C; Thu, 4 Mar 2010 18:27:13 +0200 (EET) X-Virus-Scanned: DNA Postiturva at dnainternet.net X-Spam-Flag: NO X-Spam-Score: 1.814 X-Spam-Level: * X-Spam-Status: No, score=1.814 tagged_above=-9999 required=6 tests=[AWL=-0.888, HELO_LH_HOME=2.602, RDNS_DYNAMIC=0.1] Received: from sypressi.dnainternet.net ([83.102.40.135]) by localhost (sypressi.dnainternet.net [127.0.0.1]) (amavisd-new, port 10041) with ESMTP id QBdzzc2h22ih; Thu, 4 Mar 2010 18:27:13 +0200 (EET) Received: from oliivipuu.dnainternet.net (oliivipuu.dnainternet.net [83.102.40.215]) by sypressi.dnainternet.net (Postfix) with ESMTP id 58273C61D5; Thu, 4 Mar 2010 18:27:13 +0200 (EET) Received: from fate.lan (dyn2-85-23-163-23.psoas.suomi.net [85.23.163.23]) by oliivipuu.dnainternet.net (Postfix) with ESMTP id 03ADB7F00A; Thu, 4 Mar 2010 18:27:12 +0200 (EET) From: Jussi Kivilinna Subject: [PATCH 2/4] rndis_wlan: remove unused variables from priv structure To: "John W. Linville" Cc: linux-wireless@vger.kernel.org Date: Thu, 04 Mar 2010 18:27:12 +0200 Message-ID: <20100304162707.2609.33783.stgit@fate.lan> In-Reply-To: <20100304162657.2609.64867.stgit@fate.lan> References: <20100304162657.2609.64867.stgit@fate.lan> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 04 Mar 2010 16:27:16 +0000 (UTC) diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index a4f70de..15bae0a 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c @@ -476,13 +476,7 @@ struct rndis_wlan_private { /* encryption stuff */ int encr_tx_key_index; struct rndis_wlan_encr_key encr_keys[4]; - enum nl80211_auth_type wpa_auth_type; int wpa_version; - int wpa_keymgmt; - int wpa_ie_len; - u8 *wpa_ie; - int wpa_cipher_pair; - int wpa_cipher_group; u8 command_buffer[COMMAND_BUFFER_SIZE]; }; @@ -1116,8 +1110,6 @@ static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version, } priv->wpa_version = wpa_version; - priv->wpa_auth_type = auth_type; - priv->wpa_keymgmt = keymgmt; return 0; } @@ -1142,7 +1134,6 @@ static int set_priv_filter(struct usbnet *usbdev) static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise) { - struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); __le32 tmp; int encr_mode, ret; @@ -1171,8 +1162,6 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise) return ret; } - priv->wpa_cipher_pair = pairwise; - priv->wpa_cipher_group = groupwise; return 0; } @@ -2871,9 +2860,6 @@ static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf) flush_workqueue(priv->workqueue); destroy_workqueue(priv->workqueue); - if (priv && priv->wpa_ie_len) - kfree(priv->wpa_ie); - rndis_unbind(usbdev, intf); wiphy_unregister(priv->wdev.wiphy);