diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ip_conntrack_core.c | 4 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_core.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 84c66dbfedaf..9e34034729a6 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c | |||
@@ -77,8 +77,8 @@ unsigned int ip_ct_log_invalid; | |||
77 | static LIST_HEAD(unconfirmed); | 77 | static LIST_HEAD(unconfirmed); |
78 | static int ip_conntrack_vmalloc; | 78 | static int ip_conntrack_vmalloc; |
79 | 79 | ||
80 | static unsigned int ip_conntrack_next_id = 1; | 80 | static unsigned int ip_conntrack_next_id; |
81 | static unsigned int ip_conntrack_expect_next_id = 1; | 81 | static unsigned int ip_conntrack_expect_next_id; |
82 | #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS | 82 | #ifdef CONFIG_IP_NF_CONNTRACK_EVENTS |
83 | struct notifier_block *ip_conntrack_chain; | 83 | struct notifier_block *ip_conntrack_chain; |
84 | struct notifier_block *ip_conntrack_expect_chain; | 84 | struct notifier_block *ip_conntrack_expect_chain; |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index f6498234e264..c28840656451 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -85,8 +85,8 @@ unsigned int nf_ct_log_invalid; | |||
85 | static LIST_HEAD(unconfirmed); | 85 | static LIST_HEAD(unconfirmed); |
86 | static int nf_conntrack_vmalloc; | 86 | static int nf_conntrack_vmalloc; |
87 | 87 | ||
88 | static unsigned int nf_conntrack_next_id = 1; | 88 | static unsigned int nf_conntrack_next_id; |
89 | static unsigned int nf_conntrack_expect_next_id = 1; | 89 | static unsigned int nf_conntrack_expect_next_id; |
90 | #ifdef CONFIG_NF_CONNTRACK_EVENTS | 90 | #ifdef CONFIG_NF_CONNTRACK_EVENTS |
91 | struct notifier_block *nf_conntrack_chain; | 91 | struct notifier_block *nf_conntrack_chain; |
92 | struct notifier_block *nf_conntrack_expect_chain; | 92 | struct notifier_block *nf_conntrack_expect_chain; |