Commit 31046a5f authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: propagate extack to .port_vlan_add 



Allow drivers to communicate their restrictions to user space directly,
instead of printing to the kernel log. Where the conversion would have
been lossy and things like VLAN ID could no longer be conveyed (due to
the lack of support for printf format specifier in netlink extack), I
chose to keep the messages in full form to the kernel log only, and
leave it up to individual driver maintainers to move more messages to
extack.

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 dcbdf135

drivers/net/dsa/b53/b53_common.c

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



int b53_vlan_add(struct dsa_switch *ds, int port,

		 const struct switchdev_obj_port_vlan *vlan)

		 const struct switchdev_obj_port_vlan *vlan,

		 struct netlink_ext_ack *extack)

{

	struct b53_device *dev = ds->priv;

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

drivers/net/dsa/b53/b53_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ void b53_phylink_mac_link_up(struct dsa_switch *ds, int port, 
			     bool tx_pause, bool rx_pause);

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

int b53_vlan_add(struct dsa_switch *ds, int port,

		 const struct switchdev_obj_port_vlan *vlan);

		 const struct switchdev_obj_port_vlan *vlan,

		 struct netlink_ext_ack *extack);

int b53_vlan_del(struct dsa_switch *ds, int port,

		 const struct switchdev_obj_port_vlan *vlan);

int b53_fdb_add(struct dsa_switch *ds, int port,

drivers/net/dsa/bcm_sf2_cfp.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int bcm_sf2_cfp_rule_insert(struct dsa_switch *ds, int port, 
		else

			vlan.flags = 0;



		ret = ds->ops->port_vlan_add(ds, port_num, &vlan);

		ret = ds->ops->port_vlan_add(ds, port_num, &vlan, NULL);

		if (ret)

			return ret;

	}

drivers/net/dsa/dsa_loop.c

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



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

				  const struct switchdev_obj_port_vlan *vlan)

				  const struct switchdev_obj_port_vlan *vlan,

				  struct netlink_ext_ack *extack)

{

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;

drivers/net/dsa/hirschmann/hellcreek.c

+8 −4
Original line number Diff line number Diff line
@@ -341,7 +341,8 @@ static u16 hellcreek_private_vid(int port) 
}



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

				  const struct switchdev_obj_port_vlan *vlan)

				  const struct switchdev_obj_port_vlan *vlan,

				  struct netlink_ext_ack *extack)

{

	struct hellcreek *hellcreek = ds->priv;

	int i;
@@ -358,9 +359,11 @@ static int hellcreek_vlan_prepare(struct dsa_switch *ds, int port, 
		if (!dsa_is_user_port(ds, i))

			continue;



		if (vlan->vid == restricted_vid)

		if (vlan->vid == restricted_vid) {

			NL_SET_ERR_MSG_MOD(extack, "VID restricted by driver");

			return -EBUSY;

		}

	}



	return 0;

}
@@ -445,14 +448,15 @@ static void hellcreek_unapply_vlan(struct hellcreek *hellcreek, int port, 
}



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

			      const struct switchdev_obj_port_vlan *vlan)

			      const struct switchdev_obj_port_vlan *vlan,

			      struct netlink_ext_ack *extack)

{

	bool untagged = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED;

	bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID;

	struct hellcreek *hellcreek = ds->priv;

	int err;



	err = hellcreek_vlan_prepare(ds, port, vlan);

	err = hellcreek_vlan_prepare(ds, port, vlan, extack);

	if (err)

		return err;