]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
net: skbuff: don't zero tc members when freeing skb
authorFlorian Westphal <fw@strlen.de>
Wed, 31 Dec 2014 12:33:41 +0000 (13:33 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jan 2015 21:04:29 +0000 (16:04 -0500)
Not needed, only four cases:
 - kfree_skb (or one of its aliases).
   Don't need to zero, memory will be freed.
 - kfree_skb_partial and head was stolen:  memory will be freed.
 - skb_morph:  The skb header fields (including tc ones) will be
   copied over from the 'to-be-morphed' skb right after
   skb_release_head_state returns.
 - skb_segment:  Same as before, all the skb header
   fields are copied over from the original skb right away.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index 395c15b82087253cd9905d315cd689a29b89ae4d..5a2a2e887a12ee3d813fa81b0b26ac8c1f0c24d8 100644 (file)
@@ -677,13 +677,6 @@ static void skb_release_head_state(struct sk_buff *skb)
 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
        nf_bridge_put(skb->nf_bridge);
 #endif
-/* XXX: IS this still necessary? - JHS */
-#ifdef CONFIG_NET_SCHED
-       skb->tc_index = 0;
-#ifdef CONFIG_NET_CLS_ACT
-       skb->tc_verd = 0;
-#endif
-#endif
 }
 
 /* Free everything but the sk_buff shell. */