Ignore:
Timestamp:
2011-11-18T12:27:19+01:00 (5 years ago)
Author:
nbd
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/540-ath9k_limit_qlen.patch

    r28711 r29240  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -237,6 +237,7 @@ struct ath_atx_tid { 
     3@@ -238,6 +238,7 @@ struct ath_atx_tid { 
    44        struct ath_node *an; 
    55        struct ath_atx_ac *ac; 
     
    99        u16 seq_next; 
    1010        u16 baw_size; 
    11 @@ -282,6 +283,9 @@ struct ath_tx_control { 
     11@@ -284,6 +285,9 @@ struct ath_tx_control { 
    1212  *  (axq_qnum). 
    1313  */ 
     
    2121--- a/drivers/net/wireless/ath/ath9k/debug.c 
    2222+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    23 @@ -1679,6 +1679,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
     23@@ -1685,6 +1685,10 @@ int ath9k_init_debug(struct ath_hw *ah) 
    2424                            sc, &fops_wiphy); 
    2525        debugfs_create_file("xmit", S_IRUSR, sc->debug.debugfs_phy, sc, 
     
    5858                u16 seqno = bf->bf_state.seqno; 
    5959  
    60 @@ -821,6 +831,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ 
     60@@ -824,6 +834,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ 
    6161                        ath_tx_addto_baw(sc, tid, seqno); 
    6262                bf->bf_state.ndelim = ndelim; 
     
    6666                list_add_tail(&bf->list, bf_q); 
    6767                if (bf_prev) 
    68 @@ -1680,6 +1691,8 @@ static void ath_tx_send_ampdu(struct ath 
     68@@ -1683,6 +1694,8 @@ static void ath_tx_send_ampdu(struct ath 
    6969        /* Add sub-frame to BAW */ 
    7070        ath_tx_addto_baw(sc, tid, bf->bf_state.seqno); 
     
    7575        TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw); 
    7676        bf->bf_lastbf = bf; 
    77 @@ -1808,23 +1821,13 @@ error: 
     77@@ -1811,23 +1824,13 @@ error: 
    7878  
    7979 /* FIXME: tx power */ 
     
    101101        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { 
    102102                /* 
    103 @@ -1859,6 +1862,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     103@@ -1862,6 +1865,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
    104104        struct ieee80211_vif *vif = info->control.vif; 
    105105        struct ath_softc *sc = hw->priv; 
     
    109109        int frmlen = skb->len + FCS_LEN; 
    110110        int q; 
    111 @@ -1901,6 +1905,24 @@ int ath_tx_start(struct ieee80211_hw *hw 
     111@@ -1904,6 +1908,24 @@ int ath_tx_start(struct ieee80211_hw *hw 
    112112  
    113113        setup_frame_info(hw, skb, frmlen); 
     
    134134         * At this point, the vif, hw_key and sta pointers in the tx control 
    135135         * info are no longer valid (overwritten by the ath_frame_info data. 
    136 @@ -1915,7 +1937,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     136@@ -1918,7 +1940,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
    137137        } 
    138138        spin_unlock_bh(&txq->axq_lock); 
Note: See TracChangeset for help on using the changeset viewer.