mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

staging: wilc1000: move 'wilc_connecting' static variable to 'wilc_vif' struct 

Move static variable 'wilc_connecting' as part of 'wilc_vif' private
struct. Remove "wilc_" prefix from name as its already part of wilc_vif
struct.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-09-04 12:09:38 +05:30 committed by Greg Kroah-Hartman
parent 3124a1f7bf
commit 804146b4bd
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/wilc1000/host_interface.c
View File

@ -724,7 +724,7 @@ static void handle_scan(struct work_struct *work)
goto error;
}
if (vif->obtaining_ip || wilc_connecting) {
if (vif->obtaining_ip || vif->connecting) {
netdev_err(vif->ndev, "Don't do obss scan\n");
result = -EBUSY;
goto error;
@ -2330,7 +2330,7 @@ static int handle_remain_on_chan(struct wilc_vif *vif,
goto error;
}
if (vif->obtaining_ip || wilc_connecting) {
if (vif->obtaining_ip || vif->connecting) {
result = -EBUSY;
goto error;
}

2
drivers/staging/wilc1000/host_interface.h
View File

@ -361,6 +361,4 @@ int wilc_get_tx_power(struct wilc_vif *vif, u8 *tx_power);
extern u8 wilc_connected_ssid[6];
extern int wilc_connecting;
#endif

18
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View File

@ -453,8 +453,6 @@ static inline bool wilc_cfg_scan_time_expired(struct wilc_priv *priv, int i)
return false;
}
int wilc_connecting;
static void cfg_connect_result(enum conn_event conn_disconn_evt,
struct connect_info *conn_info,
u8 mac_status,
@ -468,7 +466,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt,
struct host_if_drv *wfi_drv = priv->hif_drv;
u8 null_bssid[ETH_ALEN] = {0};
wilc_connecting = 0;
vif->connecting = false;
if (conn_disconn_evt == CONN_DISCONN_EVENT_CONN_RESP) {
u16 connect_status;
@ -666,7 +664,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
enum authtype auth_type = ANY;
u32 cipher_group;
wilc_connecting = 1;
vif->connecting = true;
if (!(strncmp(sme->ssid, "DIRECT-", 7)))
wfi_drv->p2p_connect = 1;
@ -698,7 +696,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
nw_info = &priv->scanned_shadow[sel_bssi_idx];
} else {
ret = -ENOENT;
wilc_connecting = 0;
vif->connecting = false;
return ret;
}
@ -741,7 +739,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
ret = -ENOTSUPP;
netdev_err(dev, "%s: Unsupported cipher\n",
__func__);
wilc_connecting = 0;
vif->connecting = false;
return ret;
}
}
@ -792,7 +790,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
if (ret != 0) {
netdev_err(dev, "wilc_set_join_req(): Error\n");
ret = -ENOENT;
wilc_connecting = 0;
vif->connecting = false;
return ret;
}
@ -809,7 +807,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev,
int ret;
u8 null_bssid[ETH_ALEN] = {0};
wilc_connecting = 0;
vif->connecting = false;
if (!wilc)
return -EIO;
@ -1747,7 +1745,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
switch (type) {
case NL80211_IFTYPE_STATION:
wilc_connecting = 0;
vif->connecting = false;
dev->ieee80211_ptr->iftype = type;
priv->wdev->iftype = type;
vif->monitor_flag = 0;
@ -1762,7 +1760,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
break;
case NL80211_IFTYPE_P2P_CLIENT:
wilc_connecting = 0;
vif->connecting = false;
dev->ieee80211_ptr->iftype = type;
priv->wdev->iftype = type;
vif->monitor_flag = 0;

1
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View File

@ -149,6 +149,7 @@ struct wilc_vif {
struct timer_list periodic_rssi;
struct rf_info periodic_stat;
struct tcp_ack_filter ack_filter;
bool connecting;
};
struct wilc {