rndis_wlan: remove unused variables from priv structure
Some variables were left unused after cfg80211 conversion. Remove those and related deadcode. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Родитель
80f8c5b434
Коммит
ea29d65ea4
|
@ -476,13 +476,7 @@ struct rndis_wlan_private {
|
||||||
/* encryption stuff */
|
/* encryption stuff */
|
||||||
int encr_tx_key_index;
|
int encr_tx_key_index;
|
||||||
struct rndis_wlan_encr_key encr_keys[4];
|
struct rndis_wlan_encr_key encr_keys[4];
|
||||||
enum nl80211_auth_type wpa_auth_type;
|
|
||||||
int wpa_version;
|
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];
|
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_version = wpa_version;
|
||||||
priv->wpa_auth_type = auth_type;
|
|
||||||
priv->wpa_keymgmt = keymgmt;
|
|
||||||
|
|
||||||
return 0;
|
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)
|
static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
|
||||||
{
|
{
|
||||||
struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev);
|
|
||||||
__le32 tmp;
|
__le32 tmp;
|
||||||
int encr_mode, ret;
|
int encr_mode, ret;
|
||||||
|
|
||||||
|
@ -1171,8 +1162,6 @@ static int set_encr_mode(struct usbnet *usbdev, int pairwise, int groupwise)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
priv->wpa_cipher_pair = pairwise;
|
|
||||||
priv->wpa_cipher_group = groupwise;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2871,9 +2860,6 @@ static void rndis_wlan_unbind(struct usbnet *usbdev, struct usb_interface *intf)
|
||||||
flush_workqueue(priv->workqueue);
|
flush_workqueue(priv->workqueue);
|
||||||
destroy_workqueue(priv->workqueue);
|
destroy_workqueue(priv->workqueue);
|
||||||
|
|
||||||
if (priv && priv->wpa_ie_len)
|
|
||||||
kfree(priv->wpa_ie);
|
|
||||||
|
|
||||||
rndis_unbind(usbdev, intf);
|
rndis_unbind(usbdev, intf);
|
||||||
|
|
||||||
wiphy_unregister(priv->wdev.wiphy);
|
wiphy_unregister(priv->wdev.wiphy);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче