[PATCH] net: update skb_recycle_check() for hardware timestamping changes

[PATCH] net: update skb_recycle_check() for hardware timestamping changes

[Lennert Buytenhek]

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>
Cc: Patrick Ohly <patrick.ohly@intel.com>
---
 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 f091a5a..d152394 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;
-- 
1.5.6.4

Re: [PATCH] net: update skb_recycle_check() for hardware timestamping changes

[Patrick Ohly]

On Wed, 2009-05-06 at 14:13 +0300, Lennert Buytenhek wrote:
> 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.

Good catch, thanks. For what it's worth:

Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

Re: [PATCH] net: update skb_recycle_check() for hardware timestamping changes

[David Miller]

From: Patrick Ohly <patrick.ohly@intel.com>
Date: Wed, 06 May 2009 15:11:39 +0200

> On Wed, 2009-05-06 at 14:13 +0300, Lennert Buytenhek wrote:
>> 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.
> 
> Good catch, thanks. For what it's worth:
> 
> Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

Applied, thanks everyone!