diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-11 01:45:12 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-11 01:45:12 +0000 |
| commit | 83cc2deba9a07c5fc3bee9c8c973721bc374d734 (patch) | |
| tree | 995c0aad8f68eaf037d80be2c55fd5920ac4b253 /package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch | |
| parent | 99a212a2565ed4c256d86645d14ff7064f284f2d (diff) | |
mac80211: update to 2010-12-09
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24471 3c298f89-4303-0410-b956-a3cf2f4a3e73
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; |