Remove unneccessary node unreference - it is handled in ieee80211_dev_kfree_skb

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

diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c
index 8cd25331424fbe9ee8807b556c4d3a195baa2a51..9fe42b207da2dbdbedde6c0554daebe6eac5cc84 100644 (file)
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -248,10 +248,7 @@ ieee80211_input(struct ieee80211_node *ni,
                vap->iv_devstats.tx_dropped++;
                goto out;
        }
-       /* Give skb back to kernel (if we are in interrupt context, it's deferred) */
        ieee80211_skb_copy_noderef(skb, skb2);
-       if (SKB_CB(skb)->ni != NULL)
-               ieee80211_unref_node(&SKB_CB(skb)->ni);
        ieee80211_dev_kfree_skb(&skb);
        skb = skb2;
 

diff --git a/net80211/ieee80211_output.c b/net80211/ieee80211_output.c
index 28b723dd42833eb24f63ce794df76b4fa5e10039..376bcae2ff3545563caae2db7c4c1ac1c28b0979 100644 (file)
--- a/net80211/ieee80211_output.c
+++ b/net80211/ieee80211_output.c
@@ -324,7 +324,6 @@ void ieee80211_parent_queue_xmit(struct sk_buff *skb) {
 
        if (dev_queue_xmit(skb) == NET_XMIT_DROP)
                vap->iv_devstats.tx_dropped++;
-
 }
 
 /*

diff --git a/net80211/ieee80211_skb.h b/net80211/ieee80211_skb.h
index b6d06e0276433d3e145a8b08188d5f21db73fa1a..6c5f9eb38dde8bddb43ee050e675989da2ed398a 100644 (file)
--- a/net80211/ieee80211_skb.h
+++ b/net80211/ieee80211_skb.h
@@ -113,9 +113,9 @@ int ieee80211_skb_references(void);
 
 #ifdef IEEE80211_DEBUG_REFCNT
 
-int  vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, 
-                                   struct vlan_group *grp, unsigned short vlan_tag, 
-                                   const char* func, int line);
+int vlan_hwaccel_receive_skb_debug(struct sk_buff *skb, 
+                                  struct vlan_group *grp, unsigned short vlan_tag, 
+                                  const char* func, int line);
 int netif_rx_debug(struct sk_buff *skb, const char* func, int line);
 struct sk_buff * alloc_skb_debug(unsigned int length, gfp_t gfp_mask,
                                 const char *func, int line);
@@ -137,8 +137,8 @@ struct sk_buff * skb_share_check_debug(struct sk_buff *skb, gfp_t pri,
                                       const char *func, int line);
 void  kfree_skb_fast_debug(struct sk_buff *skb, 
                           const char* func, int line);
-struct sk_buff *  skb_unshare_debug(struct sk_buff *skb, gfp_t pri,
-                                   const char *func, int line);
+struct sk_buff * skb_unshare_debug(struct sk_buff *skb, gfp_t pri,
+                                  const char *func, int line);
 struct sk_buff * skb_copy_expand_debug(const struct sk_buff *skb, int newheadroom, 
                                       int newtailroom, gfp_t gfp_mask, 
                                       const char *func, int line);