--- 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_
+@@ -4153,6 +4153,7 @@ void brcms_c_wme_setparams(struct brcms_
M_EDCF_QINFO +
wme_ac2fifo[aci] * M_EDCF_QLEN + i,
*shm_entry++);
}
if (suspend) {
-@@ -4570,7 +4571,8 @@ static int brcms_b_attach(struct brcms_c
+@@ -4557,7 +4558,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 ||
/* Dualband boards */
wlc_hw->_nbands = 2;
else
-@@ -5831,7 +5833,7 @@ bool brcms_c_chipmatch(u16 vendor, u16 d
+@@ -5816,7 +5818,7 @@ bool brcms_c_chipmatch(u16 vendor, u16 d
return false;
}