From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 7 Dec 2012 16:24:35 +0000 (+0000)
Subject: mac80211: brcmsmac: do a read after write when writing objmem to device.
X-Git-Tag: reboot~12062
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3365e2caf014e24ff8ea091a3d93cb89f330b70b;p=openwrt%2Fstaging%2Fblogic.git

mac80211: brcmsmac: do a read after write when writing objmem to device.

SVN-Revision: 34570
---

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 b135c7d3ff17..b375313f4912 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 000000000000..d702c4d154ab
--- /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);
+ }
+ 
+ /*