1 files changed, 6 insertions, 2 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d2ce66b23430..b620d9b72e59 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -803,6 +803,7 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32
         unsigned int tot_len = sizeof(struct tcphdr);
         struct dst_entry *dst;
         __be32 *topt;
+        __u32 mark = 0;
 
         if (tsecr)
                 tot_len += TCPOLEN_TSTAMP_ALIGNED;
@@ -871,7 +872,10 @@ static void tcp_v6_send_response(const struct sock *sk, struct sk_buff *skb, u32
                 fl6.flowi6_oif = oif;
         }
 
-        fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark);
+        if (sk)
+                mark = (sk->sk_state == TCP_TIME_WAIT) ?
+                        inet_twsk(sk)->tw_mark : sk->sk_mark;
+        fl6.flowi6_mark = IP6_REPLY_MARK(net, skb->mark) ?: mark;
         fl6.fl6_dport = t1->dest;
         fl6.fl6_sport = t1->source;
         fl6.flowi6_uid = sock_net_uid(net, sk && sk_fullsock(sk) ? sk : NULL);
@@ -1318,7 +1322,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
                         }
                 }
 
-                tcp_rcv_established(sk, skb, tcp_hdr(skb));
+                tcp_rcv_established(sk, skb);
                 if (opt_skb)
                         goto ipv6_pktoptions;
                 return 0;