Ignore:
Timestamp:
2011-03-30T14:37:36+02:00 (6 years ago)
Author:
nbd
Message:

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

File:
1 moved

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/patches/521-ath9k_fix_ap_ps_buffering.patch

    r26365 r26370  
    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); 
     
    3030--- a/drivers/net/wireless/ath/ath9k/main.c 
    3131+++ b/drivers/net/wireless/ath/ath9k/main.c 
    32 @@ -1791,6 +1791,27 @@ static int ath9k_sta_remove(struct ieee8 
     32@@ -1795,6 +1795,27 @@ static int ath9k_sta_remove(struct ieee8 
    3333        return 0; 
    3434 } 
     
    5858                         const struct ieee80211_tx_queue_params *params) 
    5959 { 
    60 @@ -2191,6 +2212,7 @@ struct ieee80211_ops ath9k_ops = { 
     60@@ -2197,6 +2218,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; 
     
    224224--- a/drivers/net/wireless/ath/ath9k/hw.h 
    225225+++ b/drivers/net/wireless/ath/ath9k/hw.h 
    226 @@ -642,6 +642,7 @@ struct ath_hw_ops { 
     226@@ -630,6 +630,7 @@ struct ath_hw_ops { 
    227227                                     u32 burstDuration); 
    228228        void (*set11n_virtualmorefrag)(struct ath_hw *ah, void *ds, 
Note: See TracChangeset for help on using the changeset viewer.