mac80211: remove debug frame dumping

You can just pull up a monitor interface to get much more
detailed information, or, when debugging a driver, insert
dump code into the driver (which usually you will have to
do anyway to dump the driver-specific information). Hence
this option is useless.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 80d693392b0f175e219f10c36442cba67dba9c4f..8427518e4f20781dd92d56843fa55e0df0f15506 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -179,19 +179,6 @@ config MAC80211_VERBOSE_MPL_DEBUG
 
          Do not select this option.
 
-config MAC80211_LOWTX_FRAME_DUMP
-       bool "Debug frame dumping"
-       depends on MAC80211_DEBUG_MENU
-       ---help---
-         Selecting this option will cause the stack to
-         print a message for each frame that is handed
-         to the lowlevel driver for transmission. This
-         message includes all MAC addresses and the
-         frame control field.
-
-         If unsure, say N and insert the debugging code
-         you require into the driver you are debugging.
-
 config MAC80211_DEBUG_COUNTERS
        bool "Extra statistics for TX/RX debugging"
        depends on MAC80211_DEBUG_MENU

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d136a371e6bd2fff3628f7c1ff5f0282db0d41e2..20d683641b4240d13af738d47a11bdbbeb2dad8c 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -38,43 +38,6 @@
 
 /* misc utils */
 
-#ifdef CONFIG_MAC80211_LOWTX_FRAME_DUMP
-static void ieee80211_dump_frame(const char *ifname, const char *title,
-                                const struct sk_buff *skb)
-{
-       const struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-       unsigned int hdrlen;
-       DECLARE_MAC_BUF(mac);
-
-       printk(KERN_DEBUG "%s: %s (len=%d)", ifname, title, skb->len);
-       if (skb->len < 4) {
-               printk("\n");
-               return;
-       }
-
-       hdrlen = ieee80211_hdrlen(hdr->frame_control);
-       if (hdrlen > skb->len)
-               hdrlen = skb->len;
-       if (hdrlen >= 4)
-               printk(" FC=0x%04x DUR=0x%04x",
-                   le16_to_cpu(hdr->frame_control), le16_to_cpu(hdr->duration_id));
-       if (hdrlen >= 10)
-               printk(" A1=%s", print_mac(mac, hdr->addr1));
-       if (hdrlen >= 16)
-               printk(" A2=%s", print_mac(mac, hdr->addr2));
-       if (hdrlen >= 24)
-               printk(" A3=%s", print_mac(mac, hdr->addr3));
-       if (hdrlen >= 30)
-               printk(" A4=%s", print_mac(mac, hdr->addr4));
-       printk("\n");
-}
-#else /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
-static inline void ieee80211_dump_frame(const char *ifname, const char *title,
-                                       struct sk_buff *skb)
-{
-}
-#endif /* CONFIG_MAC80211_LOWTX_FRAME_DUMP */
-
 static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
                                 int next_frag_len)
 {
@@ -1068,8 +1031,6 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
                        return IEEE80211_TX_AGAIN;
                info =  IEEE80211_SKB_CB(skb);
 
-               ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
-                                    "TX to low-level driver", skb);
                ret = local->ops->tx(local_to_hw(local), skb);
                if (ret)
                        return IEEE80211_TX_AGAIN;
@@ -1099,9 +1060,6 @@ static int __ieee80211_tx(struct ieee80211_local *local, struct sk_buff *skb,
                                                ~IEEE80211_TX_CTL_RATE_CTRL_PROBE;
                        }
 
-                       ieee80211_dump_frame(wiphy_name(local->hw.wiphy),
-                                            "TX to low-level driver",
-                                            tx->extra_frag[i]);
                        ret = local->ops->tx(local_to_hw(local),
                                            tx->extra_frag[i]);
                        if (ret)