mac80211: allow AMSDU size limitation per-TID

Some drivers may have AMSDU size limitation per TID, due to
HW constrains. Add an option to set this limit.

Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index fe71cec8ba42a83df04233df720a2ec00370276f..28da9e27ea700c3548dc2c38ac0db12c92bfa448 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1853,6 +1853,7 @@ struct ieee80211_sta_rates {
  *     unlimited.
  * @support_p2p_ps: indicates whether the STA supports P2P PS mechanism or not.
  * @max_rc_amsdu_len: Maximum A-MSDU size in bytes recommended by rate control.
+ * @max_tid_amsdu_len: Maximum A-MSDU size in bytes for this TID
  * @txq: per-TID data TX queues (if driver uses the TXQ abstraction); note that
  *     the last entry (%IEEE80211_NUM_TIDS) is used for non-data frames
  */
@@ -1894,6 +1895,7 @@ struct ieee80211_sta {
        u16 max_amsdu_len;
        bool support_p2p_ps;
        u16 max_rc_amsdu_len;
+       u16 max_tid_amsdu_len[IEEE80211_NUM_TIDS];
 
        struct ieee80211_txq *txq[IEEE80211_NUM_TIDS + 1];
 

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 96b6c9b09bd2971aaeb4a472dc6b82b9ae280997..42f44c33a133c4acc0fe200663ca6f96e176ee9b 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3225,6 +3225,10 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
                max_amsdu_len = min_t(int, max_amsdu_len,
                                      sta->sta.max_rc_amsdu_len);
 
+       if (sta->sta.max_tid_amsdu_len[tid])
+               max_amsdu_len = min_t(int, max_amsdu_len,
+                                     sta->sta.max_tid_amsdu_len[tid]);
+
        spin_lock_bh(&fq->lock);
 
        /* TODO: Ideally aggregation should be done on dequeue to remain