summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-10 01:09:12 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-03-10 01:09:12 +0000
commitdf65c7217b01b9d43e86fb7bafc792dd04513f59 (patch)
tree8b783aab1a0fdb1e2271cdd6e603c23335ff567d
parent02c404ea21e4cae7bb73366ff05c3c2ef0e5f8d8 (diff)
mac80211: fix compile for 2.6.33 (thx, acoul)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20113 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch12
-rw-r--r--package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch4
-rw-r--r--package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch2
3 files changed, 8 insertions, 10 deletions
diff --git a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
index bb3796ab0..e42be951c 100644
--- a/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
+++ b/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
@@ -8,23 +8,21 @@
#include <asm/unaligned.h>
#include "hw.h"
-@@ -441,8 +442,18 @@ static int ath9k_hw_init_macaddr(struct
+@@ -441,8 +442,16 @@ static int ath9k_hw_init_macaddr(struct
common->macaddr[2 * i] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff;
}
- if (sum == 0 || sum == 0xffff * 3)
- return -EADDRNOTAVAIL;
+ if (!is_valid_ether_addr(common->macaddr)) {
-+ DECLARE_MAC_BUF(macbuf);
-+
+ ath_print(common, ATH_DBG_EEPROM,
-+ "eeprom contains invalid mac address: %s\n",
-+ print_mac(macbuf, common->macaddr));
++ "eeprom contains invalid mac address: %pM\n",
++ common->macaddr);
+
+ random_ether_addr(common->macaddr);
+ ath_print(common, ATH_DBG_EEPROM,
-+ "random mac address will be used: %s\n",
-+ print_mac(macbuf, common->macaddr));
++ "random mac address will be used: %pM\n",
++ common->macaddr);
+ }
return 0;
diff --git a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
index c92cd17e0..93ad941b7 100644
--- a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
+++ b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
@@ -39,8 +39,8 @@
+ }
+
if (!is_valid_ether_addr(common->macaddr)) {
- DECLARE_MAC_BUF(macbuf);
-
+ ath_print(common, ATH_DBG_EEPROM,
+ "eeprom contains invalid mac address: %pM\n",
--- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h
@@ -23,6 +23,7 @@
diff --git a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
index 0627c3877..48401bcd1 100644
--- a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
+++ b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2113,7 +2113,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2111,7 +2111,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
if (ah->config.rx_intr_mitigation) {
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);