aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorNikolay Borisov <kernel@kyup.com>2016-02-15 05:11:30 -0500
committerDavid S. Miller <davem@davemloft.net>2016-02-16 20:42:54 -0500
commite21145a9871aa5ae07e01926105bb8e523d64095 (patch)
tree528353414eb8388a482e7be79a391b1d9d9aba6c /include/net
parent287b7f38fd6842e534db1783cead3843f7677b79 (diff)
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/net')
-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;
245extern int inet_peer_minttl; 245extern int inet_peer_minttl;
246extern int inet_peer_maxttl; 246extern int inet_peer_maxttl;
247 247
248/* From ip_input.c */
249extern int sysctl_ip_early_demux;
250
251void ipfrag_init(void); 248void ipfrag_init(void);
252 249
253void ip_static_sysctl_init(void); 250void 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 {
86 int sysctl_ip_nonlocal_bind; 86 int sysctl_ip_nonlocal_bind;
87 /* Shall we try to damage output packets if routing dev changes? */ 87 /* Shall we try to damage output packets if routing dev changes? */
88 int sysctl_ip_dynaddr; 88 int sysctl_ip_dynaddr;
89 int sysctl_ip_early_demux;
89 90
90 int sysctl_fwmark_reflect; 91 int sysctl_fwmark_reflect;
91 int sysctl_tcp_fwmark_accept; 92 int sysctl_tcp_fwmark_accept;