mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF"
This reverts commit 2b3541ffdd
.
This patch shouldn't have been backported to 4.19.
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ae2f7c8437
commit
a22d7fc61f
1 changed files with 1 additions and 2 deletions
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue