From: Thomas Pedersen <thomas@cozybit.com>
To: linux-wireless@vger.kernel.org
Cc: Thomas Pedersen <thomas@cozybit.com>,
johannes@sipsolutions.net, linville@tuxdriver.com
Subject: [PATCH v2 3/4] mac80211: check if frame is really part of this BA
Date: Mon, 31 Oct 2011 00:12:40 -0700 [thread overview]
Message-ID: <1320045161-16144-3-git-send-email-thomas@cozybit.com> (raw)
In-Reply-To: <1320045161-16144-1-git-send-email-thomas@cozybit.com>
There was an an implicit assumption that any QoS data frame received
from a STA/TID with an active BA session was sent to this vif as part of
a BA. This is not true if IFF_PROMISC is enabled and the frame was
destined for a different peer, for example. Don't treat these frames as
part of a BA from the sending STA.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
---
net/mac80211/rx.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index b9d3236..0995685 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -777,6 +777,10 @@ static void ieee80211_rx_reorder_ampdu(struct ieee80211_rx_data *rx)
(ack_policy == IEEE80211_QOS_CTL_ACK_POLICY_NORMAL)))
goto dont_reorder;
+ /* not actually part of this BA session */
+ if (compare_ether_addr(hdr->addr1, rx->sdata->vif.addr) != 0)
+ goto dont_reorder;
+
/* new, potentially un-ordered, ampdu frame - process it */
/* reset session timer */
--
1.7.5.4
next prev parent reply other threads:[~2011-10-31 7:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-31 7:12 [PATCH v2 1/4] mac80211: Avoid filling up mesh preq queue with redundant requests Thomas Pedersen
2011-10-31 7:12 ` [PATCH v2 2/4] mac80211: QoS multicast frames have No Ack policy Thomas Pedersen
2011-10-31 7:12 ` Thomas Pedersen [this message]
2011-10-31 7:12 ` [PATCH v2 4/4] mac80211: Populate QoS header on mesh frames sent to gates Thomas Pedersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320045161-16144-3-git-send-email-thomas@cozybit.com \
--to=thomas@cozybit.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.