]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: update skb_recycle_check() for hardware timestamping changes
authorLennert Buytenhek <buytenh@wantstofly.org>
Wed, 6 May 2009 23:49:18 +0000 (16:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 May 2009 23:49:18 +0000 (16:49 -0700)
Commit ac45f602ee3d1b6f326f68bc0c2591ceebf05ba4 ("net: infrastructure
for hardware time stamping") added two skb initialization actions to
__alloc_skb(), which need to be added to skb_recycle_check() as well.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index f091a5a845c11c332ee408e452e4e1b89da251e2..d152394b2611e27d9533e7663972d2e3cccc4ea5 100644 (file)
@@ -502,7 +502,9 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size)
        shinfo->gso_segs = 0;
        shinfo->gso_type = 0;
        shinfo->ip6_frag_id = 0;
+       shinfo->tx_flags.flags = 0;
        shinfo->frag_list = NULL;
+       memset(&shinfo->hwtstamps, 0, sizeof(shinfo->hwtstamps));
 
        memset(skb, 0, offsetof(struct sk_buff, tail));
        skb->data = skb->head + NET_SKB_PAD;