net: wireless: bcmdhd: Enable P2P events only for P2P FW

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c
index 42f3528dba887d9a72f595d3e64f9d07e6ae10f8..6a69b2bff76ac50cdff4f012c103c944708de8fc 100644 (file)
--- a/drivers/net/wireless/bcmdhd/dhd_linux.c
+++ b/drivers/net/wireless/bcmdhd/dhd_linux.c
@@ -3001,12 +3001,14 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
        /* enable dongle roaming event */
        setbit(eventmask, WLC_E_ROAM);
 #ifdef WL_CFG80211
-       setbit(eventmask, WLC_E_ACTION_FRAME_RX);
-       setbit(eventmask, WLC_E_ACTION_FRAME_COMPLETE);
-       setbit(eventmask, WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE);
-       setbit(eventmask, WLC_E_P2P_PROBREQ_MSG);
-       setbit(eventmask, WLC_E_P2P_DISC_LISTEN_COMPLETE);
        setbit(eventmask, WLC_E_ESCAN_RESULT);
+       if ((dhd->op_mode & WFD_MASK) == WFD_MASK) {
+               setbit(eventmask, WLC_E_ACTION_FRAME_RX);
+               setbit(eventmask, WLC_E_ACTION_FRAME_COMPLETE);
+               setbit(eventmask, WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE);
+               setbit(eventmask, WLC_E_P2P_PROBREQ_MSG);
+               setbit(eventmask, WLC_E_P2P_DISC_LISTEN_COMPLETE);
+       }
 #endif /* WL_CFG80211 */
 
        /* Write updated Event mask */