From: Eric Dumazet <edumazet@google.com>
To: "David S . Miller" <davem@davemloft.net>
Cc: netdev <netdev@vger.kernel.org>,
Eric Dumazet <edumazet@google.com>,
Eric Dumazet <eric.dumazet@gmail.com>
Subject: [PATCH net-next 06/15] tcp: Namespace-ify sysctl_tcp_stdurg
Date: Thu, 26 Oct 2017 16:35:17 -0700 [thread overview]
Message-ID: <20171026233526.6155-7-edumazet@google.com> (raw)
In-Reply-To: <20171026233526.6155-1-edumazet@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
include/net/netns/ipv4.h | 1 +
include/net/tcp.h | 1 -
net/ipv4/sysctl_net_ipv4.c | 14 +++++++-------
net/ipv4/tcp_input.c | 3 +--
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index b28c172b10e497f235b51aae0fc2d3bbf7cc51f3..ffa2cf3dc747ca9443df3927dc7928c18357f872 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -133,6 +133,7 @@ struct netns_ipv4 {
int sysctl_tcp_thin_linear_timeouts;
int sysctl_tcp_slow_start_after_idle;
int sysctl_tcp_retrans_collapse;
+ int sysctl_tcp_stdurg;
struct inet_timewait_death_row tcp_death_row;
int sysctl_max_syn_backlog;
int sysctl_tcp_fastopen;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 085848e4de38058bb09f025387c713ade32b263e..0cf9de8506916c67369ce78833207ba648f34a10 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -240,7 +240,6 @@ void tcp_time_wait(struct sock *sk, int state, int timeo);
/* sysctl variables for tcp */
-extern int sysctl_tcp_stdurg;
extern int sysctl_tcp_rfc1337;
extern int sysctl_tcp_abort_on_overflow;
extern int sysctl_tcp_max_orphans;
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 533b92ad39dd0cada542028fe2f276d9eebcd2c8..a34bb75815c15afc077ba7ff36939b5abc9229f6 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -400,13 +400,6 @@ static struct ctl_table ipv4_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
- {
- .procname = "tcp_stdurg",
- .data = &sysctl_tcp_stdurg,
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec
- },
{
.procname = "tcp_rfc1337",
.data = &sysctl_tcp_rfc1337,
@@ -1145,6 +1138,13 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec
},
+ {
+ .procname = "tcp_stdurg",
+ .data = &init_net.ipv4.sysctl_tcp_stdurg,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec
+ },
{ }
};
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 2cc56fd57b751dd6b457c15067aa9309683a04a8..6c3655b538f6b2315af7dc611acc574f7489bde6 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -87,7 +87,6 @@ EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
/* rfc5961 challenge ack rate limiting */
int sysctl_tcp_challenge_ack_limit = 1000;
-int sysctl_tcp_stdurg __read_mostly;
int sysctl_tcp_rfc1337 __read_mostly;
int sysctl_tcp_max_orphans __read_mostly = NR_FILE;
int sysctl_tcp_frto __read_mostly = 2;
@@ -5103,7 +5102,7 @@ static void tcp_check_urg(struct sock *sk, const struct tcphdr *th)
struct tcp_sock *tp = tcp_sk(sk);
u32 ptr = ntohs(th->urg_ptr);
- if (ptr && !sysctl_tcp_stdurg)
+ if (ptr && !sock_net(sk)->ipv4.sysctl_tcp_stdurg)
ptr--;
ptr += ntohl(th->seq);
--
2.15.0.rc2.357.g7e34df9404-goog
next prev parent reply other threads:[~2017-10-26 23:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 23:35 [PATCH net-next 00/15] tcp: move 14 sysctls to namespaces Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 01/15] tcp: Namespace-ify sysctl_tcp_early_retrans Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 02/15] tcp: Namespace-ify sysctl_tcp_recovery Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 03/15] tcp: Namespace-ify sysctl_tcp_thin_linear_timeouts Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 04/15] tcp: Namespace-ify sysctl_tcp_slow_start_after_idle Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 05/15] tcp: Namespace-ify sysctl_tcp_retrans_collapse Eric Dumazet
2017-10-26 23:35 ` Eric Dumazet [this message]
2017-10-26 23:35 ` [PATCH net-next 07/15] tcp: Namespace-ify sysctl_tcp_rfc1337 Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 08/15] tcp: Namespace-ify sysctl_tcp_abort_on_overflow Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 09/15] tcp: Namespace-ify sysctl_tcp_fack Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 10/15] tcp: remove stale sysctl_tcp_reordering Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 11/15] tcp: Namespace-ify sysctl_tcp_max_reordering Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 12/15] tcp: Namespace-ify sysctl_tcp_dsack Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 13/15] tcp: Namespace-ify sysctl_tcp_app_win Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 14/15] tcp: Namespace-ify sysctl_tcp_adv_win_scale Eric Dumazet
2017-10-26 23:35 ` [PATCH net-next 15/15] tcp: Namespace-ify sysctl_tcp_frto Eric Dumazet
2017-10-27 4:46 ` [PATCH net-next 00/15] tcp: move 14 sysctls to namespaces David Miller
2017-10-27 4:54 ` Eric Dumazet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171026233526.6155-7-edumazet@google.com \
--to=edumazet@google.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).