From ef335e7963322656ea0545e78f5fe51f05ac6e7c Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 1 Feb 2005 03:15:09 +0000 Subject: [PATCH] - bound vnet mods by #ifdef - bound runtime vnet code by if (vnet_active) - vnet needs inet_family_ops, export if configured - PL3976 fix: inet_release(): don't reset sk_xid --- net/ipv4/af_inet.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 9dbbbf8d2..d7798945e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -396,9 +396,9 @@ int inet_release(struct socket *sock) sock->sk = NULL; vx_sock_dec(sk); clr_vx_info(&sk->sk_vx_info); - sk->sk_xid = -1; + //sk->sk_xid = -1; clr_nx_info(&sk->sk_nx_info); - sk->sk_nid = -1; + //sk->sk_nid = -1; sk->sk_prot->close(sk, timeout); } return 0; @@ -843,7 +843,15 @@ struct proto_ops inet_dgram_ops = { .sendpage = inet_sendpage, }; -static struct net_proto_family inet_family_ops = { +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) +int vnet_active = 0; +EXPORT_SYMBOL(vnet_active); +struct net_proto_family inet_family_ops; +EXPORT_SYMBOL(inet_family_ops); +#else +static +#endif +struct net_proto_family inet_family_ops = { .family = PF_INET, .create = inet_create, .owner = THIS_MODULE, -- 2.47.0