mac80211: fix compile for 2.6.33 (thx, acoul)
SVN-Revision: 20113
This commit is contained in:
parent
527accf920
commit
56f94c0d2a
3 changed files with 8 additions and 10 deletions
|
@ -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;
|
||||
|
|
|
@ -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 @@
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue