target/linux/generic/pending-5.15/704-03-netfilter-nft_flow_offload-fix-offload-with-pppoe-vl.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Fri, 6 May 2022 15:15:06 +0200
   3 Subject: [PATCH] netfilter: nft_flow_offload: fix offload with pppoe +
   4  vlan
   5
   6 When running a combination of PPPoE on top of a VLAN, we need to set
   7 info->outdev to the PPPoE device, otherwise PPPoE encap is skipped
   8 during software offload.
   9
  10 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  11 ---
  12
  13 --- a/net/netfilter/nft_flow_offload.c
  14 +++ b/net/netfilter/nft_flow_offload.c
  15 @@ -123,7 +123,8 @@ static void nft_dev_path_info(const stru
  16                                 info->indev = NULL;
  17                                 break;
  18                         }
  19 -                       info->outdev = path->dev;
  20 +                       if (!info->outdev)
  21 +                               info->outdev = path->dev;
  22                         info->encap[info->num_encaps].id = path->encap.id;
  23                         info->encap[info->num_encaps].proto = path->encap.proto;
  24                         info->num_encaps++;