aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-11-26 06:51:56 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-27 13:18:29 +0100
commit590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad (patch)
treeb8d0c8571b36a5029c9d3c82d2cb7f5a68986ac4 /target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
parent6640c788feadbdde9ac80a66e6b24802ae021bd5 (diff)
downloadupstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.gz
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.tar.bz2
upstream-590aa0ca515b3d9da06fe11d65f43d0dcf5b9cad.zip
kernel: bump 5.15 to 5.15.80
Manually rebase: pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch ath79/patches-5.15/910-unaligned_access_hacks.patch All other patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch')
-rw-r--r--target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
index 7c6a3a3f8d..bffdcb2881 100644
--- a/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
+++ b/target/linux/generic/backport-5.15/766-v5.18-01-net-dsa-provide-switch-operations-for-tracking-the-m.patch
@@ -160,7 +160,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct dsa_switchdev_event_work {
struct dsa_switch *ds;
int port;
-@@ -548,6 +555,12 @@ int dsa_tree_change_tag_proto(struct dsa
+@@ -549,6 +556,12 @@ int dsa_tree_change_tag_proto(struct dsa
struct net_device *master,
const struct dsa_device_ops *tag_ops,
const struct dsa_device_ops *old_tag_ops);