summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbibhayr <bibhayr@nvidia.com>2014-05-30 18:06:49 -0700
committerMandar Padmawar <mpadmawar@nvidia.com>2014-07-10 02:05:10 -0700
commitfdca4685d72fdd1cc4de4b87c86d7ae636c2f8d5 (patch)
tree9ea9699a1e082adb9bd2850ed007bd869ade9211
parent056eeacaf7d96ba737377f397b4104c5e518a992 (diff)
bcmdhd: fix p2p interface and wlan0 assoc race
Do not allow virtual p2p interface creation while the AP drviver status is CONNECTING Bug 200009241 Bug 200009346 Bug 200009344 Bug 200009328 Change-Id: I8bfba473110067b550473e32295ad523a5515023 Signed-off-by: bibhayr <bibhayr@nvidia.com> Reviewed-on: http://git-master/r/417330 (cherry picked from commit 7436ab5ebc68e08e0c54f6ddfcaf1b078ebb532c) Reviewed-on: http://git-master/r/425081 (cherry picked from commit d4e1b14483dda59bccddb1fc65535b9dc8487269) Reviewed-on: http://git-master/r/435713 GVS: Gerrit_Virtual_Submit Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com> Tested-by: Anshul Jain (SW) <anshulj@nvidia.com>
-rwxr-xr-xdrivers/net/wireless/bcmdhd/wl_cfg80211.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 0c2868e051d0..4d0dbc657034 100755
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -1160,6 +1160,11 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy,
/* Use primary I/F for sending cmds down to firmware */
_ndev = wl_to_prmry_ndev(wl);
+ if (wl_get_drv_status(wl, CONNECTING, _ndev)) {
+ WL_ERR(("Already AP connection going on\n"));
+ return -EBUSY;
+ }
+
WL_DBG(("if name: %s, type: %d\n", name, type));
switch (type) {
case NL80211_IFTYPE_ADHOC: