diff options
author | Glen Lee | 2015-10-20 10:13:58 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-10-25 02:16:57 +0100 |
commit | c1ec2c12a3f238a7a7a0397bfd164b596316968a (patch) | |
tree | f0980807cbbfb7077b3ee063a2ae75eaf1a82b4d /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |
parent | staging: wilc1000: wilc1000_wlan_deinit: change argument and use wilc (diff) | |
download | kernel-qcow2-linux-c1ec2c12a3f238a7a7a0397bfd164b596316968a.tar.gz kernel-qcow2-linux-c1ec2c12a3f238a7a7a0397bfd164b596316968a.tar.xz kernel-qcow2-linux-c1ec2c12a3f238a7a7a0397bfd164b596316968a.zip |
staging: wilc1000: CfgConnectResult: use netdev private wilc
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 33a082f6a74a..153380490425 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -537,11 +537,15 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, struct net_device *dev; struct host_if_drv *pstrWFIDrv; u8 NullBssid[ETH_ALEN] = {0}; + struct wilc *wl; + perInterface_wlan_t *nic; connecting = 0; priv = (struct wilc_priv *)pUserVoid; dev = priv->dev; + nic = netdev_priv(dev); + wl = nic->wilc; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv; if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) { @@ -624,12 +628,12 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, u8WLANChannel = INVALID_CHANNEL; /*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change * virtual interface to station*/ - if ((pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->vif[1].ndev)) { + if ((pstrWFIDrv->IFC_UP) && (dev == wl->vif[1].ndev)) { pstrDisconnectNotifInfo->u16reason = 3; } /*Incase "P2P CLIENT during connection(not connected)" send deauthentication reason by 1 to force the WPA_SUPPLICANT * to scan again and retry the connection*/ - else if ((!pstrWFIDrv->IFC_UP) && (dev == g_linux_wlan->vif[1].ndev)) { + else if ((!pstrWFIDrv->IFC_UP) && (dev == wl->vif[1].ndev)) { pstrDisconnectNotifInfo->u16reason = 1; } cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie, |