Add SKB_CB macro and begin using it in a few places, eventually everywhere

   we use skb->cb (will be in a subsequent commit/merge) should use
   this macro.  This is part of a larger batch of changes I am in the process
   of merging that add better visibility into skbuff usage/leaks in the driver.

ieee80211_node_refcnt use atomic_read for consistency and because it is
   the correct thing to do.  atomic_read is a macro that expands to the same
   thing in most architectures anyway.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2887 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index 7361d6a2ec3483928f36bc293b89934ca524a62b..7404f5d503f0524850307391dea32e0e73af3082 100644 (file)
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -318,14 +318,16 @@ struct ieee80211_cb {
 };
 
 
+#define        SKB_CB(_skb)            ((struct ieee80211_cb *)(_skb)->cb)
+
 #define M_FLAG_SET(_skb, _flag) \
-       (((struct ieee80211_cb *)(_skb)->cb)->flags |= (_flag))
+       (SKB_CB(_skb)->flags |= (_flag))
 #define        M_FLAG_CLR(_skb, _flag) \
-       (((struct ieee80211_cb *)(_skb)->cb)->flags &= ~(_flag))
+       (SKB_CB(_skb)->flags &= ~(_flag))
 #define        M_FLAG_GET(_skb, _flag) \
-       (((struct ieee80211_cb *)(_skb)->cb)->flags & (_flag))
+       (SKB_CB(_skb)->flags & (_flag))
 #define M_FLAG_KEEP_ONLY(_skb, _flag) \
-       (((struct ieee80211_cb *)(_skb)->cb)->flags &= (_flag))
+       (SKB_CB(_skb)->flags &= (_flag))
 
 #define        M_PWR_SAV_SET(skb) M_FLAG_SET((skb), M_PWR_SAV)
 #define        M_PWR_SAV_CLR(skb) M_FLAG_CLR((skb), M_PWR_SAV)
@@ -367,7 +369,7 @@ typedef atomic_t ieee80211_node_ref_count_t;
 #define ieee80211_node_incref(_ni)     atomic_inc(&(_ni)->ni_refcnt)
 #define        ieee80211_node_decref(_ni)      atomic_dec(&(_ni)->ni_refcnt)
 #define        ieee80211_node_dectestref(_ni)  atomic_dec_and_test(&(_ni)->ni_refcnt)
-#define        ieee80211_node_refcnt(_ni)      (_ni)->ni_refcnt.counter
+#define        ieee80211_node_refcnt(_ni)      atomic_read(&(_ni)->ni_refcnt)
 
 #define        le16toh(_x)     le16_to_cpu(_x)
 #define        htole16(_x)     cpu_to_le16(_x)