summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Lee <glen.lee@atmel.com>2015-10-20 17:14:00 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-24 18:16:57 -0700
commit692e2aceffd00f91a846f6e628277222899b198e (patch)
treed3fc5d21e1bf255dcf74242766b844a29779bb1b
parent7646920087bc523b4ef1fa2b00cbbf3a6c0cc1c1 (diff)
downloadlinux-stable-692e2aceffd00f91a846f6e628277222899b198e.tar.gz
linux-stable-692e2aceffd00f91a846f6e628277222899b198e.tar.bz2
linux-stable-692e2aceffd00f91a846f6e628277222899b198e.zip
staging: wilc1000: del_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: Glen Lee <glen.lee@atmel.com> Signed-off-by: Tony Cho <tony.cho@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/wilc1000/wilc_wfi_cfgoperations.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 8aea4b560b2e..eea7f3b1e416 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1360,11 +1360,15 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev,
const u8 *mac_addr)
{
struct wilc_priv *priv;
+ struct wilc *wl;
+ perInterface_wlan_t *nic;
priv = wiphy_priv(wiphy);
+ nic = netdev_priv(netdev);
+ wl = nic->wilc;
/*delete saved keys, if any*/
- if (netdev == g_linux_wlan->vif[0].ndev) {
+ if (netdev == wl->vif[0].ndev) {
g_ptk_keys_saved = false;
g_gtk_keys_saved = false;
g_wep_keys_saved = false;