From 56f94c0d2a90cca7fd509a8432830db9d23fc713 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 10 Mar 2010 01:09:12 +0000 Subject: [PATCH] mac80211: fix compile for 2.6.33 (thx, acoul) SVN-Revision: 20113 --- .../403-ath9k-fix-invalid-mac-address-handling.patch | 12 +++++------- ...h9k-override-mac-address-from-platform-data.patch | 4 ++-- .../patches/408-ath9k_tweak_rx_intr_mitigation.patch | 2 +- 3 files changed, 8 insertions(+), 10 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 #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; diff --git a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch index c92cd17e0b..93ad941b7e 100644 --- a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch +++ b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch @@ -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 @@ diff --git a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch index 0627c38777..48401bcd19 100644 --- a/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch +++ b/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch @@ -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); -- 2.30.2