diff options
| -rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index a4f70de99cdd..15bae0a68054 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -476,13 +476,7 @@ struct rndis_wlan_private { | |||
| 476 | /* encryption stuff */ | 476 | /* encryption stuff */ |
| 477 | int encr_tx_key_index; | 477 | int encr_tx_key_index; |
| 478 | struct rndis_wlan_encr_key encr_keys[4]; | 478 | struct rndis_wlan_encr_key encr_keys[4]; |
| 479 | enum nl80211_auth_type wpa_auth_type; | ||
| 480 | int wpa_version; | 479 | int wpa_version; |
| 481 | int wpa_keymgmt; | ||
| 482 | int wpa_ie_len; | ||
| 483 | u8 *wpa_ie; | ||
| 484 | int wpa_cipher_pair; | ||
| 485 | int wpa_cipher_group; | ||
| 486 | 480 | ||
| 487 | u8 command_buffer[COMMAND_BUFFER_SIZE]; | 481 | u8 command_buffer[COMMAND_BUFFER_SIZE]; |
| 488 | }; | 482 | }; |
| @@ -1116,8 +1110,6 @@ static int set_auth_mode(struct usbnet *usbdev, u32 wpa_version, | |||
| 1116 | } | 1110 | } |
| 1117 | 1111 | ||
| 1118 | priv->wpa_version = wpa_version; | 1112 | priv->wpa_version = wpa_version; |
| 1119 | priv->wpa_auth_type = auth_type; | ||
| 1120 | priv->wpa_keymgmt = keymgmt; | ||
| 1121 | 1113 | ||
| 1122 | return 0; | 1114 | return 0; |
| 1123 | } | 1115 | } |
| @@ -1142,7 +1134,6 @@ static int set_priv_filter(struct usbnet *usbdev) | |||
| 1142 | 1134 | ||
| 1143 | static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise) | 1135 | static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise) |
| 1144 | { | 1136 | { |
| 1145 | struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); | ||
| 1146 | __le32 tmp; | 1137 | __le32 tmp; |
| 1147 | int encr_mode, ret; | 1138 | int encr_mode, ret; |
| 1148 | 1139 | ||
| @@ -1171,8 +1162,6 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise) | |||
| 1171 | return ret; | 1162 | return ret; |
| 1172 | } | 1163 | } |
| 1173 | 1164 | ||
| 1174 | priv->wpa_cipher_pair = pairwise; | ||
| 1175 | priv->wpa_cipher_group = groupwise; | ||
| 1176 | return 0; | 1165 | return 0; |
| 1177 | } | 1166 | } |
| 1178 | 1167 | ||
| @@ -2871,9 +2860,6 @@ static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf) | |||
| 2871 | flush_workqueue(priv->workqueue); | 2860 | flush_workqueue(priv->workqueue); |
| 2872 | destroy_workqueue(priv->workqueue); | 2861 | destroy_workqueue(priv->workqueue); |
| 2873 | 2862 | ||
| 2874 | if (priv && priv->wpa_ie_len) | ||
| 2875 | kfree(priv->wpa_ie); | ||
| 2876 | |||
| 2877 | rndis_unbind(usbdev, intf); | 2863 | rndis_unbind(usbdev, intf); |
| 2878 | 2864 | ||
| 2879 | wiphy_unregister(priv->wdev.wiphy); | 2865 | wiphy_unregister(priv->wdev.wiphy); |
