From 3f569103bd34a449afc45ded980292bfb412fdd8 Mon Sep 17 00:00:00 2001 From: Aly Hirani Date: Fri, 4 Jul 2014 12:04:59 -0700 Subject: [PATCH] bcmdhd: Do not allow p2p calls after netdev unreg Bug 200015171 Change-Id: Ib8471805a37310692e69a02715c44cc5eb329d92 Signed-off-by: bibhayr Signed-off-by: Aly Hirani Reviewed-on: http://git-master/r/434569 GVS: Gerrit_Virtual_Submit Reviewed-by: Eric Chuang Tested-by: Eric Chuang --- drivers/net/wireless/bcmdhd/wl_cfg80211.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 5aa8b4625a6..6cfc293c13d 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -6281,6 +6281,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")); @@ -6346,6 +6352,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], -- 2.39.2