From 6d21780eeb6f64f9523a0c092c07185d9ef1ee2a Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Thu, 4 Mar 2010 18:27:12 +0200 Subject: [PATCH] --- yaml --- r: 193727 b: refs/heads/master c: ea29d65ea4e7585a5ac94f7ec0069d384315bd77 h: refs/heads/master i: 193725: 1d7165aeed9906aa5e67ff4c45fdeb5306800f5d 193723: 07c5410524baca947e9ea3c814d422aa0026b59c 193719: 27bc768552689d45ee41ae263ddb491714207126 193711: 5ac95a29f6205171e6ed8bc1a9f075b747fe3148 193695: f1588129ea94e32a2d00763abf7189ff5924996a 193663: 5e77599638dfb0eb83aee0161d10c9f094757d5d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 8a3bcb8fc15a..661129368452 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80f8c5b434f94926c6489d7350d58aecb53ab70f +refs/heads/master: ea29d65ea4e7585a5ac94f7ec0069d384315bd77 diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index a4f70de99cdd..15bae0a68054 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/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);