Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 152e585dc9fe2c3436e87cc982f2446697778228

Authored by Bill Jordan
Committed by John W. Linville
1 parent cbe1e82a54
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ath9k: fix MGMT packets when using TKIP 

Prevent 8 bytes from being truncated from MGMT packets
when using TKIP.

Signed-off-by: Bill Jordan <bjordan@rajant.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/net/wireless/ath/ath9k/recv.c
Diff comments   View file @ 152e585
... ... @@ -824,7 +824,8 @@
824 824 is_mc = !!is_multicast_ether_addr(hdr->addr1);
825 825 is_valid_tkip = rx_stats->rs_keyix != ATH9K_RXKEYIX_INVALID &&
826 826 test_bit(rx_stats->rs_keyix, common->tkip_keymap);
827   - strip_mic = is_valid_tkip && !(rx_stats->rs_status &
  827 + strip_mic = is_valid_tkip && ieee80211_is_data(fc) &&
  828 + !(rx_stats->rs_status &
828 829 (ATH9K_RXERR_DECRYPT | ATH9K_RXERR_CRC | ATH9K_RXERR_MIC));
829 830  
830 831 if (!rx_stats->rs_datalen)