summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
authorJohannes Berg2010-08-10 09:46:40 +0200
committerJohn W. Linville2010-08-16 22:45:21 +0200
commitdc1580ddfc1f70636f6ef80a385902f7e8278deb (patch)
tree45c0885467ca472c70168c88e2af8d114840314d /net/mac80211/rx.c
parentmac80211: move key tfm setup (diff)
downloadkernel-qcow2-linux-dc1580ddfc1f70636f6ef80a385902f7e8278deb.tar.gz
kernel-qcow2-linux-dc1580ddfc1f70636f6ef80a385902f7e8278deb.tar.xz
kernel-qcow2-linux-dc1580ddfc1f70636f6ef80a385902f7e8278deb.zip
mac80211: remove unused status flag checks
The decryption code verifies whether or not a given frame was decrypted and verified by hardware. This is unnecessary, as the crypto RX handler already does it long before the decryption code is even invoked, so remove that code to avoid confusion. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index ad2427021b26..4fdbed58ca2f 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -899,6 +899,9 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
if (!is_multicast_ether_addr(hdr->addr1) && stakey) {
rx->key = stakey;
+ if ((status->flag & RX_FLAG_DECRYPTED) &&
+ (status->flag & RX_FLAG_IV_STRIPPED))
+ return RX_CONTINUE;
/* Skip decryption if the frame is not protected. */
if (!ieee80211_has_protected(fc))
return RX_CONTINUE;