diff options
| author | Aly Hirani <ahirani@nvidia.com> | 2014-07-04 12:04:59 -0700 |
|---|---|---|
| committer | Mandar Padmawar <mpadmawar@nvidia.com> | 2014-07-10 02:05:35 -0700 |
| commit | 794efb96a6c48900a2f26ac5a739b57844fd69b1 (patch) | |
| tree | 9c252aae863ca10960b236322dcf7d6ad78f61d4 | |
| parent | 8f1686f1a8f25b3f2b86b6d809755d1a0fdeb277 (diff) | |
bcmdhd: Do not allow p2p calls after netdev unreg
Bug 200015171
Change-Id: Ib8471805a37310692e69a02715c44cc5eb329d92
Signed-off-by: bibhayr <bibhayr@nvidia.com>
Signed-off-by: Aly Hirani <ahirani@nvidia.com>
Reviewed-on: http://git-master/r/434569
(cherry picked from commit 3f569103bd34a449afc45ded980292bfb412fdd8)
Reviewed-on: http://git-master/r/435734
GVS: Gerrit_Virtual_Submit
Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com>
Tested-by: Anshul Jain (SW) <anshulj@nvidia.com>
| -rwxr-xr-x | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 6e705740ce9e..c443e7316cc2 100755 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -6283,6 +6283,12 @@ wl_cfg80211_change_beacon( if (!check_dev_role_integrity(wl, dev_role)) goto fail; + if ((dev_role == NL80211_IFTYPE_P2P_GO) && (wl->p2p_wdev == NULL)) { + WL_ERR(("P2P already down status!\n")); + err = BCME_ERROR; + goto fail; + } + /* Parse IEs */ if ((err = wl_cfg80211_parse_ap_ies(dev, info, &ies)) < 0) { WL_ERR(("Parse IEs failed \n")); @@ -6348,6 +6354,12 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, if (!check_dev_role_integrity(wl, dev_role)) goto fail; + if ((dev_role == NL80211_IFTYPE_P2P_GO) && (wl->p2p_wdev == NULL)) { + WL_ERR(("P2P already down status!\n")); + err = BCME_ERROR; + goto fail; + } + ie_offset = DOT11_MGMT_HDR_LEN + DOT11_BCN_PRB_FIXED_LEN; /* find the SSID */ if ((ssid_ie = bcm_parse_tlvs((u8 *)&info->head[ie_offset], |