diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-03-08 20:09:27 +0100 |
| commit | 14296d0e85d45695ad2dc65b653b29e5a3514cdb (patch) | |
| tree | c5d875755a94e8fa9d671d0cdd6f1e4755318698 /drivers/net/dsa/mt7530.c | |
| parent | 6914f7e2e25fac9d1d2b62c208eaa5f2bf810fe9 (diff) | |
| parent | 21e4543a2e2f8538373d1d19264c4bae6f13e798 (diff) | |
Merge branch 'linus' into x86/urgent, to pick up dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/dsa/mt7530.c')
| -rw-r--r-- | drivers/net/dsa/mt7530.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 1c83af805209..5883eb93efb1 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2591,7 +2591,8 @@ mt7531_setup_common(struct dsa_switch *ds) if (ret < 0) return ret; - return 0; + /* Setup VLAN ID 0 for VLAN-unaware bridges */ + return mt7530_setup_vlan0(priv); } static int @@ -2687,11 +2688,6 @@ mt7531_setup(struct dsa_switch *ds) if (ret) return ret; - /* Setup VLAN ID 0 for VLAN-unaware bridges */ - ret = mt7530_setup_vlan0(priv); - if (ret) - return ret; - ds->assisted_learning_on_cpu_port = true; ds->mtu_enforcement_ingress = true; |