- partially merge revision 1.10

date: 2005/02/01 03:15:09;  author: mlhuang;  state: Exp;  lines: +11 -3
- bound vnet mods by #ifdef
- bound runtime vnet code by if (vnet_active)

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 4353e5f..6130f77 100644 (file)
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -5,7 +5,7 @@
  *
  *             PF_INET protocol family socket handler.
  *
- * Version:    $Id: af_inet.c,v 1.137 2002/02/01 22:01:03 davem Exp $
+ * Version:    $Id$
  *
  * Authors:    Ross Biro, <bir7@leland.Stanford.Edu>
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
@@ -859,6 +859,10 @@ struct proto_ops inet_dgram_ops = {
        .sendpage =     inet_sendpage,
 };
 
+#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE)
+int vnet_active = 0;
+EXPORT_SYMBOL(vnet_active);
+#endif
 struct net_proto_family inet_family_ops = {
        .family = PF_INET,
        .create = inet_create,