This is already done by rt2x00 and ath9k by checking the IEEE80211_TX_CTL_RATE_CTRL_PROBE flag. Instead we can simply do it in minstrel_ht. Signed-off-by: Helmut Schaa <helmut.schaa@xxxxxxxxxxxxxx> --- Felix, I didn't have a closer look at the ath9k aggregation code but I guess it can also be simplified with this change. Any objections? Thanks, Helmut net/mac80211/rc80211_minstrel_ht.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 2158838..6a7bbe0 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -627,6 +627,8 @@ minstrel_ht_get_rate(void *priv, struct ieee80211_sta *sta, void *priv_sta, minstrel_ht_set_rate(mp, mi, &ar[0], sample_idx, txrc, true, false); info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE; + /* don't aggregate probe frames */ + info->flags &= ~IEEE80211_TX_CTL_AMPDU; } else { minstrel_ht_set_rate(mp, mi, &ar[0], mi->max_tp_rate, txrc, false, false); -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html