diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-03-10 01:09:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-03-10 01:09:12 +0000 |
| commit | 20e3190ee49db0e982e5c748b7395fa90887330b (patch) | |
| tree | 8b783aab1a0fdb1e2271cdd6e603c23335ff567d /package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | |
| parent | 7f91a444a846c809fec4c449e47b3f31f13306ee (diff) | |
| download | master-187ad058-20e3190ee49db0e982e5c748b7395fa90887330b.tar.gz master-187ad058-20e3190ee49db0e982e5c748b7395fa90887330b.tar.bz2 master-187ad058-20e3190ee49db0e982e5c748b7395fa90887330b.zip | |
mac80211: fix compile for 2.6.33 (thx, acoul)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20113 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch')
| -rw-r--r-- | package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | 12 |
1 files changed, 5 insertions, 7 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 bb3796ab01..e42be951c2 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; |