Fix compilation with IEEE80211_DEBUG_REFCNT=1

[madwifi/.git] / net80211 / ieee80211_skb.c

diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c
index 610b82ac239db3cc008ce2e44510d1d213ba10f1..9c9b7b9e4190a304ae187ac7b5221dd837a9e360 100644 (file)
--- a/net80211/ieee80211_skb.c
+++ b/net80211/ieee80211_skb.c
@@ -34,7 +34,7 @@
 /*
  * IEEE 802.11 support (Linux-specific code)
  */
-#ifndef AUTOCONF_INCLUDED
+#if !defined(AUTOCONF_INCLUDED) && !defined(CONFIG_LOCALVERSION)
 #include <linux/config.h>
 #endif
 #include <linux/version.h>
@@ -105,7 +105,7 @@ static void skb_print_message(
 {
        va_list args;
        char skb_count[32] = { '\0' };
-       char expanded_message[1024] = { '\0' };
+       char expanded_message[256] = { '\0' };
        if (show_counter) {
 #ifdef IEEE80211_DEBUG_REFCNT
                snprintf(skb_count, 
@@ -129,9 +129,6 @@ static void skb_print_message(
                func, line,
                expanded_message);
        va_end(args);
-#ifdef IEEE80211_DEBUG_REFCNT
-       dump_stack();
-#endif
 }
 
 #ifdef IEEE80211_DEBUG_REFCNT
@@ -276,20 +273,20 @@ track_skb(struct sk_buff *skb, int users_adjustment,
 {
        if (NULL == skb) {
                skb_print_message(0 /* show_counter */, 
-                       skb, func2, line2,
+                       skb, func, line,
                        "ERROR: NULL skb received.  Skipping.");
                return NULL;
        }
        if (M_FLAG_GET(skb, M_SKB_TRACKED)) {
                skb_print_message(0 /* show_counter */, 
-                       skb, func2, line2,
+                       skb, func, line,
                        "ERROR: Already tracked skb received.  Skipping.");
                dump_stack();
                return skb;
        }
        if (skb_shared(skb)) {
                skb_print_message(0 /* show_counter */, 
-                       skb, func2, line2,
+                       skb, func, line,
                        "ERROR: Shared skb received.  References leaked??");
                dump_stack();
        }
@@ -297,7 +294,7 @@ track_skb(struct sk_buff *skb, int users_adjustment,
        atomic_inc(&skb_refs_counter);
        M_FLAG_SET(skb, M_SKB_TRACKED);
        print_skb_trackchange_message(skb, users_adjustment,
-                                     func2, line2, 
+                                     func, line,
                                      " is now ** TRACKED **");
 #ifdef IEEE80211_DEBUG_REFCNT_SKBDEST
        /* Install our debug destructor, chaining to the original... */
@@ -383,7 +380,7 @@ unref_skb(struct sk_buff *skb, int type,
 
         if (skb_shared(skb)) {
                atomic_dec(&skb_refs_counter);
-               print_skb_refchange_message(skb, -1, func2, line2);
+               print_skb_refchange_message(skb, -1, func, line);
        }
        else {
                if (SKB_NI(skb) != NULL) {
@@ -573,6 +570,7 @@ ieee80211_skb_references(void) {
 
 #ifdef IEEE80211_DEBUG_REFCNT
 
+#if IEEE80211_VLAN_TAG_USED
 int  vlan_hwaccel_rx_debug(struct sk_buff *skb, 
                               struct vlan_group *grp, unsigned short vlan_tag, 
                               const char *func, int line) {
@@ -580,6 +578,7 @@ int  vlan_hwaccel_rx_debug(struct sk_buff *skb,
                untrack_skb(skb, 0, __func__, __LINE__),
                grp, vlan_tag);
 }
+#endif
 
 int netif_rx_debug(struct sk_buff *skb, const char *func, int line) {
        return netif_rx(untrack_skb(skb, 0, __func__, __LINE__));
@@ -675,7 +674,7 @@ void  kfree_skb_fast_debug(struct sk_buff *skb,
                     const char *func, int line)
 {
        /* NOT so fast... */
-       unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line, __func__, __LINE__);
+       unref_skb(skb, UNREF_USE_DEV_KFREE_SKB_ANY, func, line);
 }
 
 struct sk_buff *skb_unshare_debug(struct sk_buff *skb, gfp_t pri,