aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-22 12:07:50 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 18:59:53 +0200
commitf61c5cf76b9d13d9cc5962c4640ba14f28800215 (patch)
tree8e11d5bc9a2135e72e0365e5903e1f3bd7f36050 /target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
parenta4212b77c0a48904218093645008f176e65e79bb (diff)
downloadupstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.tar.gz
upstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.tar.bz2
upstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.zip
kernel: bump 5.10 to 5.10.176
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit f598880162e83ddc0139e00c5248497d06f5fff7)
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch')
-rw-r--r--target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
index cf110cd066..9e62546a6c 100644
--- a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
+++ b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
@@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -862,10 +862,20 @@ struct net_device_path {
+@@ -864,10 +864,20 @@ struct net_device_path {
u16 id;
__be16 proto;
} encap;
@@ -36,7 +36,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
struct net_device_path_stack {
int num_paths;
-@@ -875,6 +885,12 @@ struct net_device_path_stack {
+@@ -877,6 +887,12 @@ struct net_device_path_stack {
struct net_device_path_ctx {
const struct net_device *dev;
const u8 *daddr;