From: Glen Lee <glen....@atmel.com>
Use netdev private data member wilc instead of global variable g_linux_wlan.
Signed-off-by: Glen Lee <glen....@atmel.com>
Signed-off-by: Tony Cho <tony....@atmel.com>
---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 1533804..8aea4b5 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -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) {
--
1.9.1
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
