merge latest mac80211 from trunk (as of r22038) to backfire

[openwrt-10.03/.git] / package / mac80211 / patches / 409-ath9k-add-wndr3700-antenna-initialization.patch

diff --git a/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch b/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
index 83eabaf09dad0bfa2fcb268f46279d71aa0e6ecf..ed7d34883162b085cf1808eaacdfe55118e5d817 100644 (file)
--- a/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
+++ b/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
@@ -1,14 +1,14 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -14,6 +14,7 @@
-  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-  */
+@@ -16,6 +16,7 @@
+ 
+ #include <linux/slab.h>
  
 +#include "linux/ath9k_platform.h"
  #include "ath9k.h"
  
  static char *dev_info = "ath9k";
-@@ -546,6 +547,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -553,6 +554,8 @@ static int ath9k_init_softc(u16 devid, s
        pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
        if (!pdata)
                ah->ah_flags |= AH_USE_EEPROM;
@@ -17,7 +17,7 @@
  
        common = ath9k_hw_common(ah);
        common->ops = &ath9k_common_ops;
-@@ -671,6 +674,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -675,6 +678,24 @@ void ath9k_set_hw_capab(struct ath_softc
        SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -42,7 +42,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                    const struct ath_bus_ops *bus_ops)
  {
-@@ -689,6 +710,9 @@ int ath9k_init_device(u16 devid, struct 
+@@ -693,6 +714,9 @@ int ath9k_init_device(u16 devid, struct 
        common = ath9k_hw_common(ah);
        ath9k_set_hw_capab(sc, hw);
  
@@ -54,15 +54,15 @@
                              ath9k_reg_notifier);
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -511,6 +511,8 @@ struct ath_softc {
-       struct ath_beacon_config cur_beacon_conf;
-       struct delayed_work tx_complete_work;
-       struct ath_btcoex btcoex;
-+
-+      unsigned long quirk_wndr3700:1;
- };
+@@ -594,6 +594,8 @@ struct ath_softc {
  
- struct ath_wiphy {
+       int beacon_interval;
+ 
++      bool quirk_wndr3700;
++
+ #ifdef CONFIG_ATH9K_DEBUGFS
+       struct ath9k_debug debug;
+ #endif
 --- a/include/linux/ath9k_platform.h
 +++ b/include/linux/ath9k_platform.h
 @@ -24,6 +24,8 @@
@@ -70,7 +70,7 @@
        u16 eeprom_data[ATH9K_PLAT_EEP_MAX_WORDS];
        u8 *macaddr;
 +
-+      unsigned long quirk_wndr3700:1;
++      bool quirk_wndr3700;
  };
  
  #endif /* _LINUX_ATH9K_PLATFORM_H */