Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e3882f7 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso Committed by David S. Miller
Browse files

[NETFILTER]: conntrack: cleanup the conntrack ID initialization 



Currently the first conntrack ID assigned is 2, use 1 instead.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0d83583

net/ipv4/netfilter/ip_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/netfilter/nf_conntrack_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;