- 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 5156e43..b76b842 100644 (file)
--- 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;