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

Commit a22d7fc6 authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF" 



This reverts commit 2b3541ff.

This patch shouldn't have been backported to 4.19.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ae2f7c84

net/ipv6/tcp_ipv6.c

+1 −2
Original line number Diff line number Diff line
@@ -734,7 +734,6 @@ static void tcp_v6_init_req(struct request_sock *req, 
			    const struct sock *sk_listener,

			    struct sk_buff *skb)

{

	bool l3_slave = ipv6_l3mdev_skb(TCP_SKB_CB(skb)->header.h6.flags);

	struct inet_request_sock *ireq = inet_rsk(req);

	const struct ipv6_pinfo *np = inet6_sk(sk_listener);
@@ -742,7 +741,7 @@ static void tcp_v6_init_req(struct request_sock *req, 
	ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr;



	/* So that link locals have meaning */

	if ((!sk_listener->sk_bound_dev_if || l3_slave) &&

	if (!sk_listener->sk_bound_dev_if &&

	    ipv6_addr_type(&ireq->ir_v6_rmt_addr) & IPV6_ADDR_LINKLOCAL)

		ireq->ir_iif = tcp_v6_iif(skb);