diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2015-12-08 16:04:34 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2016-01-14 11:13:13 +0100 |
| commit | fad471860c097844432c7cf5d3ae6a0a059c2bdc (patch) | |
| tree | 69b3c72930f7b8a94166c8871e004bc3c58bbc31 | |
| parent | f9cfa5f354b11e56cd8f019c12e14a42585586cd (diff) | |
| download | op-kernel-dev-fad471860c097844432c7cf5d3ae6a0a059c2bdc.zip op-kernel-dev-fad471860c097844432c7cf5d3ae6a0a059c2bdc.tar.gz | |
mac80211: pass RX aggregation window size to driver
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>
| -rw-r--r-- | include/net/mac80211.h | 8 | ||||
| -rw-r--r-- | net/mac80211/agg-rx.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index ecab934..a990338 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3047,9 +3047,11 @@ enum ieee80211_reconfig_type { * ieee80211_ampdu_mlme_action. Starting sequence number (@ssn) * is the first frame we expect to perform the action on. Notice * that TX/RX_STOP can pass NULL for this parameter. - * The @buf_size parameter is only valid when the action is set to - * %IEEE80211_AMPDU_TX_OPERATIONAL and indicates the peer's reorder - * buffer size (number of subframes) for this session -- the driver + * The @buf_size parameter is valid only when the action is set to + * %IEEE80211_AMPDU_RX_START or %IEEE80211_AMPDU_TX_OPERATIONAL and + * indicates the reorder buffer size (number of subframes) for this + * session. + * When the action is set to %IEEE80211_AMPDU_TX_OPERATIONAL the driver * may neither send aggregates containing more subframes than this * nor send aggregates in a way that lost frames would exceed the * buffer size. If just limiting the aggregate size, this would be diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 10ad4ac..7867273 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -323,7 +323,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, __skb_queue_head_init(&tid_agg_rx->reorder_buf[i]); ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START, - &sta->sta, tid, &start_seq_num, 0, false); + &sta->sta, tid, &start_seq_num, buf_size, false); ht_dbg(sta->sdata, "Rx A-MPDU request on %pM tid %d result %d\n", sta->sta.addr, tid, ret); if (ret) { |
