projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: merge a client mode state handling fix, refresh patches
[openwrt.git]
/
package
/
mac80211
/
patches
/
201-ath5k-WAR-for-AR71xx-PCI-bug.patch
diff --git
a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
b/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
index c1f18af080c79a8fa10210dc0bff36d7c774b085..9e08a089754de34693515114bc7c07fc2945a517 100644
(file)
--- a/
package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
+++ b/
package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
@@
-1,10
+1,10
@@
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
-@@ -
57,8 +57
,14 @@ static const struct ath5k_ini ar5210_ini
+@@ -
65,8 +65
,14 @@ static const struct ath5k_ini ar5210_ini
{ AR5K_IMR, 0 },
{ AR5K_IER, AR5K_IER_DISABLE },
{ AR5K_BSR, 0, AR5K_INI_READ },
{ AR5K_IMR, 0 },
{ AR5K_IER, AR5K_IER_DISABLE },
{ AR5K_BSR, 0, AR5K_INI_READ },
-+#if
ndef CONFIG_ATHEROS_AR71XX
++#if
!defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
{ AR5K_TXCFG, AR5K_DMASIZE_128B },
{ AR5K_RXCFG, AR5K_DMASIZE_128B },
+#else
{ AR5K_TXCFG, AR5K_DMASIZE_128B },
{ AR5K_RXCFG, AR5K_DMASIZE_128B },
+#else
@@
-17,11
+17,11
@@
{ AR5K_RXNOFRM, 8 },
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
{ AR5K_RXNOFRM, 8 },
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
-@@ -
786,10 +786,18 @@ void ath5k_hw_dma_init(struct ath5k_hw *
+@@ -
863,10 +863,18 @@ ath5k_hw_dma_init(struct ath5k_hw *ah)
* guess we can tweak it and see how it goes ;-)
*/
if (ah->ah_version != AR5K_AR5210) {
* guess we can tweak it and see how it goes ;-)
*/
if (ah->ah_version != AR5K_AR5210) {
-+#if
ndef CONFIG_ATHEROS_AR71XX
++#if
!defined(CONFIG_ATHEROS_AR71XX) && !defined(CONFIG_ATH79)
AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,
AR5K_REG_WRITE_BITS(ah, AR5K_TXCFG,
AR5K_TXCFG_SDMAMR, AR5K_DMASIZE_128B);
AR5K_REG_WRITE_BITS(ah, AR5K_RXCFG,