aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-03-08 17:20:20 +0100
committerFelix Fietkau <nbd@nbd.name>2021-03-12 20:23:52 +0100
commit0d5bf53197481d291f9a541eefa03b11a34033f9 (patch)
treeaa1f2523ef12bd5e13469b148e0bec7528126777 /target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch
parente90e75b12c818c49704755b9e530491aee2d554c (diff)
downloadupstream-0d5bf53197481d291f9a541eefa03b11a34033f9.tar.gz
upstream-0d5bf53197481d291f9a541eefa03b11a34033f9.tar.bz2
upstream-0d5bf53197481d291f9a541eefa03b11a34033f9.zip
kernel: update 5.10 flow offload patches
Includes PPPoE support and VLAN related fixes Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch')
-rw-r--r--target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch b/target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch
index ddc0de0d3b..26fb64509c 100644
--- a/target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch
+++ b/target/linux/generic/pending-5.10/640-03-net-8021q-resolve-forwarding-path-for-vlan-devices.patch
@@ -42,7 +42,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+ struct {
+ u16 id;
+ __be16 proto;
-+ } vlan;
++ } encap;
+ };
};
@@ -59,8 +59,8 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+ struct vlan_dev_priv *vlan = vlan_dev_priv(ctx->dev);
+
+ path->type = DEV_PATH_VLAN;
-+ path->vlan.id = vlan->vlan_id;
-+ path->vlan.proto = vlan->vlan_proto;
++ path->encap.id = vlan->vlan_id;
++ path->encap.proto = vlan->vlan_proto;
+ path->dev = ctx->dev;
+ ctx->dev = vlan->real_dev;
+