From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Tue, 24 May 2022 19:53:23 +0000 (+0200)
Subject: generic: remove patch to fix vlan setup on mv88e6xxx
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=06c1328d55362fd7838d0f03d64cad7d305a83ac;p=openwrt%2Fstaging%2Fjogo.git

generic: remove patch to fix vlan setup on mv88e6xxx

This patch was present in Linux kernel [1] since version 5.11rc1, but it
was superseded by another patch, which set configure_vlan_while_not_filtering
to true by default since kernel v5.12-rc2 [2].

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/dsa/mv88e6xxx/chip.c?h=v5.15.41&id=b8b79c414eca4e9bcab645e02cb92c48db974ce9

[2] https://github.com/torvalds/linux/commit/0ee2af4ebbe3c4364429859acd571018ebfb3424#

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---

diff --git a/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
deleted file mode 100644
index 0c9604e5a9..0000000000
--- a/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a1b291f3f6c80a6c5ccad7283fc472d77a2a4763 Mon Sep 17 00:00:00 2001
-From: Russell King <rmk+kernel@armlinux.org.uk>
-Date: Sun, 22 Dec 2019 12:40:11 +0000
-Subject: [PATCH] net: dsa: mv88e6xxx: fix vlan setup
-
-Provide an option that drivers can set to indicate they want to receive
-vlan configuration even when vlan filtering is disabled. This is safe
-for Marvell DSA bridges, which do not look up ingress traffic in the
-VTU if the port is in 8021Q disabled state. Whether this change is
-suitable for all DSA bridges is not known.
-
-Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-Signed-off-by: DENG Qingfang <dqfext@gmail.com>
----
- drivers/net/dsa/mv88e6xxx/chip.c |  1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/dsa/mv88e6xxx/chip.c
-+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3193,6 +3193,7 @@ static int mv88e6xxx_setup(struct dsa_sw
- 
- 	chip->ds = ds;
- 	ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);
-+	ds->configure_vlan_while_not_filtering = true;
- 
- 	/* Since virtual bridges are mapped in the PVT, the number we support
- 	 * depends on the physical switch topology. We need to let DSA figure