summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHante Meuleman <meuleman@broadcom.com>2013-02-08 15:53:45 +0100
committerJohn W. Linville <linville@tuxdriver.com>2013-02-08 14:51:39 -0500
commit318a64cede8882964b6412aceebe657dab46b2d2 (patch)
tree3d939fbd2286c412b0978e0829dcde35f2a05acb
parent7a5c1f64f64c8504c8117558a426b610ebc77aa0 (diff)
downloadop-kernel-dev-318a64cede8882964b6412aceebe657dab46b2d2.zip
op-kernel-dev-318a64cede8882964b6412aceebe657dab46b2d2.tar.gz
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>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 27436f2..9a82dd4 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);
}
OpenPOWER on IntegriCloud