diff options
author | Eric Dumazet <edumazet@google.com> | 2019-06-05 07:55:10 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-06-05 19:05:01 -0700 |
commit | 50a8accf10627b343109a9c9d5c361751bf753b0 (patch) | |
tree | 6ba062d780e3eab0159704ffca00e167021de7af /net/ipv6/tcp_ipv6.c | |
parent | 323a53c41292a0d7efc8748856c623324c8d7c21 (diff) | |
download | linux-stable-50a8accf10627b343109a9c9d5c361751bf753b0.tar.gz linux-stable-50a8accf10627b343109a9c9d5c361751bf753b0.tar.bz2 linux-stable-50a8accf10627b343109a9c9d5c361751bf753b0.zip |
ipv6: tcp: send consistent flowlabel in TIME_WAIT state
After commit 1d13a96c74fc ("ipv6: tcp: fix flowlabel value in ACK
messages"), we stored in tw_flowlabel the flowlabel, in the
case ACK packets needed to be sent on behalf of a TIME_WAIT socket.
We can use the same field so that RST packets sent from
TIME_WAIT state also use a consistent flowlabel.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Florent Fourcot <florent.fourcot@wifirst.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 4ccb06ea8ce3..f4e609a48e68 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -982,6 +982,8 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) oif = sk->sk_bound_dev_if; if (sk_fullsock(sk)) trace_tcp_send_reset(sk, skb); + if (sk->sk_state == TCP_TIME_WAIT) + label = cpu_to_be32(inet_twsk(sk)->tw_flowlabel); } else { if (net->ipv6.sysctl.flowlabel_reflect & 2) label = ip6_flowlabel(ipv6h); |