package/kernel/mac80211/patches/314-mac80211-minstrel_ht-move-aggregation-check-to-.get_.patch

   1 From: Felix Fietkau <nbd@openwrt.org>
   2 Date: Sat, 15 Nov 2014 22:16:36 +0100
   3 Subject: [PATCH] mac80211: minstrel_ht: move aggregation check to
   4  .get_rate()
   5
   6 Preparation for adding a no-skb tx status path
   7
   8 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
   9 ---
  10
  11 --- a/net/mac80211/rc80211_minstrel_ht.c
  12 +++ b/net/mac80211/rc80211_minstrel_ht.c
  13 @@ -782,9 +782,6 @@ minstrel_ht_tx_status(void *priv, struct
  14         if (time_after(jiffies, mi->stats_update + (mp->update_interval / 2 * HZ) / 1000)) {
  15                 update = true;
  16                 minstrel_ht_update_stats(mp, mi);
  17 -               if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
  18 -                   mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
  19 -                       minstrel_aggr_check(sta, skb);
  20         }
  21
  22         if (update)
  23 @@ -1026,6 +1023,10 @@ minstrel_ht_get_rate(void *priv, struct
  24         if (!msp->is_ht)
  25                 return mac80211_minstrel.get_rate(priv, sta, &msp->legacy, txrc);
  26
  27 +       if (!(info->flags & IEEE80211_TX_CTL_AMPDU) &&
  28 +               mi->max_prob_rate / MCS_GROUP_RATES != MINSTREL_CCK_GROUP)
  29 +               minstrel_aggr_check(sta, txrc->skb);
  30 +
  31         info->flags |= mi->tx_flags;
  32         minstrel_ht_check_cck_shortpreamble(mp, mi, txrc->short_preamble);
  33