From 63ccd5bbe2a7dd9230f67b913618a6d0ea31afb7 Mon Sep 17 00:00:00 2001 From: mentor Date: Wed, 16 Jan 2008 20:09:34 +0000 Subject: [PATCH] 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 --- net80211/ieee80211_input.c | 3 --- net80211/ieee80211_output.c | 1 - net80211/ieee80211_skb.h | 10 +++++----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/net80211/ieee80211_input.c b/net80211/ieee80211_input.c index 8cd2533..9fe42b2 100644 --- 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 28b723d..376bcae 100644 --- 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 b6d06e0..6c5f9eb 100644 --- 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); -- 2.35.1