From: Hante Meuleman <meuleman@broadcom.com>
Date: Fri, 8 Feb 2013 14:53:45 +0000 (+0100)
Subject: brcmfmac: Fix bug mgmt_rx_register
X-Git-Tag: MMI-PSA29.97-13-9~15013^2~31^2^2~41
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=318a64cede8882964b6412aceebe657dab46b2d2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

brcmfmac: Fix bug mgmt_rx_register

Mask is OR-ed with value in case of deregister. Should
be AND-ed.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 27436f253162..9a82dd443952 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3742,7 +3742,7 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,
 	if (reg)
 		vif->mgmt_rx_reg |= BIT(mgmt_type);
 	else
-		vif->mgmt_rx_reg |= ~BIT(mgmt_type);
+		vif->mgmt_rx_reg &= ~BIT(mgmt_type);
 }