sieni
/
linux
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: yt921x: Refactor VLAN awareness setting 

Create a helper function to centralize the logic for enabling and
disabling VLAN awareness on a port.

Signed-off-by: David Yang <mmyangfl@gmail.com>
Link: https://patch.msgid.link/20260131021854.3405036-4-mmyangfl@gmail.com
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
David Yang 2026-01-31 10:18:49 +08:00 committed by Paolo Abeni
parent 8cdb2cc9a1
commit 75b85703fd
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/dsa/yt921x.c
View File

@ -1769,6 +1769,18 @@ yt921x_dsa_port_mdb_add(struct dsa_switch *ds, int port,
return res;
}
static int
yt921x_vlan_aware_set(struct yt921x_priv *priv, int port, bool vlan_aware)
{
u32 ctrl;
if (!vlan_aware)
ctrl = 0;
else
ctrl = YT921X_PORT_IGR_TPIDn_CTAG(0);
return yt921x_reg_write(priv, YT921X_PORTn_IGR_TPID(port), ctrl);
}
static int
yt921x_port_set_pvid(struct yt921x_priv *priv, int port, u16 vid)
{
@ -1818,14 +1830,7 @@ yt921x_vlan_filtering(struct yt921x_priv *priv, int port, bool vlan_filtering)
if (res)
return res;
/* Turn on / off VLAN awareness */
mask = YT921X_PORT_IGR_TPIDn_CTAG_M;
if (!vlan_filtering)
ctrl = 0;
else
ctrl = YT921X_PORT_IGR_TPIDn_CTAG(0);
res = yt921x_reg_update_bits(priv, YT921X_PORTn_IGR_TPID(port),
mask, ctrl);
res = yt921x_vlan_aware_set(priv, port, vlan_filtering);
if (res)
return res;
@ -2022,8 +2027,7 @@ static int yt921x_userport_standalone(struct yt921x_priv *priv, int port)
return res;
/* Turn off VLAN awareness */
mask = YT921X_PORT_IGR_TPIDn_CTAG_M;
res = yt921x_reg_clear_bits(priv, YT921X_PORTn_IGR_TPID(port), mask);
res = yt921x_vlan_aware_set(priv, port, false);
if (res)
return res;