public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dpaa2-switch: print an error when the vlan is already configured

Browse source 
Print a netdev error when we hit a case in which a specific VLAN is
already configured on the port. While at it, change the already existing
netdev_warn into an _err for consistency purposes.

Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ioana Ciornei 2023-12-19 13:59:28 +02:00 • committed by David S. Miller
parent 7218e96319
commit d50b1a8c30
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
View file

@ -289,7 +289,7 @@ static int dpaa2_switch_port_add_vlan(struct ethsw_port_priv *port_priv,
int err; int err;
if (port_priv->vlans[vid]) { if (port_priv->vlans[vid]) {
netdev_warn(netdev, "VLAN %d already configured\n", vid); netdev_err(netdev, "VLAN %d already configured\n", vid);
return -EEXIST; return -EEXIST;
} }
@ -1774,8 +1774,10 @@ int dpaa2_switch_port_vlans_add(struct net_device *netdev,
/* Make sure that the VLAN is not already configured /* Make sure that the VLAN is not already configured
* on the switch port * on the switch port
*/ */
if (port_priv->vlans[vlan->vid] & ETHSW_VLAN_MEMBER) if (port_priv->vlans[vlan->vid] & ETHSW_VLAN_MEMBER) {
netdev_err(netdev, "VLAN %d already configured\n", vlan->vid);
return -EEXIST; return -EEXIST;
}
/* Check if there is space for a new VLAN */ /* Check if there is space for a new VLAN */
err = dpsw_get_attributes(ethsw->mc_io, 0, ethsw->dpsw_handle, err = dpsw_get_attributes(ethsw->mc_io, 0, ethsw->dpsw_handle,