net:wireless:bcmdhd: Don't enable Mon mode for p2p

[sojka/nv-tegra/linux-3.10.git] / drivers / net / wireless / bcmdhd / wl_cfg80211.c

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 8a65f453e2971e2152a7fedc34b76e65b698e2dc..9879bd99c98e6c077fae52b09e86e4cd09b8184f 100644 (file)
--- 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)