Patch "mac80211: don't reorder frames with SN smaller than SSN" has been added to the 4.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
mac80211: don't reorder frames with SN smaller than SSN
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mac80211-don-t-reorder-frames-with-sn-smaller-than-ssn.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
b7540d8f25c8034de7e4163fc23ac457bf057731Mon Sep 17 00:00:00 2001
From: Sara Sharon <[email protected]>
Date: Mon, 6 Feb 2017 15:28:42 +0200
Subject: mac80211: don't reorder frames with SN smaller than SSN
From: Sara Sharon <[email protected]>
commit b7540d8f25c8034de7e4163fc23ac457bf057731 upstream.
When RX aggregation starts, transmitter may continue send frames with SN smaller than SSN until the AddBA response is received. However, the reorder buffer is already initialized at this point, which will cause the drop of such frames as duplicates since the head SN of the reorder buffer is set to the SSN, which is bigger.
--- net/mac80211/agg-rx.c | 1 + net/mac80211/rx.c | 14 +++++++++++++- net/mac80211/sta_info.h | 6 ++++-- 3 files changed, 18 insertions(+), 3 deletions(-)
net/mac80211/agg-rx.c +1 -0
@@ -398,6 +398,7 @@ void __ieee80211_start_rx_ba_session(str tid_agg_rx->timeout = timeout; tid_agg_rx->stored_mpdu_num =0 ; tid_agg_rx->auto_seq = auto_seq; + tid_agg_rx->started = false; tid_agg_rx->reorder_buf_filtered =0 ; status =WLAN_STATUS_SUCCESS ;
net/mac80211/rx.c +13 -1
@@ -4,7 +4,7 @@* Copyright 2006-2007 Jiri Benc <[email protected]> * Copyright 2007-2010 Johannes Berg <[email protected]> * Copyright 2013-2014 Intel Mobile Communications GmbH -* Copyright(c) 2015 - 2016 Intel Deutschland GmbH +* Copyright(c) 2015 - 2017 Intel Deutschland GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -1034,6 +1034,18 @@ static bool ieee80211_sta_manage_reorder buf_size = tid_agg_rx->buf_size; head_seq_num = tid_agg_rx->head_seq_num; +/* +* If the current MPDU's SN is smaller than the SSN, it shouldn't +* be reordered. +*/ +if (unlikely (!tid_agg_rx->started)) { +if (ieee80211_sn_less (mpdu_seq_num, head_seq_num)) { + ret = false; + goto out; + } + tid_agg_rx->started = true; + } +/* frame with out of date sequence number */ if (ieee80211_sn_less (mpdu_seq_num, head_seq_num)) {dev_kfree_skb (skb);
net/mac80211/sta_info.h +4 -2
@@ -189,6 +189,7 @@ struct tid_ampdu_tx {* @auto_seq: used for offloaded BA sessions to automatically pick head_seq_and * and ssn. * @removed: this session is removed (but might have been found due to RCU) +* @started: this session has started (head ssn or higher was received) * * This structure's lifetime is managed by RCU, assignments to * the array holding it must hold the aggregation mutex.
@@ -212,8 +213,9 @@ struct tid_ampdu_rx {u16 ssn;u16 buf_size;u16 timeout; -bool auto_seq; -bool removed; + u8 auto_seq:1, + removed:1, + started:1; };/**
Patches currently in stable-queue which might be from [email protected] are
queue-4.10/mac80211-don-t-reorder-frames-with-sn-smaller-than-ssn.patch