aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
diff options
context:
space:
mode:
authorAnsuel Smith <ansuelsmth@gmail.com>2022-03-21 15:22:20 +0100
committerDaniel Golle <daniel@makrotopia.org>2022-03-27 05:00:50 +0100
commit009f8afe06258adff30d83e936d097e42d5501ca (patch)
tree8d8059364dd135646aae277ace45e77674c19865 /target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
parent49cb5e501a8d6eb8ff5cad63f13282de7b84e7ef (diff)
downloadupstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.gz
upstream-009f8afe06258adff30d83e936d097e42d5501ca.tar.bz2
upstream-009f8afe06258adff30d83e936d097e42d5501ca.zip
generic: 5.15: refresh pending patch
Use 'make target/linux/refresh' to refresh pending patches. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch')
-rw-r--r--target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch6
1 files changed, 3 insertions, 3 deletions
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
index 16be95ea38..0c9604e5a9 100644
--- 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
@@ -17,11 +17,11 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2869,6 +2869,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -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;
- mv88e6xxx_reg_lock(chip);
-
+ /* Since virtual bridges are mapped in the PVT, the number we support
+ * depends on the physical switch topology. We need to let DSA figure