lkml.org 
[lkml]   [2022]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 078/132] netfilter: nft_flow_offload: fix offload with pppoe + vlan
    Date
    From: Felix Fietkau <nbd@nbd.name>

    [ Upstream commit 2456074935003b66c40f78df6adfc722435d43ea ]

    When running a combination of PPPoE on top of a VLAN, we need to set
    info->outdev to the PPPoE device, otherwise PPPoE encap is skipped
    during software offload.

    Fixes: 72efd585f714 ("netfilter: flowtable: add pppoe support")
    Signed-off-by: Felix Fietkau <nbd@nbd.name>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/netfilter/nft_flow_offload.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/netfilter/nft_flow_offload.c b/net/netfilter/nft_flow_offload.c
    index dd824193c920..12145a80ef03 100644
    --- a/net/netfilter/nft_flow_offload.c
    +++ b/net/netfilter/nft_flow_offload.c
    @@ -123,7 +123,8 @@ static void nft_dev_path_info(const struct net_device_path_stack *stack,
    info->indev = NULL;
    break;
    }
    - info->outdev = path->dev;
    + if (!info->outdev)
    + info->outdev = path->dev;
    info->encap[info->num_encaps].id = path->encap.id;
    info->encap[info->num_encaps].proto = path->encap.proto;
    info->num_encaps++;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-05-23 19:53    [W:2.879 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site