Skip to content

Commit 0fe94dd

Browse files
sara-sgregkh
authored andcommitted
mac80211: pass RX aggregation window size to driver
commit fad471860c097844432c7cf5d3ae6a0a059c2bdc upstream. Currently mac80211 does not inform the driver of the window size when starting an RX aggregation session. To enable managing the reorder buffer in the driver or hardware the window size is needed. Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Amit Pundir <amit.pundir@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent f85e0c5 commit 0fe94dd

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

include/net/mac80211.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3020,9 +3020,11 @@ enum ieee80211_reconfig_type {
30203020
* ieee80211_ampdu_mlme_action. Starting sequence number (@ssn)
30213021
* is the first frame we expect to perform the action on. Notice
30223022
* that TX/RX_STOP can pass NULL for this parameter.
3023-
* The @buf_size parameter is only valid when the action is set to
3024-
* %IEEE80211_AMPDU_TX_OPERATIONAL and indicates the peer's reorder
3025-
* buffer size (number of subframes) for this session -- the driver
3023+
* The @buf_size parameter is valid only when the action is set to
3024+
* %IEEE80211_AMPDU_RX_START or %IEEE80211_AMPDU_TX_OPERATIONAL and
3025+
* indicates the reorder buffer size (number of subframes) for this
3026+
* session.
3027+
* When the action is set to %IEEE80211_AMPDU_TX_OPERATIONAL the driver
30263028
* may neither send aggregates containing more subframes than this
30273029
* nor send aggregates in a way that lost frames would exceed the
30283030
* buffer size. If just limiting the aggregate size, this would be

net/mac80211/agg-rx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,
323323
__skb_queue_head_init(&tid_agg_rx->reorder_buf[i]);
324324

325325
ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,
326-
&sta->sta, tid, &start_seq_num, 0, false);
326+
&sta->sta, tid, &start_seq_num, buf_size, false);
327327
ht_dbg(sta->sdata, "Rx A-MPDU request on %pM tid %d result %d\n",
328328
sta->sta.addr, tid, ret);
329329
if (ret) {

0 commit comments

Comments
 (0)