summaryrefslogtreecommitdiff
path: root/sys/net80211
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-16 14:59:15 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-08-16 14:59:15 +0000
commit8bbf60981274b3673faf8ca4020e2d1c38d57ca5 (patch)
tree3664f3dc2f1621f3db70016200ac5395bbbb6ddb /sys/net80211
parentd1d49fbe20833127e22195b97129b18aff260ec8 (diff)
back out part of last diff; breaks all hardware wep decryption.
from damien
Diffstat (limited to 'sys/net80211')
-rw-r--r--sys/net80211/ieee80211_input.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 7d3bc51e26f..4b28c04c9ff 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,5 +1,5 @@
/* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */
-/* $OpenBSD: ieee80211_input.c,v 1.62 2007/08/14 20:33:47 bluhm Exp $ */
+/* $OpenBSD: ieee80211_input.c,v 1.63 2007/08/16 14:59:14 deraadt Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -355,9 +355,6 @@ ieee80211_input(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni,
ic->ic_stats.is_rx_nowep++;
goto out;
}
- } else if (ic->ic_flags & IEEE80211_F_WEPON) {
- ic->ic_stats.is_rx_unencrypted++;
- goto out;
}
#if NBPFILTER > 0
/* copy to listener after decrypt */