aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-03-12 03:03:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-03-12 03:03:57 +0000
commita95d43125c62cad95b8a6eb4e1c570fe360bedd0 (patch)
tree52cf739385a40f8e818200a5abdb672fab8cf72c /package/mac80211
parentb321fe82d325064f971a6dcda21696a4d82ba396 (diff)
downloadupstream-a95d43125c62cad95b8a6eb4e1c570fe360bedd0.tar.gz
upstream-a95d43125c62cad95b8a6eb4e1c570fe360bedd0.tar.bz2
upstream-a95d43125c62cad95b8a6eb4e1c570fe360bedd0.zip
ath9k: fix a client mode crash that happens on wpa rekeying
SVN-Revision: 20155
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/590-ath9k_rekey_crash_fix.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/mac80211/patches/590-ath9k_rekey_crash_fix.patch b/package/mac80211/patches/590-ath9k_rekey_crash_fix.patch
new file mode 100644
index 0000000000..484c8c8995
--- /dev/null
+++ b/package/mac80211/patches/590-ath9k_rekey_crash_fix.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);
+@@ -1696,7 +1677,7 @@ static void ath_tx_start_dma(struct ath_
+ goto tx_done;
+ }
+
+- if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
++ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
+ /*
+ * Try aggregation if it's a unicast data frame
+ * and the destination is HT capable.