Commit 89153ed6 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: propagate extack to .port_vlan_filtering 



Some drivers can't dynamically change the VLAN filtering option, or
impose some restrictions, it would be nice to propagate this info
through netlink instead of printing it to a kernel log that might never
be read. Also netlink extack includes the module that emitted the
message, which means that it's easier to figure out which ones are
driver-generated errors as opposed to command misuse.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31046a5f

drivers/net/dsa/b53/b53_common.c

+2 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,8 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port, 
}

EXPORT_SYMBOL(b53_phylink_mac_link_up);



int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering)

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,

		       struct netlink_ext_ack *extack)

{

	struct b53_device *dev = ds->priv;

drivers/net/dsa/b53/b53_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port, 
			     struct phy_device *phydev,

			     int speed, int duplex,

			     bool tx_pause, bool rx_pause);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,

		       struct netlink_ext_ack *extack);

int b53_vlan_add(struct dsa_switch *ds, int port,

		 const struct switchdev_obj_port_vlan *vlan,

		 struct netlink_ext_ack *extack);

drivers/net/dsa/dsa_loop.c

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ static void dsa_loop_port_stp_state_set(struct dsa_switch *ds, int port, 
}



static int dsa_loop_port_vlan_filtering(struct dsa_switch *ds, int port,

					bool vlan_filtering)

					bool vlan_filtering,

					struct netlink_ext_ack *extack)

{

	dev_dbg(ds->dev, "%s: port: %d, vlan_filtering: %d\n",

		__func__, port, vlan_filtering);

drivers/net/dsa/hirschmann/hellcreek.c

+2 −1
Original line number Diff line number Diff line
@@ -875,7 +875,8 @@ static int hellcreek_fdb_dump(struct dsa_switch *ds, int port, 
}



static int hellcreek_vlan_filtering(struct dsa_switch *ds, int port,

				    bool vlan_filtering)

				    bool vlan_filtering,

				    struct netlink_ext_ack *extack)

{

	struct hellcreek *hellcreek = ds->priv;

drivers/net/dsa/lantiq_gswip.c

+7 −3
Original line number Diff line number Diff line
@@ -727,14 +727,18 @@ static int gswip_pce_load_microcode(struct gswip_priv *priv) 
}



static int gswip_port_vlan_filtering(struct dsa_switch *ds, int port,

				     bool vlan_filtering)

				     bool vlan_filtering,

				     struct netlink_ext_ack *extack)

{

	struct net_device *bridge = dsa_to_port(ds, port)->bridge_dev;

	struct gswip_priv *priv = ds->priv;



	/* Do not allow changing the VLAN filtering options while in bridge */

	if (bridge && !!(priv->port_vlan_filter & BIT(port)) != vlan_filtering)

	if (bridge && !!(priv->port_vlan_filter & BIT(port)) != vlan_filtering) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Dynamic toggling of vlan_filtering not supported");

		return -EIO;

	}



	if (vlan_filtering) {

		/* Use port based VLAN tag */
@@ -773,7 +777,7 @@ static int gswip_setup(struct dsa_switch *ds) 
	/* disable port fetch/store dma on all ports */

	for (i = 0; i < priv->hw_info->max_ports; i++) {

		gswip_port_disable(ds, i);

		gswip_port_vlan_filtering(ds, i, false);

		gswip_port_vlan_filtering(ds, i, false, NULL);

	}



	/* enable Switch */