mac80211: allow advertising correct maximum aggregate size (5dd36bc9) · Commits · 戴 / test

Currently, mac80211 always advertises that it may send up to 64 subframes in an aggregate. This is fine, since it's the max, but might as well be set to zero instead since it doesn't have any information. However, drivers might have that information, so allow them to set a variable giving it, which will then be used. The default of zero will be fine since to the peer that means we don't know and it will just use its own limit for the buffer size. Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Signed-off-by:

John W. Linville <linville@tuxdriver.com>

include/net/mac80211.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		};

		/**

net/mac80211/agg-tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,

Admin message