ath9k: fix a client mode crash that happens on wpa rekeying
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 590-ath9k_rekey_crash_fix.patch
1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3 @@ -1353,25 +1353,6 @@ static enum ath9k_pkt_type get_hw_packet
4 return htype;
5 }
6
7 -static bool is_pae(struct sk_buff *skb)
8 -{
9 - struct ieee80211_hdr *hdr;
10 - __le16 fc;
11 -
12 - hdr = (struct ieee80211_hdr *)skb->data;
13 - fc = hdr->frame_control;
14 -
15 - if (ieee80211_is_data(fc)) {
16 - if (ieee80211_is_nullfunc(fc) ||
17 - /* Port Access Entity (IEEE 802.1X) */
18 - (skb->protocol == cpu_to_be16(ETH_P_PAE))) {
19 - return true;
20 - }
21 - }
22 -
23 - return false;
24 -}
25 -
26 static int get_hw_crypto_keytype(struct sk_buff *skb)
27 {
28 struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
29 @@ -1696,7 +1677,7 @@ static void ath_tx_start_dma(struct ath_
30 goto tx_done;
31 }
32
33 - if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && !is_pae(skb)) {
34 + if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
35 /*
36 * Try aggregation if it's a unicast data frame
37 * and the destination is HT capable.