diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-12-11 01:45:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-12-11 01:45:12 +0000 |
| commit | 9337c975843175aaa51bd285080cb062eb1a3f45 (patch) | |
| tree | ab019da788ef24bf9cc19e4c280a0a3e5e4157e2 /package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch | |
| parent | 700589cd9b09c96be39ae9a39bb64ae93a5ece4b (diff) | |
| download | upstream-9337c975843175aaa51bd285080cb062eb1a3f45.tar.gz upstream-9337c975843175aaa51bd285080cb062eb1a3f45.tar.bz2 upstream-9337c975843175aaa51bd285080cb062eb1a3f45.zip | |
mac80211: update to 2010-12-09
SVN-Revision: 24471
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 | 19 |
1 files changed, 14 insertions, 5 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 index d6bc34b1a0..2444db4bcf 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 @@ -18,7 +18,7 @@ #include "ath9k.h" -@@ -521,6 +522,7 @@ static void ath9k_init_misc(struct ath_s +@@ -522,6 +523,7 @@ static void ath9k_init_misc(struct ath_s static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, const struct ath_bus_ops *bus_ops) { @@ -26,13 +26,22 @@ struct ath_hw *ah = NULL; struct ath_common *common; int ret = 0, i; -@@ -567,6 +569,9 @@ static int ath9k_init_softc(u16 devid, s +@@ -535,7 +537,7 @@ static int ath9k_init_softc(u16 devid, s + ah->hw_version.subsysid = subsysid; + sc->sc_ah = ah; + +- if (!sc->dev->platform_data) ++ if (!pdata) + ah->ah_flags |= AH_USE_EEPROM; + + common = ath9k_hw_common(ah); +@@ -568,6 +570,9 @@ static int ath9k_init_softc(u16 devid, s if (ret) goto err_hw; + if (pdata && pdata->macaddr) + memcpy(common->macaddr, pdata->macaddr, ETH_ALEN); + - ret = ath9k_init_debug(ah); - if (ret) { - ath_print(common, ATH_DBG_FATAL, + ret = ath9k_init_queues(sc); + if (ret) + goto err_queues; |