]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
brcmfmac: Fix bug mgmt_rx_register
authorHante Meuleman <meuleman@broadcom.com>
Fri, 8 Feb 2013 14:53:45 +0000 (15:53 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 8 Feb 2013 19:51:39 +0000 (14:51 -0500)
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>
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

index 27436f253162d226a39fe7f1923c7e4ad2b3d7b7..9a82dd4439521e21ad1122fda585b43034708307 100644 (file)
@@ -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);
 }