]> err.no Git - linux-2.6/commitdiff
[NETFILTER]: conntrack: cleanup the conntrack ID initialization
authorPablo Neira Ayuso <pablo@netfilter.org>
Wed, 22 Mar 2006 21:55:11 +0000 (13:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Mar 2006 21:55:11 +0000 (13:55 -0800)
Currently the first conntrack ID assigned is 2, use 1 instead.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/netfilter/ip_conntrack_core.c
net/netfilter/nf_conntrack_core.c

index 84c66dbfedaf83505434124e6bf39621bc84ec96..9e34034729a6cad30daa7b65457034a70ab2508c 100644 (file)
@@ -77,8 +77,8 @@ unsigned int ip_ct_log_invalid;
 static LIST_HEAD(unconfirmed);
 static int ip_conntrack_vmalloc;
 
-static unsigned int ip_conntrack_next_id = 1;
-static unsigned int ip_conntrack_expect_next_id = 1;
+static unsigned int ip_conntrack_next_id;
+static unsigned int ip_conntrack_expect_next_id;
 #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
 struct notifier_block *ip_conntrack_chain;
 struct notifier_block *ip_conntrack_expect_chain;
index f6498234e26427d16e390ce925e9d8111d214347..c28840656451cd4de1fc460a6ee90fbeb63e3fcb 100644 (file)
@@ -85,8 +85,8 @@ unsigned int nf_ct_log_invalid;
 static LIST_HEAD(unconfirmed);
 static int nf_conntrack_vmalloc;
 
-static unsigned int nf_conntrack_next_id = 1;
-static unsigned int nf_conntrack_expect_next_id = 1;
+static unsigned int nf_conntrack_next_id;
+static unsigned int nf_conntrack_expect_next_id;
 #ifdef CONFIG_NF_CONNTRACK_EVENTS
 struct notifier_block *nf_conntrack_chain;
 struct notifier_block *nf_conntrack_expect_chain;