Changeset 26128


Ignore:
Timestamp:
2011-03-13T19:38:37+01:00 (7 years ago)
Author:
nbd
Message:

mac80211: update to wireless-testing 2011-03-11

Location:
trunk/package/mac80211
Files:
1 added
14 deleted
8 edited
5 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r26028 r26128  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2011-02-25 
     13PKG_VERSION:=2011-03-11 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 PKG_MD5SUM:=c0242cc152a157902ff60fe05d1773b2 
     16PKG_MD5SUM:=123b9220fa2b016979b7b3874f349643 
    1717 
    1818PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
  • trunk/package/mac80211/patches/030-backport_93c86_eeprom.patch

    r25749 r26128  
    11--- a/include/linux/compat-2.6.36.h 
    22+++ b/include/linux/compat-2.6.36.h 
    3 @@ -102,6 +102,8 @@ int no_printk(const char *s, ...) { retu 
    4  #define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0) 
    5  #endif 
     3@@ -104,6 +104,8 @@ int no_printk(const char *s, ...) { retu 
     4  
     5 #define PCI_EEPROM_WIDTH_93C86   8 
    66  
    77+#define PCI_EEPROM_WIDTH_93C86   8 
  • trunk/package/mac80211/patches/300-ath9k_gpio_settings.patch

    r25749 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1091,6 +1091,12 @@ int ath9k_init_debug(struct ath_hw *ah) 
    4                         sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca)) 
     3@@ -1145,6 +1145,12 @@ int ath9k_init_debug(struct ath_hw *ah) 
     4                        sc, &fops_regdump)) 
    55                goto err; 
    66  
  • trunk/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch

    r24159 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    22+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    3 @@ -120,6 +120,9 @@ static void ath_unregister_led(struct at 
    4   
    5  void ath_deinit_leds(struct ath_softc *sc) 
     3@@ -41,6 +41,9 @@ void ath_init_leds(struct ath_softc *sc) 
    64 { 
    7 +       if (AR_SREV_9100(sc->sc_ah)) 
    8 +               return; 
    9 + 
    10         ath_unregister_led(&sc->assoc_led); 
    11         sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; 
    12         ath_unregister_led(&sc->tx_led); 
    13 @@ -133,6 +136,9 @@ void ath_init_leds(struct ath_softc *sc) 
    14         char *trigger; 
    155        int ret; 
    166  
     
    2010        if (AR_SREV_9287(sc->sc_ah)) 
    2111                sc->sc_ah->led_pin = ATH_LED_PIN_9287; 
    22         else 
     12        else if (AR_SREV_9485(sc->sc_ah)) 
  • trunk/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r25749 r26128  
    1919 #include "ath9k.h" 
    2020  
    21 @@ -522,6 +523,7 @@ static void ath9k_init_misc(struct ath_s 
     21@@ -537,6 +538,7 @@ static void ath9k_init_misc(struct ath_s 
    2222 static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
    2323                            const struct ath_bus_ops *bus_ops) 
     
    2727        struct ath_common *common; 
    2828        int ret = 0, i; 
    29 @@ -536,7 +538,7 @@ static int ath9k_init_softc(u16 devid, s 
     29@@ -551,7 +553,7 @@ static int ath9k_init_softc(u16 devid, s 
    3030        ah->hw_version.subsysid = subsysid; 
    3131        sc->sc_ah = ah; 
     
    3636  
    3737        common = ath9k_hw_common(ah); 
    38 @@ -572,6 +574,9 @@ static int ath9k_init_softc(u16 devid, s 
     38@@ -587,6 +589,9 @@ static int ath9k_init_softc(u16 devid, s 
    3939        if (ret) 
    4040                goto err_hw; 
  • trunk/package/mac80211/patches/409-ath9k_platform_settings.patch

    r25749 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -538,8 +538,14 @@ static int ath9k_init_softc(u16 devid, s 
     3@@ -553,8 +553,14 @@ static int ath9k_init_softc(u16 devid, s 
    44        ah->hw_version.subsysid = subsysid; 
    55        sc->sc_ah = ah; 
     
    3030--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    3131+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    32 @@ -139,10 +139,12 @@ void ath_init_leds(struct ath_softc *sc) 
     32@@ -44,12 +44,14 @@ void ath_init_leds(struct ath_softc *sc) 
    3333        if (AR_SREV_9100(sc->sc_ah)) 
    3434                return; 
     
    3636-       if (AR_SREV_9287(sc->sc_ah)) 
    3737-               sc->sc_ah->led_pin = ATH_LED_PIN_9287; 
     38-       else if (AR_SREV_9485(sc->sc_ah)) 
     39-               sc->sc_ah->led_pin = ATH_LED_PIN_9485; 
    3840-       else 
    3941-               sc->sc_ah->led_pin = ATH_LED_PIN_DEF; 
     
    4143+               if (AR_SREV_9287(sc->sc_ah)) 
    4244+                       sc->sc_ah->led_pin = ATH_LED_PIN_9287; 
     45+               else if (AR_SREV_9485(sc->sc_ah)) 
     46+                       sc->sc_ah->led_pin = ATH_LED_PIN_9485; 
    4347+               else 
    4448+                       sc->sc_ah->led_pin = ATH_LED_PIN_DEF; 
  • trunk/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch

    r25425 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1027,6 +1027,53 @@ static const struct file_operations fops 
    4         .llseek = default_llseek, 
     3@@ -1077,6 +1077,53 @@ static const struct file_operations fops 
     4        .llseek = default_llseek,/* read accesses f_pos */ 
    55 }; 
    66  
     
    5555 { 
    5656        struct ath_common *common = ath9k_hw_common(ah); 
    57 @@ -1097,6 +1144,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
     57@@ -1151,6 +1198,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5858        debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR, 
    5959                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val); 
  • trunk/package/mac80211/patches/520-mac80211_drv_tim_override.patch

    r26127 r26128  
    11--- a/include/net/mac80211.h 
    22+++ b/include/net/mac80211.h 
    3 @@ -2209,6 +2209,18 @@ static inline int ieee80211_sta_ps_trans 
     3@@ -2216,6 +2216,18 @@ static inline int ieee80211_sta_ps_trans 
    44 #define IEEE80211_TX_STATUS_HEADROOM   13 
    55  
  • trunk/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch

    r26127 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -203,6 +203,7 @@ struct ath_atx_ac { 
     3@@ -202,6 +202,7 @@ struct ath_atx_ac { 
    44        int sched; 
    55        struct list_head list; 
     
    99  
    1010 struct ath_frame_info { 
    11 @@ -260,6 +261,8 @@ struct ath_node { 
     11@@ -259,6 +260,8 @@ struct ath_node { 
    1212        struct ath_atx_ac ac[WME_NUM_AC]; 
    1313        u16 maxampdu; 
     
    1818  
    1919 #define AGGR_CLEANUP         BIT(1) 
    20 @@ -341,6 +344,9 @@ int ath_tx_aggr_start(struct ath_softc * 
     20@@ -340,6 +343,9 @@ int ath_tx_aggr_start(struct ath_softc * 
    2121 void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); 
    2222 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); 
     
    5858                         const struct ieee80211_tx_queue_params *params) 
    5959 { 
    60 @@ -2191,6 +2212,7 @@ struct ieee80211_ops ath9k_ops = { 
     60@@ -2177,6 +2198,7 @@ struct ieee80211_ops ath9k_ops = { 
    6161        .configure_filter   = ath9k_configure_filter, 
    6262        .sta_add            = ath9k_sta_add, 
     
    190190 { 
    191191        struct ath_atx_tid *txtid; 
    192 @@ -1493,7 +1570,6 @@ static int setup_tx_flags(struct sk_buff 
     192@@ -1491,7 +1568,6 @@ static int setup_tx_flags(struct sk_buff 
    193193        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); 
    194194        int flags = 0; 
     
    198198  
    199199        if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) 
    200 @@ -1756,6 +1832,9 @@ static void ath_tx_start_dma(struct ath_ 
     200@@ -1754,6 +1830,9 @@ static void ath_tx_start_dma(struct ath_ 
    201201                if (txctl->paprd) 
    202202                        bf->bf_state.bfs_paprd_timestamp = jiffies; 
  • trunk/package/mac80211/patches/522-ath9k_remove_pending_frames_workaround.patch

    r26127 r26128  
    11--- a/drivers/net/wireless/ath/ath9k/xmit.c 
    22+++ b/drivers/net/wireless/ath/ath9k/xmit.c 
    3 @@ -2226,33 +2226,6 @@ static void ath_tx_complete_poll_work(st 
     3@@ -2223,33 +2223,6 @@ static void ath_tx_complete_poll_work(st 
    44                                } else { 
    55                                        txq->axq_tx_inprogress = true; 
  • trunk/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch

    r25749 r26128  
    11--- a/drivers/net/wireless/mwl8k.c 
    22+++ b/drivers/net/wireless/mwl8k.c 
    3 @@ -4502,6 +4502,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
     3@@ -4500,6 +4500,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
    44 MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); 
    55  
Note: See TracChangeset for help on using the changeset viewer.