From df65c7217b01b9d43e86fb7bafc792dd04513f59 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 10 Mar 2010 01:09:12 +0000 Subject: mac80211: fix compile for 2.6.33 (thx, acoul) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20113 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/403-ath9k-fix-invalid-mac-address-handling.patch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch') 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 #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; -- cgit v1.2.3