From 7e02e5f00b84ffd185f992018a482c813f87daee Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 4 Mar 2005 13:55:23 +0000 Subject: [PATCH] - merge revision 1.6 date: 2005/02/01 03:11:53; author: mlhuang; state: Exp; lines: +4 -0 - bound vnet mods by #ifdef --- net/core/skbuff.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b79788620..c7fe83ddc 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4,7 +4,7 @@ * Authors: Alan Cox * Florian La Roche * - * Version: $Id: skbuff.c,v 1.90 2001/11/07 05:56:19 davem Exp $ + * Version: $Id$ * * Fixes: * Alan Cox : Fixed the worst of the load @@ -333,7 +333,9 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask) #endif #endif +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) C(xid); +#endif C(truesize); atomic_set(&n->users, 1); C(head); @@ -392,7 +394,9 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) #endif new->tc_index = old->tc_index; #endif +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) new->xid = old->xid; +#endif atomic_set(&new->users, 1); } -- 2.47.0