diff options
| author | Glen Lee | 2015-10-20 10:13:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 02:16:57 +0100 |
| commit | 7646920087bc523b4ef1fa2b00cbbf3a6c0cc1c1 (patch) | |
| tree | 00fd13e40def0e1ff43c4cd3dfc0c7a7e2d2e61e /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |
| parent | staging: wilc1000: CfgConnectResult: use netdev private wilc (diff) | |
| download | kernel-qcow2-linux-7646920087bc523b4ef1fa2b00cbbf3a6c0cc1c1.tar.gz kernel-qcow2-linux-7646920087bc523b4ef1fa2b00cbbf3a6c0cc1c1.tar.xz kernel-qcow2-linux-7646920087bc523b4ef1fa2b00cbbf3a6c0cc1c1.zip | |
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: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_cfgoperations.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 153380490425..8aea4b560b2e 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) { |