Ticket #907: madwifi-refcount-ng-debug-dependency-cycle.diff

madwifi/net80211/ieee80211_var.h

@@ -41 +41 @@
-
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_debug.h>
-#include <net80211/ieee80211_crypto.h>
-#include <net80211/ieee80211_ioctl.h>           /* for ieee80211_stats */
-#include <net80211/ieee80211_node.h>
@@ -239 +240 @@
-        u_int32_t app_filter;                           /* filters which management frames are forwarded to app */
-};
-
-/* Debug functions need the defintion of struct ieee80211vap because iv_debug 
- * is used at runtime to determine if we should log an event
- */
-#include <net80211/ieee80211_debug.h>
-
-struct ieee80211com {
-        struct net_device *ic_dev;              /* associated device */
-        ieee80211com_lock_t ic_comlock;         /* state update lock */

madwifi/net80211/ieee80211_node.c

@@ -1975 +1975 @@
-                ni->ni_vap = vap;
-                ni->ni_ic = vap->iv_ic;
-}
+
+#ifdef IEEE80211_DEBUG_REFCNT
+void
+ieee80211_unref_node_debug(struct ieee80211_node **pni, const char *func, int line)
+{       
+        struct ieee80211_node *ni = *pni;
+        IEEE80211_DPRINTF(ni->ni_vap, IEEE80211_MSG_NODE,
+                "%s (%s:%u) %p<%s> refcnt %d\n", __func__, func, line, ni,
+                 ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni) - 1);
+        _ieee80211_unref_node(ni); 
+        *pni = NULL;                    /* guard against use */
+ }
+#endif
+