From 978b10fbe03421d75ceb3687f735341b79925b29 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Jan 2011 13:52:23 +0100 Subject: [PATCH] --- yaml --- r: 236743 b: refs/heads/master c: 5dd36bc933e8be84f8369ac64505a2938f9ce036 h: refs/heads/master i: 236741: e5871d0ef49e932c8fbf9261e702636e2bb8b014 236739: c0c714b140de8335ba0ecbb9fea84b372d1d33f0 236735: e16fb19437e275e5c387c243257dfbdc1a6b9a1b v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 5 +++++ trunk/net/mac80211/agg-tx.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 350994f4ac33..01113a51c5de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b01f030d38e00650e2db42da083d8647aad40a5 +refs/heads/master: 5dd36bc933e8be84f8369ac64505a2938f9ce036 diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 5afe341b4010..d6b0045788ce 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -1154,6 +1154,10 @@ enum ieee80211_hw_flags { * This is only relevant if the device has restrictions on the * number of subframes, if it relies on mac80211 to do reordering * it shouldn't be set. + * + * @max_tx_aggregation_subframes: maximum number of subframes in an + * aggregate an HT driver will transmit, used by the peer as a + * hint to size its reorder buffer. */ struct ieee80211_hw { struct ieee80211_conf conf; @@ -1173,6 +1177,7 @@ struct ieee80211_hw { u8 max_report_rates; u8 max_rate_tries; u8 max_rx_aggregation_subframes; + u8 max_tx_aggregation_subframes; }; /** diff --git a/trunk/net/mac80211/agg-tx.c b/trunk/net/mac80211/agg-tx.c index 42f7c9007331..63d852cb4ca2 100644 --- a/trunk/net/mac80211/agg-tx.c +++ b/trunk/net/mac80211/agg-tx.c @@ -342,7 +342,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) /* send AddBA request */ ieee80211_send_addba_request(sdata, sta->sta.addr, tid, tid_tx->dialog_token, start_seq_num, - 0x40, tid_tx->timeout); + local->hw.max_tx_aggregation_subframes, + tid_tx->timeout); } int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,