Skip to content

Commit

Permalink
rndis_wlan: remove unused variables from priv structure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jussi Kivilinna authored and John W. Linville committed Mar 10, 2010
1 parent 80f8c5b commit ea29d65
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions drivers/net/wireless/rndis_wlan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit ea29d65

Please sign in to comment.