aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-02-21 14:14:17 +0000
committerFlorian Fainelli <florian@openwrt.org>2010-02-21 14:14:17 +0000
commit0ddfa39ecbd420ed9a6eff35bb61d8a236d9a9a5 (patch)
tree5cdc98e67a00aa15a1318c773fce30242763b7de
parent87b2e6c25b7af313f35ff375c6414c66094c932b (diff)
downloadupstream-0ddfa39ecbd420ed9a6eff35bb61d8a236d9a9a5.tar.gz
upstream-0ddfa39ecbd420ed9a6eff35bb61d8a236d9a9a5.tar.bz2
upstream-0ddfa39ecbd420ed9a6eff35bb61d8a236d9a9a5.zip
mac80211: fix an eap frame handling bug in ath9k - fixes client mode rekeying issues
SVN-Revision: 19789
-rw-r--r--package/mac80211/patches/560-ath9k_fix_eap_handling.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/mac80211/patches/560-ath9k_fix_eap_handling.patch b/package/mac80211/patches/560-ath9k_fix_eap_handling.patch
new file mode 100644
index 0000000000..d72fa97ad7
--- /dev/null
+++ b/package/mac80211/patches/560-ath9k_fix_eap_handling.patch
@@ -0,0 +1,37 @@
+--- 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);