aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>2017-09-26 23:35:40 -0400
committerDavid S. Miller <davem@davemloft.net>2017-10-01 20:55:54 -0400
commite1cfcbe82b4534bd0f99fef92a6d33843fd85e0e (patch)
tree1a9fde5eff8d55d710fcc0631c7bcc8116ce72c6 /net/ipv4/tcp.c
parent506d0a3edbc0bd4eaabe0c4e9c31ce69d6dfd5e5 (diff)
ipv4: Namespaceify tcp_fastopen knob
Different namespace application might require enable TCP Fast Open feature independently of the host. This patch series continues making more of the TCP Fast Open related sysctl knobs be per net-namespace. Reported-by: Luca BRUNO <lucab@debian.org> Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 5091402720ab..dac56c4ad357 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -1126,7 +1126,7 @@ static int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,
1126 struct sockaddr *uaddr = msg->msg_name; 1126 struct sockaddr *uaddr = msg->msg_name;
1127 int err, flags; 1127 int err, flags;
1128 1128
1129 if (!(sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) || 1129 if (!(sock_net(sk)->ipv4.sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) ||
1130 (uaddr && msg->msg_namelen >= sizeof(uaddr->sa_family) && 1130 (uaddr && msg->msg_namelen >= sizeof(uaddr->sa_family) &&
1131 uaddr->sa_family == AF_UNSPEC)) 1131 uaddr->sa_family == AF_UNSPEC))
1132 return -EOPNOTSUPP; 1132 return -EOPNOTSUPP;
@@ -2759,7 +2759,7 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
2759 case TCP_FASTOPEN_CONNECT: 2759 case TCP_FASTOPEN_CONNECT:
2760 if (val > 1 || val < 0) { 2760 if (val > 1 || val < 0) {
2761 err = -EINVAL; 2761 err = -EINVAL;
2762 } else if (sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) { 2762 } else if (net->ipv4.sysctl_tcp_fastopen & TFO_CLIENT_ENABLE) {
2763 if (sk->sk_state == TCP_CLOSE) 2763 if (sk->sk_state == TCP_CLOSE)
2764 tp->fastopen_connect = val; 2764 tp->fastopen_connect = val;
2765 else 2765 else