提交 4e3882f7 编写于 作者: P Pablo Neira Ayuso 提交者: David S. Miller

[NETFILTER]: conntrack: cleanup the conntrack ID initialization

Currently the first conntrack ID assigned is 2, use 1 instead.
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: NPatrick McHardy <kaber@trash.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 f0d83583
...@@ -77,8 +77,8 @@ unsigned int ip_ct_log_invalid; ...@@ -77,8 +77,8 @@ unsigned int ip_ct_log_invalid;
static LIST_HEAD(unconfirmed); static LIST_HEAD(unconfirmed);
static int ip_conntrack_vmalloc; static int ip_conntrack_vmalloc;
static unsigned int ip_conntrack_next_id = 1; static unsigned int ip_conntrack_next_id;
static unsigned int ip_conntrack_expect_next_id = 1; static unsigned int ip_conntrack_expect_next_id;
#ifdef CONFIG_IP_NF_CONNTRACK_EVENTS #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS
struct notifier_block *ip_conntrack_chain; struct notifier_block *ip_conntrack_chain;
struct notifier_block *ip_conntrack_expect_chain; struct notifier_block *ip_conntrack_expect_chain;
......
...@@ -85,8 +85,8 @@ unsigned int nf_ct_log_invalid; ...@@ -85,8 +85,8 @@ unsigned int nf_ct_log_invalid;
static LIST_HEAD(unconfirmed); static LIST_HEAD(unconfirmed);
static int nf_conntrack_vmalloc; static int nf_conntrack_vmalloc;
static unsigned int nf_conntrack_next_id = 1; static unsigned int nf_conntrack_next_id;
static unsigned int nf_conntrack_expect_next_id = 1; static unsigned int nf_conntrack_expect_next_id;
#ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_EVENTS
struct notifier_block *nf_conntrack_chain; struct notifier_block *nf_conntrack_chain;
struct notifier_block *nf_conntrack_expect_chain; struct notifier_block *nf_conntrack_expect_chain;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册