backport mac80211, hostapd, iw, crda from trunk as of r26369

[openwrt-10.03/.git] / package / mac80211 / patches / 407-ath9k-override-mac-address-from-platform-data.patch

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
deleted file mode 100644 (file)
index c922456..0000000
--- a/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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 */
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -15,6 +15,7 @@
-  */
- 
- #include <linux/slab.h>
-+#include <linux/ath9k_platform.h>
- 
- #include "ath9k.h"
- 
-@@ -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)
- {
-+      struct ath9k_platform_data *pdata = sc->dev->platform_data;
-       struct ath_hw *ah = NULL;
-       struct ath_common *common;
-       int ret = 0, i;
-@@ -536,7 +538,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);
-@@ -572,6 +574,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_queues(sc);
-       if (ret)
-               goto err_queues;