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-01-14 06:31:07 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-01-28 20:07:11 +0100
commit15b9c02d6c2bedded895bfbdaa551e68aec95f52 (patch)
tree553f18b1950ac2a861be9ca0f789c120249becce /target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch
parenta8025bc2c27dfe9a5fb542ef3471175de970780f (diff)
downloadupstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.tar.gz
upstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.tar.bz2
upstream-15b9c02d6c2bedded895bfbdaa551e68aec95f52.zip
kernel: bump 5.10 to 5.10.163
Removed upstreamed: generic/101-Use-stddefs.h-instead-of-compiler.h.patch[1] bcm27xx/patches-5.10/950-0194-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch All patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.163&id=ddd2bb08bd99b7ee4442fbbe0f9b80236fdd71d2 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 2835df54ab84a8709057df156932497b19cda449)
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 ef7157fba0..cf110cd066 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
-@@ -855,10 +855,20 @@ struct net_device_path {
+@@ -862,10 +862,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;
-@@ -868,6 +878,12 @@ struct net_device_path_stack {
+@@ -875,6 +885,12 @@ struct net_device_path_stack {
struct net_device_path_ctx {
const struct net_device *dev;
const u8 *daddr;