Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[NETFILTER]: conntrack: cleanup the conntrack ID initialization

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>
Pablo Neira Ayuso 19 years ago
parent
f0d835835b
commit
4e3882f773
2 changed files with 4 additions and 4 deletions
Split View Show Diff Stats
  1. 2 2
      net/ipv4/netfilter/ip_conntrack_core.c
  2. 2 2
      net/netfilter/nf_conntrack_core.c

+ 2 - 2
net/ipv4/netfilter/ip_conntrack_core.c
View 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;

+ 2 - 2
net/netfilter/nf_conntrack_core.c
View 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;