diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2009-05-06 16:49:18 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-06 16:49:18 -0700 |
commit | b805007545813d276c844f0f6d6c825b07c6aec6 (patch) | |
tree | e84739b18617b42e8d372dd9f68f2fbd0b636cb2 /net | |
parent | 581daf7e00c5e766f26aff80a61a860a17b0d75a (diff) | |
download | linux-3.10-b805007545813d276c844f0f6d6c825b07c6aec6.tar.gz linux-3.10-b805007545813d276c844f0f6d6c825b07c6aec6.tar.bz2 linux-3.10-b805007545813d276c844f0f6d6c825b07c6aec6.zip |
net: update skb_recycle_check() for hardware timestamping changes
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f091a5a845c..d152394b261 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; |