Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cff7b28 authored by Alexander Ovechkin's avatar Alexander Ovechkin Committed by Greg Kroah-Hartman
Browse files

net: send SYNACK packet with accepted fwmark 



commit 43b90bfad34bcb81b8a5bc7dc650800f4be1787e upstream.

commit e05a90ec ("net: reflect mark on tcp syn ack packets")
fixed IPv4 only.

This part is for the IPv6 side.

Fixes: e05a90ec ("net: reflect mark on tcp syn ack packets")
Signed-off-by: default avatarAlexander Ovechkin <ovov@yandex-team.ru>
Acked-by: default avatarDmitry Yakunin <zeil@yandex-team.ru>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b7e5563f

net/ipv6/tcp_ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -513,8 +513,8 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst, 
		opt = ireq->ipv6_opt;

		if (!opt)

			opt = rcu_dereference(np->opt);

		err = ip6_xmit(sk, skb, fl6, sk->sk_mark, opt, np->tclass,

			       sk->sk_priority);

		err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt,

			       np->tclass, sk->sk_priority);

		rcu_read_unlock();

		err = net_xmit_eval(err);

	}