summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2016-02-15 11:11:30 +0100
committerDavid S. Miller <davem@davemloft.net>2016-02-17 02:42:54 +0100
commite21145a9871aa5ae07e01926105bb8e523d64095 (patch)
tree528353414eb8388a482e7be79a391b1d9d9aba6c /include
parentipv4: Namespacify ip_dynaddr sysctl knob (diff)
downloadlinux-e21145a9871aa5ae07e01926105bb8e523d64095.tar.xz
linux-e21145a9871aa5ae07e01926105bb8e523d64095.zip
ipv4: namespacify ip_early_demux sysctl knob
Signed-off-by: Nikolay Borisov <kernel@kyup.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/ip.h3
-rw-r--r--include/net/netns/ipv4.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/include/net/ip.h b/include/net/ip.h
index e3fb25d76421..cbb134b2f0e4 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -245,9 +245,6 @@ extern int inet_peer_threshold;
extern int inet_peer_minttl;
extern int inet_peer_maxttl;
-/* From ip_input.c */
-extern int sysctl_ip_early_demux;
-
void ipfrag_init(void);
void ip_static_sysctl_init(void);
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index b7e3fb2587da..a69cde3ce460 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -86,6 +86,7 @@ struct netns_ipv4 {
int sysctl_ip_nonlocal_bind;
/* Shall we try to damage output packets if routing dev changes? */
int sysctl_ip_dynaddr;
+ int sysctl_ip_early_demux;
int sysctl_fwmark_reflect;
int sysctl_tcp_fwmark_accept;