This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / ipv4 / netfilter / ip_conntrack_standalone.c

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index 4d37839..fe5a980 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -24,6 +24,7 @@
 #include <linux/sysctl.h>
 #endif
 #include <net/checksum.h>
+#include <net/ip.h>
 
 #define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_conntrack_lock)
 #define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&ip_conntrack_lock)
@@ -110,6 +111,8 @@ print_conntrack(char *buffer, struct ip_conntrack *conntrack)
                len += sprintf(buffer + len, "[ASSURED] ");
        len += sprintf(buffer + len, "use=%u ",
                       atomic_read(&conntrack->ct_general.use));
+       len += sprintf(buffer + len, "xid=%d ",
+                      conntrack->xid);
        len += sprintf(buffer + len, "\n");
 
        return len;
@@ -502,7 +505,7 @@ static int init_or_cleanup(int init)
        if (ret < 0)
                goto cleanup_nothing;
 
-       proc = proc_net_create("ip_conntrack",0,list_conntracks);
+       proc = proc_net_create("ip_conntrack", 0440, list_conntracks);
        if (!proc) goto cleanup_init;
        proc->owner = THIS_MODULE;