diff options
author | John Audia <therealgraysky@proton.me> | 2022-09-05 06:47:34 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-17 15:58:25 +0200 |
commit | 1b0db300cbef371e3975250828f1450aebacec8f (patch) | |
tree | 5918cd1f622202680ece5807c014f54006ba503d /target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch | |
parent | bf65d2dcbab89076994df9c93d43423b8f31a471 (diff) | |
download | upstream-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-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch b/target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch index 1d3021a575..51d609cde1 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-16-net-dsa-resolve-forwarding-path-for-dsa-slave-ports.patch @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -832,6 +832,7 @@ enum net_device_path_type { +@@ -846,6 +846,7 @@ enum net_device_path_type { DEV_PATH_VLAN, DEV_PATH_BRIDGE, DEV_PATH_PPPOE, @@ -18,7 +18,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> }; struct net_device_path { -@@ -852,6 +853,10 @@ struct net_device_path { +@@ -866,6 +867,10 @@ struct net_device_path { u16 vlan_id; __be16 vlan_proto; } bridge; |