lkml.org 
[lkml]   [2020]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 59/65] Revert "ipv6: Fix handling of LLA with VRF and sockets bound to VRF"
    Date
    This reverts commit 2b3541ffdd05198b329d21920a0f606009a1058b.

    This patch shouldn't have been backported to 4.19.

    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/ipv6/tcp_ipv6.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
    index c5f4e89b6ff30..7b0c2498f461b 100644
    --- a/net/ipv6/tcp_ipv6.c
    +++ b/net/ipv6/tcp_ipv6.c
    @@ -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);

    --
    2.20.1


    \
     
     \ /
      Last update: 2020-03-24 14:15    [W:2.448 / U:1.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site