From f3986cc4f968566ce676f68c4b954676f62e4045 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Fri, 4 Mar 2005 14:01:25 +0000 Subject: [PATCH] - merge revision 1.8 date: 2005/02/01 03:23:58; author: mlhuang; state: Exp; lines: +4 -2 - bound vnet mods by #ifdef --- net/ipv4/netfilter/ip_conntrack_standalone.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c index 76c827dcb..ce43b7eda 100644 --- a/net/ipv4/netfilter/ip_conntrack_standalone.c +++ b/net/ipv4/netfilter/ip_conntrack_standalone.c @@ -113,7 +113,9 @@ print_conntrack(char *buffer, struct ip_conntrack *conntrack) len += print_tuple(buffer + len, &conntrack->tuplehash[IP_CT_DIR_ORIGINAL].tuple, proto); +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) len += sprintf(buffer + len, "xid=%d ", conntrack->xid[IP_CT_DIR_ORIGINAL]); +#endif len += print_counters(buffer + len, &conntrack->counters[IP_CT_DIR_ORIGINAL]); if (!(test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status))) @@ -121,7 +123,9 @@ print_conntrack(char *buffer, struct ip_conntrack *conntrack) len += print_tuple(buffer + len, &conntrack->tuplehash[IP_CT_DIR_REPLY].tuple, proto); +#if defined(CONFIG_VNET) || defined(CONFIG_VNET_MODULE) len += sprintf(buffer + len, "xid=%d ", conntrack->xid[IP_CT_DIR_REPLY]); +#endif len += print_counters(buffer + len, &conntrack->counters[IP_CT_DIR_REPLY]); if (test_bit(IPS_ASSURED_BIT, &conntrack->status)) -- 2.47.0