diff options
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 9505f3167aeb..d582faa6447d 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -628,14 +628,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
628 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep) { | 628 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep) { |
629 | if (/*ieee->ieee802_1x &&*/ | 629 | if (/*ieee->ieee802_1x &&*/ |
630 | ieee80211_is_eapol_frame(ieee, skb)) { | 630 | ieee80211_is_eapol_frame(ieee, skb)) { |
631 | #ifdef CONFIG_IEEE80211_DEBUG | ||
632 | /* pass unencrypted EAPOL frames even if encryption is | 631 | /* pass unencrypted EAPOL frames even if encryption is |
633 | * configured */ | 632 | * configured */ |
634 | struct eapol *eap = (struct eapol *)(skb->data + | ||
635 | 24); | ||
636 | IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n", | ||
637 | eap_get_type(eap->type)); | ||
638 | #endif | ||
639 | } else { | 633 | } else { |
640 | IEEE80211_DEBUG_DROP( | 634 | IEEE80211_DEBUG_DROP( |
641 | "encryption configured, but RX " | 635 | "encryption configured, but RX " |
@@ -645,16 +639,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
645 | } | 639 | } |
646 | } | 640 | } |
647 | 641 | ||
648 | #ifdef CONFIG_IEEE80211_DEBUG | ||
649 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && | ||
650 | ieee80211_is_eapol_frame(ieee, skb)) { | ||
651 | struct eapol *eap = (struct eapol *)(skb->data + | ||
652 | 24); | ||
653 | IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n", | ||
654 | eap_get_type(eap->type)); | ||
655 | } | ||
656 | #endif | ||
657 | |||
658 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && | 642 | if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep && |
659 | !ieee80211_is_eapol_frame(ieee, skb)) { | 643 | !ieee80211_is_eapol_frame(ieee, skb)) { |
660 | IEEE80211_DEBUG_DROP( | 644 | IEEE80211_DEBUG_DROP( |