linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ath9k: fix PAE frame handling
@ 2010-01-31 21:33 Felix Fietkau
  2010-02-01  5:05 ` Sujith
  0 siblings, 1 reply; 9+ messages in thread
From: Felix Fietkau @ 2010-01-31 21:33 UTC (permalink / raw)
  To: linux-wireless; +Cc: Luis R. Rodriguez, John W. Linville

ath9k's tx handling code contains a special case for PAE frames, which
looks like it was intended to be improving reliability by excluding
them from aggregates.
What it actually did is the opposite: By assigning a faulty sequence
number, yet still keeping it as a qos-frame, it caused bogus packet
reordering, which broke WPA rekeying.
The special case handling is completely unnecessary, so this patch
removes it.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: stable@kernel.org
---
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1353,25 +1353,6 @@ static enum ath9k_pkt_type get_hw_packet
 	return htype;
 }
 
-static bool is_pae(struct sk_buff *skb)
-{
-	struct ieee80211_hdr *hdr;
-	__le16 fc;
-
-	hdr = (struct ieee80211_hdr *)skb->data;
-	fc = hdr->frame_control;
-
-	if (ieee80211_is_data(fc)) {
-		if (ieee80211_is_nullfunc(fc) ||
-		    /* Port Access Entity (IEEE 802.1X) */
-		    (skb->protocol == cpu_to_be16(ETH_P_PAE))) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 static int get_hw_crypto_keytype(struct sk_buff *skb)
 {
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
@@ -1610,7 +1591,7 @@ static int ath_tx_setup_buffer(struct ie
 		bf->bf_frmlen -= padsize;
 	}
 
-	if (conf_is_ht(&hw->conf) && !is_pae(skb))
+	if (conf_is_ht(&hw->conf))
 		bf->bf_state.bf_type |= BUF_HT;
 
 	bf->bf_flags = setup_tx_flags(sc, skb, txctl->txq);

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2010-02-16 19:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-31 21:33 [PATCH] ath9k: fix PAE frame handling Felix Fietkau
2010-02-01  5:05 ` Sujith
2010-02-01  5:16   ` Felix Fietkau
2010-02-04 10:07   ` Kalle Valo
2010-02-09  4:40     ` Sujith
2010-02-08 21:39   ` John W. Linville
2010-02-09  4:35     ` Sujith
2010-02-16 19:42   ` Felix Fietkau
2010-02-16 19:50     ` 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).