qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-06 15:27:17 +03:00
Code

mac80211: fix compile for 2.6.33 (thx, acoul)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20113 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-03-10 01:09:12 +00:00
parent 02c404ea21
commit df65c7217b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
View File

@ -8,23 +8,21 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "hw.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] = eeval >> 8;
common->macaddr[2 * i + 1] = eeval & 0xff; common->macaddr[2 * i + 1] = eeval & 0xff;
} }
- if (sum == 0 || sum == 0xffff * 3) - if (sum == 0 || sum == 0xffff * 3)
- return -EADDRNOTAVAIL; - return -EADDRNOTAVAIL;
+ if (!is_valid_ether_addr(common->macaddr)) { + if (!is_valid_ether_addr(common->macaddr)) {
+ DECLARE_MAC_BUF(macbuf);
+
+ ath_print(common, ATH_DBG_EEPROM, + ath_print(common, ATH_DBG_EEPROM,
+ "eeprom contains invalid mac address: %s\n", + "eeprom contains invalid mac address: %pM\n",
+ print_mac(macbuf, common->macaddr)); + common->macaddr);
+ +
+ random_ether_addr(common->macaddr); + random_ether_addr(common->macaddr);
+ ath_print(common, ATH_DBG_EEPROM, + ath_print(common, ATH_DBG_EEPROM,
+ "random mac address will be used: %s\n", + "random mac address will be used: %pM\n",
+ print_mac(macbuf, common->macaddr)); + common->macaddr);
+ } + }
return 0; return 0;

4
package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
View File

@ -39,8 +39,8 @@
+ } + }
+ +
if (!is_valid_ether_addr(common->macaddr)) { 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 --- a/include/linux/ath9k_platform.h
+++ b/include/linux/ath9k_platform.h +++ b/include/linux/ath9k_platform.h
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@

2
package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath9k/hw.c --- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/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) { if (ah->config.rx_intr_mitigation) {
REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500); REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);