diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-11-28 18:01:03 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-11-28 18:01:03 +0000 |
| commit | becedde3f1ec42dc99dce12c34c3e0f562f7b4d9 (patch) | |
| tree | 4530213258efc17fb2757f70dc5aef04b3d94541 /package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch | |
| parent | 756b6fdbf312b441202cfef5883304a0579db8a9 (diff) | |
| download | upstream-becedde3f1ec42dc99dce12c34c3e0f562f7b4d9.tar.gz upstream-becedde3f1ec42dc99dce12c34c3e0f562f7b4d9.tar.bz2 upstream-becedde3f1ec42dc99dce12c34c3e0f562f7b4d9.zip | |
mac80211: use mac address from platform data if present on ath9k
SVN-Revision: 18584
Diffstat (limited to 'package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch')
| -rw-r--r-- | package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch | 53 |
1 files changed, 53 insertions, 0 deletions
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 new file mode 100644 index 0000000000..e4aeab5cef --- /dev/null +++ b/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch @@ -0,0 +1,53 @@ +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -16,8 +16,10 @@ + + #include <linux/io.h> + #include <linux/etherdevice.h> ++#include <linux/ath9k_platform.h> + #include <asm/unaligned.h> + ++#include "ath9k.h" + #include "hw.h" + #include "rc.h" + #include "initvals.h" +@@ -472,17 +474,23 @@ static int ath9k_hw_rf_claim(struct ath_ + static int ath9k_hw_init_macaddr(struct ath_hw *ah) + { + struct ath_common *common = ath9k_hw_common(ah); ++ struct ath_softc *sc = (struct ath_softc *) common->priv; ++ struct ath9k_platform_data *pdata = sc->dev->platform_data; + u32 sum; + int i; + u16 eeval; + + sum = 0; +- for (i = 0; i < 3; i++) { +- eeval = ah->eep_ops->get_eeprom(ah, AR_EEPROM_MAC(i)); +- sum += eeval; +- common->macaddr[2 * i] = eeval >> 8; +- common->macaddr[2 * i + 1] = eeval & 0xff; +- } ++ if (pdata && pdata->macaddr) ++ memcpy(common->macaddr, pdata->macaddr, ETH_ALEN); ++ else ++ for (i = 0; i < 3; i++) { ++ eeval = ah->eep_ops->get_eeprom(ah, AR_EEPROM_MAC(i)); ++ sum += eeval; ++ common->macaddr[2 * i] = eeval >> 8; ++ common->macaddr[2 * i + 1] = eeval & 0xff; ++ } ++ + if (!is_valid_ether_addr(common->macaddr)) { + DECLARE_MAC_BUF(macbuf); + +--- a/include/linux/ath9k_platform.h ++++ b/include/linux/ath9k_platform.h +@@ -23,6 +23,7 @@ + + struct ath9k_platform_data { + u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS]; ++ u8 *macaddr; + }; + + #endif /* _LINUX_ATH9K_PLATFORM_H */ |