staging: wilc1000: store bss object and use cfg80211_connect_bss()
PATCH 1/1 staging: wilc1000: store bss object and use cfg80211_connect_bss()
From: Adham Abozaeid <[email protected]>
In a fast disconnect/connect sequence, cfg80211_connect_result() can fail to find the bss object which the driver is connecting to. Detailed sequence of events:
* Driver is connected in STA mode
* Disconnect request arrives from user space. Driver disconnects and calls cfg80211_disconnected() which adds new event to the cfg80211_wq worker thread
* Connect request arrives from user space. cfg80211_connect() stores ssid/ssid_len and calls rdev_connect()
* __cfg80211_disconnected() runs in worker thread and zero wdev->ssid_len
* Connect succeeds. Driver calls cfg80211_connect_result() which fails to find the bss because wdev->ssid_len is zero
To overcome this, upon connect request, store the bss object in the driver and upon connect completion pass it to kernel using cfg80211_connect_bss().
Ref: bcdd49b074d0 ("store bss object and use cfg80211_connect_bss()")
--- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 20 +++++++++++++------ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +14 -6
@@ -137,6 +137,7 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,struct wilc *wl = vif->wilc;struct host_if_drv *wfi_drv = priv->hif_drv;struct wilc_conn_info *conn_info = &wfi_drv->conn_info; +struct wiphy *wiphy = dev->ieee80211_ptr->wiphy; vif->connecting = false;
@@ -158,12 +159,16 @@ static void cfg_connect_result(enum conn_event conn_disconn_evt, u8 mac_status,memcpy (priv->associated_bss, conn_info->bssid,ETH_ALEN ); -cfg80211_connect_result (dev, conn_info->bssid, - conn_info->req_ies, - conn_info->req_ies_len, - conn_info->resp_ies, - conn_info->resp_ies_len, connect_status, -GFP_KERNEL ); +cfg80211_ref_bss (wiphy, vif->bss); +cfg80211_connect_bss (dev, conn_info->bssid, vif->bss, + conn_info->req_ies, + conn_info->req_ies_len, + conn_info->resp_ies, + conn_info->resp_ies_len, + connect_status,GFP_KERNEL , +NL80211_TIMEOUT_UNSPECIFIED ); + + vif->bss =NULL ; }else if (conn_disconn_evt ==CONN_DISCONN_EVENT_DISCONN_NOTIF ) {u16 reason =0 ;
@@ -406,6 +411,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, goto out_put_bss; }kfree (join_params); + vif->bss = bss;cfg80211_put_bss (wiphy, bss);return 0 ;
@@ -451,6 +457,8 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, ret = -EINVAL ; } + vif->bss =NULL ; +return ret; }
drivers/staging/wilc1000/wilc_wfi_netdevice.h +1 -0
@@ -209,6 +209,7 @@ struct wilc_vif {bool connecting;struct wilc_priv priv;struct list_head list; +struct cfg80211_bss *bss; };struct wilc {
Signature · 1 line
2.17.1