[PATCH] ieee80211: Remove EAPOL debug

IEEE 802.11 code has no business touching payloads of EAPOL frames.
There are some EAPOL structures defined for debugging and these were
confusingly called EAP types which they are not. Let's just remove these
before someone else starts using them in the kernel.

Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

2 files changed, 0 insertions, 25 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,
         if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep) {
                 if (/*ieee->ieee802_1x &&*/
                     ieee80211_is_eapol_frame(ieee, skb)) {
-#ifdef CONFIG_IEEE80211_DEBUG
                         /* pass unencrypted EAPOL frames even if encryption is
                          * configured */
-                        struct eapol *eap = (struct eapol *)(skb->data +
-                                24);
-                        IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",
-                                                eap_get_type(eap->type));
-#endif
                 } else {
                         IEEE80211_DEBUG_DROP(
                                 "encryption configured, but RX "
@@ -645,16 +639,6 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
                 }
         }
 
-#ifdef CONFIG_IEEE80211_DEBUG
-        if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) &&
-            ieee80211_is_eapol_frame(ieee, skb)) {
-                        struct eapol *eap = (struct eapol *)(skb->data +
-                                24);
-                        IEEE80211_DEBUG_EAP("RX: IEEE 802.1X EAPOL frame: %s\n",
-                                                eap_get_type(eap->type));
-        }
-#endif
-
         if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
             !ieee80211_is_eapol_frame(ieee, skb)) {
                 IEEE80211_DEBUG_DROP(
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c
index 071d093f2989..b7ea3e25e25d 100644
--- a/net/ieee80211/ieee80211_tx.c
+++ b/net/ieee80211/ieee80211_tx.c
@@ -292,15 +292,6 @@ int ieee80211_xmit(struct sk_buff *skb,
                 goto success;
         }
 
-#ifdef CONFIG_IEEE80211_DEBUG
-        if (crypt && !encrypt && ether_type == ETH_P_PAE) {
-                struct eapol *eap = (struct eapol *)(skb->data +
-                        sizeof(struct ethhdr) - SNAP_SIZE - sizeof(u16));
-                IEEE80211_DEBUG_EAP("TX: IEEE 802.11 EAPOL frame: %s\n",
-                        eap_get_type(eap->type));
-        }
-#endif
-
         /* Save source and destination addresses */
         memcpy(&dest, skb->data, ETH_ALEN);
         memcpy(&src, skb->data+ETH_ALEN, ETH_ALEN);