summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStefan Baranoff <sbaranoff@gmail.com>2018-07-11 00:31:10 +0300
committerDavid S. Miller <davem@davemloft.net>2018-07-13 00:33:45 +0300
commit70b7ff130224d2d22a158c7f4aa5e7fb1c95949d (patch)
tree40c2c3b49333960955008e2a5ac29752025a461e /net
parent21684dc46c598e477707487c009f9773f7c0382d (diff)
downloadlinux-70b7ff130224d2d22a158c7f4aa5e7fb1c95949d.tar.xz
tcp: allow user to create repair socket without window probes
Under rare conditions where repair code may be used it is possible that window probes are either unnecessary or undesired. If the user knows that window probes are not wanted or needed this change allows them to skip sending them when a socket comes out of repair. Signed-off-by: Stefan Baranoff <sbaranoff@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 0d43705dd001..8e5e2ca9ab1b 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2823,14 +2823,16 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
case TCP_REPAIR:
if (!tcp_can_repair_sock(sk))
err = -EPERM;
- else if (val == 1) {
- tp->repair = 1;
+ /* 1 for normal repair, 2 for no window probes */
+ else if (val == 1 || val == 2) {
+ tp->repair = val;
sk->sk_reuse = SK_FORCE_REUSE;
tp->repair_queue = TCP_NO_QUEUE;
} else if (val == 0) {
tp->repair = 0;
sk->sk_reuse = SK_NO_REUSE;
- tcp_send_window_probe(sk);
+ if (tp->repair == 1)
+ tcp_send_window_probe(sk);
} else
err = -EINVAL;