package/mac80211/patches/564-ath9k_cleanup_form_aggr.patch

   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_
   4  {
   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_
  16                 skb = bf->bf_mpdu;
  17                 fi = get_frame_info(skb);
  18
  19 -               if (!bf_first)
  20 +               if (!bf_first) {
  21                         bf_first = bf;
  22 -
  23 -               if (!rl) {
  24                         ath_set_rates(tid->an->vif, tid->an->sta, bf);
  25                         aggr_limit = ath_lookup_rate(sc, bf, tid);
  26 -                       rl = 1;
  27                 }
  28
  29                 /* do not exceed aggregation limit */
  30                 al_delta = ATH_AGGR_DELIM_SZ + fi->framelen;
  31 +               if (nframes) {
  32 +                       if (aggr_limit < al + bpad + al_delta ||
  33 +                           ath_lookup_legacy(bf) || nframes >= h_baw) {
  34 +                               status = ATH_AGGR_LIMITED;
  35 +                               break;
  36 +                       }
  37
  38 -               if (nframes &&
  39 -                   ((aggr_limit < (al + bpad + al_delta + prev_al)) ||
  40 -                    ath_lookup_legacy(bf))) {
  41 -                       status = ATH_AGGR_LIMITED;
  42 -                       break;
  43 -               }
  44 -
  45 -               tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
  46 -               if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE))
  47 -                       break;
  48 -
  49 -               /* do not exceed subframe limit */
  50 -               if (nframes >= min((int)h_baw, ATH_AMPDU_SUBFRAME_DEFAULT)) {
  51 -                       status = ATH_AGGR_LIMITED;
  52 -                       break;
  53 +                       tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
  54 +                       if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
  55 +                               break;
  56                 }
  57
  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
  66
  67  #define IEEE80211_SEQ_SEQ_SHIFT    4
  68  #define IEEE80211_SEQ_MAX          4096