Ignore:
Timestamp:
2011-08-29T11:55:11+02:00 (5 years ago)
Author:
nbd
Message:

ath9k: fix a tx aggregation padding issue

File:
1 edited

Legend:

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

    r28093 r28113  
    5858                u16 seqno = bf->bf_state.seqno; 
    5959  
    60 @@ -834,6 +844,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ 
     60@@ -836,6 +846,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ 
    6161                        ath_tx_addto_baw(sc, tid, seqno); 
    6262                ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim); 
     
    6666                list_add_tail(&bf->list, bf_q); 
    6767                if (bf_prev) { 
    68 @@ -1489,6 +1500,8 @@ static void ath_tx_send_ampdu(struct ath 
     68@@ -1491,6 +1502,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 @@ -1817,23 +1830,13 @@ error: 
     77@@ -1819,23 +1832,13 @@ error: 
    7878  
    7979 /* FIXME: tx power */ 
     
    101101        if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && tid) { 
    102102                /* 
    103 @@ -1875,6 +1878,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     103@@ -1877,6 +1880,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 @@ -1907,6 +1911,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     111@@ -1909,6 +1913,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
    112112  
    113113                skb_push(skb, padsize); 
     
    117117  
    118118        if ((vif && vif->type != NL80211_IFTYPE_AP && 
    119 @@ -1916,6 +1921,24 @@ int ath_tx_start(struct ieee80211_hw *hw 
     119@@ -1918,6 +1923,24 @@ int ath_tx_start(struct ieee80211_hw *hw 
    120120  
    121121        setup_frame_info(hw, skb, frmlen); 
     
    142142         * At this point, the vif, hw_key and sta pointers in the tx control 
    143143         * info are no longer valid (overwritten by the ath_frame_info data. 
    144 @@ -1930,7 +1953,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
     144@@ -1932,7 +1955,7 @@ int ath_tx_start(struct ieee80211_hw *hw 
    145145        } 
    146146        spin_unlock_bh(&txq->axq_lock); 
Note: See TracChangeset for help on using the changeset viewer.