From 2c35e6051802eee08b8c211f701e4b93e7e0ded5 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Wed, 9 Feb 2005 11:58:12 +0000 Subject: [PATCH] merge missed vserver field in struct sock_common --- include/linux/netfilter_ipv4/ip_conntrack.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h index cf02de373..ed078c5d1 100644 --- a/include/linux/netfilter_ipv4/ip_conntrack.h +++ b/include/linux/netfilter_ipv4/ip_conntrack.h @@ -230,6 +230,11 @@ struct ip_conntrack unsigned long mark; #endif +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) + /* VServer context id */ + xid_t xid[IP_CT_DIR_MAX]; +#endif + /* Traversed often, so hopefully in different cacheline to top */ /* These are my tuples; original and reply */ struct ip_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX]; -- 2.47.0