mac80211: merge a client mode state handling fix, refresh patches

[openwrt.git] / package / mac80211 / patches / 850-brcmsmac-add-support-for-BCM43224.patch

diff --git a/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch b/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch
index df53b00f494609e02f55af8ff671b07675fa5a45..b135c7d3ff178ce33a0641aace9b1057f55f4b3c 100644 (file)
--- a/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch
+++ b/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
 +++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -4166,6 +4166,7 @@ void brcms_c_wme_setparams(struct brcms_
+@@ -4135,6 +4135,7 @@ void brcms_c_wme_setparams(struct brcms_
                                          M_EDCF_QINFO +
                                          wme_ac2fifo[aci] * M_EDCF_QLEN + i,
                                          *shm_entry++);
@@ -8,17 +8,17 @@
        }
  
        if (suspend) {
-@@ -4570,7 +4571,8 @@ static int brcms_b_attach(struct brcms_c
+@@ -4537,7 +4538,8 @@ static int brcms_b_attach(struct brcms_c
  
        /* check device id(srom, nvram etc.) to set bands */
        if (wlc_hw->deviceid == BCM43224_D11N_ID ||
 -          wlc_hw->deviceid == BCM43224_D11N_ID_VEN1)
-+          wlc_hw->deviceid == BCM43224_D11N_ID_VEN1||
-+          wlc_hw->deviceid == BCM43224_CHIP_ID)
++          wlc_hw->deviceid == BCM43224_D11N_ID_VEN1 ||
++          wlc_hw->deviceid == BCM43224_CHIP_ID)
                /* Dualband boards */
                wlc_hw->_nbands = 2;
        else
-@@ -5831,7 +5833,7 @@ bool brcms_c_chipmatch(u16 vendor, u16 d
+@@ -5797,7 +5799,7 @@ static bool brcms_c_chipmatch_pci(struct
                return false;
        }