forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: wilc1000: CfgConnectResult: use netdev private wilc

Browse source 
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>
This commit is contained in:
Glen Lee 2015-10-20 17:13:58 +09:00 • committed by Greg Kroah-Hartman
parent 53dc0cfea3
commit c1ec2c12a3
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file

@ -537,11 +537,15 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
struct net_device *dev; struct net_device *dev;
struct host_if_drv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
struct wilc *wl;
perInterface_wlan_t *nic;
connecting = 0; connecting = 0;
priv = (struct wilc_priv *)pUserVoid; priv = (struct wilc_priv *)pUserVoid;
dev = priv->dev; dev = priv->dev;
nic = netdev_priv(dev);
wl = nic->wilc;
pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) { if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
@ -624,12 +628,12 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent,
u8WLANChannel = INVALID_CHANNEL; u8WLANChannel = INVALID_CHANNEL;
/*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change /*Incase "P2P CLIENT Connected" send deauthentication reason by 3 to force the WPA_SUPPLICANT to directly change
* virtual interface to station*/ * 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; pstrDisconnectNotifInfo->u16reason = 3;
} }
/*Incase "P2P CLIENT during connection(not connected)" send deauthentication reason by 1 to force the WPA_SUPPLICANT /*Incase "P2P CLIENT during connection(not connected)" send deauthentication reason by 1 to force the WPA_SUPPLICANT
* to scan again and retry the connection*/ * 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; pstrDisconnectNotifInfo->u16reason = 1;
} }
cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie, cfg80211_disconnected(dev, pstrDisconnectNotifInfo->u16reason, pstrDisconnectNotifInfo->ie,