aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-12-07 16:24:35 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-12-07 16:24:35 +0000
commit104526605c12d4e37b9bf2aab92baf3f79addb4c (patch)
tree3f0228fa8579ac819a620be5a3d82481697002b3
parent1309ba379ef060590506ea9141f4c382a7d5b869 (diff)
downloadupstream-104526605c12d4e37b9bf2aab92baf3f79addb4c.tar.gz
upstream-104526605c12d4e37b9bf2aab92baf3f79addb4c.tar.bz2
upstream-104526605c12d4e37b9bf2aab92baf3f79addb4c.zip
mac80211: brcmsmac: do a read after write when writing objmem to device.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34570 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch12
-rw-r--r--package/mac80211/patches/860-brcmsmac-wflush-objmem.patch11
2 files changed, 13 insertions, 10 deletions
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 b135c7d3ff..b375313f49 100644
--- a/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch
+++ b/package/mac80211/patches/850-brcmsmac-add-support-for-BCM43224.patch
@@ -1,14 +1,6 @@
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
-@@ -4135,6 +4135,7 @@ void brcms_c_wme_setparams(struct brcms_
- M_EDCF_QINFO +
- wme_ac2fifo[aci] * M_EDCF_QLEN + i,
- *shm_entry++);
-+ printk("dummy\n");
- }
-
- if (suspend) {
-@@ -4537,7 +4538,8 @@ static int brcms_b_attach(struct brcms_c
+@@ -4537,7 +4537,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 ||
@@ -18,7 +10,7 @@
/* Dualband boards */
wlc_hw->_nbands = 2;
else
-@@ -5797,7 +5799,7 @@ static bool brcms_c_chipmatch_pci(struct
+@@ -5797,7 +5798,7 @@ static bool brcms_c_chipmatch_pci(struct
return false;
}
diff --git a/package/mac80211/patches/860-brcmsmac-wflush-objmem.patch b/package/mac80211/patches/860-brcmsmac-wflush-objmem.patch
new file mode 100644
index 0000000000..d702c4d154
--- /dev/null
+++ b/package/mac80211/patches/860-brcmsmac-wflush-objmem.patch
@@ -0,0 +1,11 @@
+--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
++++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
+@@ -2923,7 +2923,7 @@ brcms_b_write_objmem(struct brcms_hardwa
+ if (offset & 2)
+ objoff += 2;
+
+- bcma_write16(core, objoff, v);
++ bcma_wflush16(core, objoff, v);
+ }
+
+ /*