]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2022 15:17:46 +0000 (16:17 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Dec 2022 15:17:46 +0000 (16:17 +0100)
added patches:
revert-net-dsa-b53-fix-valid-setting-for-mdb-entries.patch

queue-5.4/revert-net-dsa-b53-fix-valid-setting-for-mdb-entries.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/revert-net-dsa-b53-fix-valid-setting-for-mdb-entries.patch b/queue-5.4/revert-net-dsa-b53-fix-valid-setting-for-mdb-entries.patch
new file mode 100644 (file)
index 0000000..b89f1be
--- /dev/null
@@ -0,0 +1,36 @@
+From zajec5@gmail.com  Fri Dec  9 16:16:53 2022
+From: "Rafał Miłecki" <zajec5@gmail.com>
+Date: Wed,  7 Dec 2022 08:01:55 +0100
+Subject: Revert "net: dsa: b53: Fix valid setting for MDB entries"
+To: stable@vger.kernel.org
+Cc: "Florian Fainelli" <f.fainelli@gmail.com>, "Andrew Lunn" <andrew@lunn.ch>, "David S . Miller" <davem@davemloft.net>, "Rafał Miłecki" <rafal@milecki.pl>
+Message-ID: <20221207070155.12389-1-zajec5@gmail.com>
+
+From: Rafał Miłecki <rafal@milecki.pl>
+
+This reverts commit 1fae6eb0fc91d3ecb539e03f9e4dcd1c53ada553.
+
+Upstream commit was a fix for an overlook of setting "ent.is_valid"
+twice after 5d65b64a3d97 ("net: dsa: b53: Add support for MDB").
+
+Since MDB support was not backported to stable kernels (it's not a bug
+fix) there is nothing to fix there. Backporting this commit resulted in
+"env.is_valid" not being set at all.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Acked-by: Florian Fainelli <f.fainelli@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/dsa/b53/b53_common.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/dsa/b53/b53_common.c
++++ b/drivers/net/dsa/b53/b53_common.c
+@@ -1551,6 +1551,7 @@ static int b53_arl_op(struct b53_device
+       memset(&ent, 0, sizeof(ent));
+       ent.port = port;
++      ent.is_valid = is_valid;
+       ent.vid = vid;
+       ent.is_static = true;
+       memcpy(ent.mac, addr, ETH_ALEN);
index 1e47eeb01bb22343624f3059511acbcd1a91c22b..82e7eae925a19265d92219bfa8fe07c757eddfc9 100644 (file)
@@ -20,3 +20,4 @@ mm-khugepaged-invoke-mmu-notifiers-in-shmem-file-col.patch
 xen-netback-ensure-protocol-headers-don-t-fall-in-th.patch
 xen-netback-do-some-code-cleanup.patch
 xen-netback-don-t-call-kfree_skb-with-interrupts-dis.patch
+revert-net-dsa-b53-fix-valid-setting-for-mdb-entries.patch