kernel: update 5.10 flow offload patches

[openwrt/staging/hauke.git] / target / linux / generic / pending-5.10 / 640-05-netfilter-flowtable-use-dev_fill_forward_path-to-obt.patch

diff --git a/target/linux/generic/pending-5.10/640-05-netfilter-flowtable-use-dev_fill_forward_path-to-obt.patch b/target/linux/generic/pending-5.10/640-05-netfilter-flowtable-use-dev_fill_forward_path-to-obt.patch
index 34724a569649f89101609ee12c0bad8759c23467..1f61cff09d0aaf79b6ffdbd6bc7ef821253c03e9 100644 (file)
--- a/target/linux/generic/pending-5.10/640-05-netfilter-flowtable-use-dev_fill_forward_path-to-obt.patch
+++ b/target/linux/generic/pending-5.10/640-05-netfilter-flowtable-use-dev_fill_forward_path-to-obt.patch
@@ -89,7 +89,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +}
 +
 +struct nft_forward_info {
-+      const struct net_device *dev;
++      const struct net_device *indev;
 +};
 +
 +static void nft_dev_path_info(const struct net_device_path_stack *stack,
@@ -102,12 +102,12 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +              path = &stack->path[i];
 +              switch (path->type) {
 +              case DEV_PATH_ETHERNET:
-+                      info->dev = path->dev;
++                      info->indev = path->dev;
 +                      break;
 +              case DEV_PATH_VLAN:
 +              case DEV_PATH_BRIDGE:
 +              default:
-+                      info->dev = NULL;
++                      info->indev = NULL;
 +                      break;
 +              }
 +      }
@@ -142,10 +142,10 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
 +      if (nft_dev_fill_forward_path(route, dst, ct, dir, &stack) >= 0)
 +              nft_dev_path_info(&stack, &info);
 +
-+      if (!info.dev || !nft_flowtable_find_dev(info.dev, ft))
++      if (!info.indev || !nft_flowtable_find_dev(info.indev, ft))
 +              return;
 +
-+      route->tuple[!dir].in.ifindex = info.dev->ifindex;
++      route->tuple[!dir].in.ifindex = info.indev->ifindex;
 +}
 +
  static int nft_flow_route(const struct nft_pktinfo *pkt,