1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3 @@ -906,9 +906,9 @@ static enum ATH_AGGR_STATUS ath_tx_form_
5 #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
6 struct ath_buf *bf, *bf_first = NULL, *bf_prev = NULL;
7 - int rl = 0, nframes = 0, ndelim, prev_al = 0;
8 + int nframes = 0, ndelim;
9 u16 aggr_limit = 0, al = 0, bpad = 0,
10 - al_delta, h_baw = tid->baw_size / 2;
11 + al_delta, h_baw = tid->baw_size / 2;
12 enum ATH_AGGR_STATUS status = ATH_AGGR_DONE;
13 struct ieee80211_tx_info *tx_info;
14 struct ath_frame_info *fi;
15 @@ -925,33 +925,24 @@ static enum ATH_AGGR_STATUS ath_tx_form_
17 fi = get_frame_info(skb);
24 ath_set_rates(tid->an->vif, tid->an->sta, bf);
25 aggr_limit = ath_lookup_rate(sc, bf, tid);
29 /* do not exceed aggregation limit */
30 al_delta = ATH_AGGR_DELIM_SZ + fi->framelen;
32 + if (aggr_limit < al + bpad + al_delta ||
33 + ath_lookup_legacy(bf) || nframes >= h_baw) {
34 + status = ATH_AGGR_LIMITED;
39 - ((aggr_limit < (al + bpad + al_delta + prev_al)) ||
40 - ath_lookup_legacy(bf))) {
41 - status = ATH_AGGR_LIMITED;
45 - tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
46 - if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
49 - /* do not exceed subframe limit */
50 - if (nframes >= min((int)h_baw, ATH_AMPDU_SUBFRAME_DEFAULT)) {
51 - status = ATH_AGGR_LIMITED;
53 + tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
54 + if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
58 /* add padding for previous frame to aggregation length */
59 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
60 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
61 @@ -137,7 +137,6 @@ int ath_descdma_setup(struct ath_softc *
62 #define ATH_AGGR_ENCRYPTDELIM 10
63 /* minimum h/w qdepth to be sustained to maximize aggregation */
64 #define ATH_AGGR_MIN_QDEPTH 2
65 -#define ATH_AMPDU_SUBFRAME_DEFAULT 32
67 #define IEEE80211_SEQ_SEQ_SHIFT 4
68 #define IEEE80211_SEQ_MAX 4096