These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / brcm80211 / brcmsmac / main.c

diff --git a/kernel/drivers/net/wireless/brcm80211/brcmsmac/main.c b/kernel/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 369527e..218cbc8 100644 (file)
--- a/kernel/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/kernel/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -3571,7 +3571,7 @@ void brcms_c_mac_promisc(struct brcms_c_info *wlc, uint filter_flags)
 
        wlc->filter_flags = filter_flags;
 
-       if (filter_flags & (FIF_PROMISC_IN_BSS | FIF_OTHER_BSS))
+       if (filter_flags & FIF_OTHER_BSS)
                promisc_bits |= MCTL_PROMISC;
 
        if (filter_flags & FIF_BCN_PRBRESP_PROMISC)
@@ -4585,7 +4585,7 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
                wlc_hw->machwcap_backup = wlc_hw->machwcap;
 
                /* init tx fifo size */
-               WARN_ON((wlc_hw->corerev - XMTFIFOTBL_STARTREV) < 0 ||
+               WARN_ON(wlc_hw->corerev < XMTFIFOTBL_STARTREV ||
                        (wlc_hw->corerev - XMTFIFOTBL_STARTREV) >
                                ARRAY_SIZE(xmtfifo_sz));
                wlc_hw->xmtfifo_sz =