diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-10-11 00:36:23 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-11 00:36:23 +0000 |
| commit | 4cb436429b8974624535733b07c33be70ff55c8d (patch) | |
| tree | fdd1177dc4718a17abb4693be40332b15973c15a /package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch | |
| parent | 0ba61fe414f89fe61e990f124afcf9e6f8fe61e8 (diff) | |
| download | upstream-4cb436429b8974624535733b07c33be70ff55c8d.tar.gz upstream-4cb436429b8974624535733b07c33be70ff55c8d.tar.bz2 upstream-4cb436429b8974624535733b07c33be70ff55c8d.zip | |
mac80211: upgrade to latest compat-wireless, fix ad-hoc interface setup
SVN-Revision: 18023
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 | 26 |
1 files changed, 17 insertions, 9 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 5bd342ff3d..9d9d3a48b5 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 @@ -1,22 +1,30 @@ --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -524,8 +524,18 @@ static int ath9k_hw_init_macaddr(struct - ah->macaddr[2 * i] = eeval >> 8; - ah->macaddr[2 * i + 1] = eeval & 0xff; +@@ -15,6 +15,7 @@ + */ + + #include <linux/io.h> ++#include <linux/etherdevice.h> + #include <asm/unaligned.h> + + #include "hw.h" +@@ -511,8 +512,18 @@ 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(ah->macaddr)) { ++ if (!is_valid_ether_addr(common->macaddr)) { + DECLARE_MAC_BUF(macbuf); + -+ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, ++ ath_print(common, ATH_DBG_EEPROM, + "eeprom contains invalid mac address: %s\n", -+ print_mac(macbuf, ah->macaddr)); ++ print_mac(macbuf, common->macaddr)); + -+ random_ether_addr(ah->macaddr); -+ DPRINTF(ah->ah_sc, ATH_DBG_EEPROM, ++ random_ether_addr(common->macaddr); ++ ath_print(common, ATH_DBG_EEPROM, + "random mac address will be used: %s\n", -+ print_mac(macbuf, ah->macaddr)); ++ print_mac(macbuf, common->macaddr)); + } return 0; |