Commit 76469200 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: add_key: use netdev private wilc instead of g_linux_wlan 



Use netdev private data member wilc instead of global variable g_linux_wlan.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1ec2c12

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+6 −2
Original line number Diff line number Diff line
@@ -1086,8 +1086,12 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 
	u8 u8gmode = NO_ENCRYPT;

	u8 u8pmode = NO_ENCRYPT;

	enum AUTHTYPE tenuAuth_type = ANY;

	struct wilc *wl;

	perInterface_wlan_t *nic;



	priv = wiphy_priv(wiphy);

	nic = netdev_priv(netdev);

	wl = nic->wilc;



	PRINT_D(CFG80211_DBG, "Adding key with cipher suite = %x\n", params->cipher);
@@ -1259,7 +1263,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 
				}



				/*save keys only on interface 0 (wifi interface)*/

				if (!g_gtk_keys_saved && netdev == g_linux_wlan->vif[0].ndev) {

				if (!g_gtk_keys_saved && netdev == wl->vif[0].ndev) {

					g_add_gtk_key_params.key_idx = key_index;

					g_add_gtk_key_params.pairwise = pairwise;

					if (!mac_addr) {
@@ -1295,7 +1299,7 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index, 
				}



				/*save keys only on interface 0 (wifi interface)*/

				if (!g_ptk_keys_saved && netdev == g_linux_wlan->vif[0].ndev) {

				if (!g_ptk_keys_saved && netdev == wl->vif[0].ndev) {

					g_add_ptk_key_params.key_idx = key_index;

					g_add_ptk_key_params.pairwise = pairwise;

					if (!mac_addr) {