From: Manish Bansal Date: Tue, 28 Oct 2014 11:55:31 +0000 (+0530) Subject: net:wireless:bcmdhd: Don't enable Mon mode for p2p X-Git-Tag: daily-2014.11.28.0_rel-st8-l-r1-partner-shieldtablet8~17 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sojka/nv-tegra/linux-3.10.git/commitdiff_plain/9d449400b3ba95e07eab237f024d4508c93464c8 net:wireless:bcmdhd: Don't enable Mon mode for p2p P2P CERT 6.1.9 test case is failing becasue monitor mode is creating an issue in registering Action frame for P2P-GO in firmware, this was leading an error in receiving action frames to GO interface. Not enabling it for P2P in driver though DUT does not support the mode. Bug 200049414 Change-Id: I296f0c9d799d6978e946399ccc1f0da1b6d31d8d Signed-off-by: Raghavender Reviewed-on: http://git-master/r/590780 Reviewed-by: Mohan Thadikamalla GVS: Gerrit_Virtual_Submit Reviewed-by: Todd Poynter --- diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 8a65f453e29..9879bd99c98 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -6702,9 +6702,16 @@ static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) -#if !defined(WL_ENABLE_P2P_IF) +#if !defined(WL_ENABLE_P2P_IF) && !defined(WL_CFG80211_P2P_DEV_IF) + /* + * This monitor mode support creates an issue in registering + * Action frame for P2P-GO, this was leading an error in receiving + * action frames to GO interface.Keeping the code here because + * monitor mode code has kept as it is in other modules, + * though we are not supporting this mode. + */ | BIT(NL80211_IFTYPE_MONITOR) -#endif /* !WL_ENABLE_P2P_IF */ +#endif /* !WL_ENABLE_P2P_IF && !WL_CFG80211_P2P_DEV_IF */ #if defined(WL_IFACE_COMB_NUM_CHANNELS) || defined(WL_CFG80211_P2P_DEV_IF) | BIT(NL80211_IFTYPE_P2P_CLIENT) | BIT(NL80211_IFTYPE_P2P_GO)