From 8c6f72e3fd0d6c0ce5a1857611b9cf7dff559c26 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 1 Feb 2005 03:23:58 +0000 Subject: [PATCH] - bound vnet mods by #ifdef --- net/ipv4/netfilter/ip_conntrack_standalone.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index c561a01b9..13338bc53 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -128,9 +128,10 @@ static int ct_seq_real_show(const struct ip_conntrack_tuple_hash *hash, proto)) return 1; -#warning MEF should make this seq_printf conditional on xid support +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) if (seq_printf(s, "xid=%d\n", conntrack->xid[IP_CT_DIR_ORIGINAL])) return 1; +#endif if (seq_print_counters(s, &conntrack->counters[IP_CT_DIR_ORIGINAL])) return 1; @@ -143,9 +144,10 @@ static int ct_seq_real_show(const struct ip_conntrack_tuple_hash *hash, proto)) return 1; -#warning MEF should make this seq_printf conditional on xid support +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) if (seq_printf(s, "xid=%d\n", conntrack->xid[IP_CT_DIR_REPLY])) return 1; +#endif if (seq_print_counters(s, &conntrack->counters[IP_CT_DIR_REPLY])) return 1; -- 2.47.0