From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 4 Mar 2005 13:46:00 +0000 (+0000)
Subject: - merge revision 1.9
X-Git-Tag: planetlab-3_0-rc13~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a2d0fd3e7bc4528fbd280895110e2e1e495b03da;p=linux-2.6.git

- merge revision 1.9
date: 2005/02/01 03:08:55;  author: mlhuang;  state: Exp;  lines: +2 -1
- bound vnet mods by #ifdef
---

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 5156e432d..b76b842a3 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -272,8 +272,9 @@ struct sk_buff {
  #endif
 
 #endif
+#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
 	xid_t			xid;			/* VServer context ID */
-
+#endif
 
 	/* These elements must be at the end, see alloc_skb() for details.  */
 	unsigned int		truesize;