diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/recv.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 14d479f8d8ac..1a62e351ec77 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
| @@ -1049,11 +1049,9 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common, | |||
| 1049 | int hdrlen, padpos, padsize; | 1049 | int hdrlen, padpos, padsize; |
| 1050 | u8 keyix; | 1050 | u8 keyix; |
| 1051 | __le16 fc; | 1051 | __le16 fc; |
| 1052 | bool is_mc; | ||
| 1053 | 1052 | ||
| 1054 | /* see if any padding is done by the hw and remove it */ | 1053 | /* see if any padding is done by the hw and remove it */ |
| 1055 | hdr = (struct ieee80211_hdr *) skb->data; | 1054 | hdr = (struct ieee80211_hdr *) skb->data; |
| 1056 | is_mc = !!is_multicast_ether_addr(hdr->addr1); | ||
| 1057 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); | 1055 | hdrlen = ieee80211_get_hdrlen_from_skb(skb); |
| 1058 | fc = hdr->frame_control; | 1056 | fc = hdr->frame_control; |
| 1059 | padpos = ath9k_cmn_padpos(hdr->frame_control); | 1057 | padpos = ath9k_cmn_padpos(hdr->frame_control); |
| @@ -1074,7 +1072,7 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common, | |||
| 1074 | 1072 | ||
| 1075 | keyix = rx_stats->rs_keyix; | 1073 | keyix = rx_stats->rs_keyix; |
| 1076 | 1074 | ||
| 1077 | if ((is_mc || !(keyix == ATH9K_RXKEYIX_INVALID)) && !decrypt_error && | 1075 | if (!(keyix == ATH9K_RXKEYIX_INVALID) && !decrypt_error && |
| 1078 | ieee80211_has_protected(fc)) { | 1076 | ieee80211_has_protected(fc)) { |
| 1079 | rxs->flag |= RX_FLAG_DECRYPTED; | 1077 | rxs->flag |= RX_FLAG_DECRYPTED; |
| 1080 | } else if (ieee80211_has_protected(fc) | 1078 | } else if (ieee80211_has_protected(fc) |