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>2022-09-05 06:47:34 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-09-17 15:58:25 +0200
commit1b0db300cbef371e3975250828f1450aebacec8f (patch)
tree5918cd1f622202680ece5807c014f54006ba503d /target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
parentbf65d2dcbab89076994df9c93d43423b8f31a471 (diff)
downloadupstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.gz
upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.bz2
upstream-1b0db300cbef371e3975250828f1450aebacec8f.zip
kernel: bump 5.10 to 5.10.141
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit e8a62a1e6040de71bdcb1be1a1c30c064acbc059)
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 ba2b1a2877..0f09dfe06c 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
-@@ -841,10 +841,20 @@ struct net_device_path {
+@@ -855,10 +855,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;
-@@ -854,6 +864,12 @@ struct net_device_path_stack {
+@@ -868,6 +878,12 @@ struct net_device_path_stack {
struct net_device_path_ctx {
const struct net_device *dev;
const u8 *daddr;