* [PATCH] ath9k: Fix sequence number assignment for non-data frames
@ 2014-03-12 9:37 Helmut Schaa
2014-03-12 9:51 ` Felix Fietkau
0 siblings, 1 reply; 2+ messages in thread
From: Helmut Schaa @ 2014-03-12 9:37 UTC (permalink / raw)
To: linux-wireless; +Cc: linville, Helmut Schaa, Felix Fietkau
Since commit 558ff225de80ac95b132d3a115ddadcd64498b4f (ath9k: fix
ps-poll responses under a-mpdu sessions) non-data frames would have
gotten a sequence number from a TIDs sequence counter instead of
using the global sequence counter.
This can lead to instable connections.
To fix this only select the correct TID if we are processing a
data frame. Furthermore, prevent non-data frames to get a sequence
number from a TID sequence counter by adding a check to
ath_tx_setup_buffer.
Cc: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
---
drivers/net/wireless/ath/ath9k/xmit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index fafacfe..69d04d5 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -2064,7 +2064,7 @@ static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc,
ATH_TXBUF_RESET(bf);
- if (tid) {
+ if (tid && ieee80211_is_data_present(hdr->frame_control)) {
fragno = le16_to_cpu(hdr->seq_ctrl) & IEEE80211_SCTL_FRAG;
seqno = tid->seq_next;
hdr->seq_ctrl = cpu_to_le16(tid->seq_next << IEEE80211_SEQ_SEQ_SHIFT);
@@ -2187,7 +2187,7 @@ int ath_tx_start(struct ieee80211_hw *hw, struct sk_buff *skb,
txq->stopped = true;
}
- if (txctl->an)
+ if (txctl->an && ieee80211_is_data_present(hdr->frame_control))
tid = ath_get_skb_tid(sc, txctl->an, skb);
if (info->flags & IEEE80211_TX_CTL_PS_RESPONSE) {
--
1.8.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ath9k: Fix sequence number assignment for non-data frames
2014-03-12 9:37 [PATCH] ath9k: Fix sequence number assignment for non-data frames Helmut Schaa
@ 2014-03-12 9:51 ` Felix Fietkau
0 siblings, 0 replies; 2+ messages in thread
From: Felix Fietkau @ 2014-03-12 9:51 UTC (permalink / raw)
To: Helmut Schaa, linux-wireless; +Cc: linville
On 2014-03-12 10:37, Helmut Schaa wrote:
> Since commit 558ff225de80ac95b132d3a115ddadcd64498b4f (ath9k: fix
> ps-poll responses under a-mpdu sessions) non-data frames would have
> gotten a sequence number from a TIDs sequence counter instead of
> using the global sequence counter.
>
> This can lead to instable connections.
>
> To fix this only select the correct TID if we are processing a
> data frame. Furthermore, prevent non-data frames to get a sequence
> number from a TID sequence counter by adding a check to
> ath_tx_setup_buffer.
>
> Cc: Felix Fietkau <nbd@openwrt.org>
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-12 9:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-12 9:37 [PATCH] ath9k: Fix sequence number assignment for non-data frames Helmut Schaa
2014-03-12 9:51 ` Felix Fietkau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).