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

net: bridge: propagate extack through switchdev_port_attr_set 



The benefit is the ability to propagate errors from switchdev drivers
for the SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING and
SWITCHDEV_ATTR_ID_BRIDGE_VLAN_PROTOCOL attributes.

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 9e781401

include/net/switchdev.h

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ switchdev_notifier_info_to_extack(const struct switchdev_notifier_info *info) 


void switchdev_deferred_process(void);

int switchdev_port_attr_set(struct net_device *dev,

			    const struct switchdev_attr *attr);

			    const struct switchdev_attr *attr,

			    struct netlink_ext_ack *extack);

int switchdev_port_obj_add(struct net_device *dev,

			   const struct switchdev_obj *obj,

			   struct netlink_ext_ack *extack);

net/bridge/br_mrp_switchdev.c

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ int br_mrp_port_switchdev_set_state(struct net_bridge_port *p, u32 state) 
	};

	int err;



	err = switchdev_port_attr_set(p->dev, &attr);

	err = switchdev_port_attr_set(p->dev, &attr, NULL);

	if (err && err != -EOPNOTSUPP)

		br_warn(p->br, "error setting offload MRP state on port %u(%s)\n",

			(unsigned int)p->port_no, p->dev->name);
@@ -196,7 +196,7 @@ int br_mrp_port_switchdev_set_role(struct net_bridge_port *p, 
	};

	int err;



	err = switchdev_port_attr_set(p->dev, &attr);

	err = switchdev_port_attr_set(p->dev, &attr, NULL);

	if (err && err != -EOPNOTSUPP)

		return err;

net/bridge/br_multicast.c

+3 −3
Original line number Diff line number Diff line
@@ -1381,7 +1381,7 @@ static void br_mc_router_state_change(struct net_bridge *p, 
		.u.mrouter = is_mc_router,

	};



	switchdev_port_attr_set(p->dev, &attr);

	switchdev_port_attr_set(p->dev, &attr, NULL);

}



static void br_multicast_local_router_expired(struct timer_list *t)
@@ -1602,7 +1602,7 @@ static void br_mc_disabled_update(struct net_device *dev, bool value) 
		.u.mc_disabled = !value,

	};



	switchdev_port_attr_set(dev, &attr);

	switchdev_port_attr_set(dev, &attr, NULL);

}



int br_multicast_add_port(struct net_bridge_port *port)
@@ -2645,7 +2645,7 @@ static void br_port_mc_router_state_change(struct net_bridge_port *p, 
		.u.mrouter = is_mc_router,

	};



	switchdev_port_attr_set(p->dev, &attr);

	switchdev_port_attr_set(p->dev, &attr, NULL);

}



/*

net/bridge/br_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1221,7 +1221,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	if (data[IFLA_BR_VLAN_PROTOCOL]) {

		__be16 vlan_proto = nla_get_be16(data[IFLA_BR_VLAN_PROTOCOL]);



		err = __br_vlan_set_proto(br, vlan_proto);

		err = __br_vlan_set_proto(br, vlan_proto, extack);

		if (err)

			return err;

	}

net/bridge/br_private.h

+2 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,8 @@ struct net_bridge_vlan *br_vlan_find(struct net_bridge_vlan_group *vg, u16 vid); 
void br_recalculate_fwd_mask(struct net_bridge *br);

int br_vlan_filter_toggle(struct net_bridge *br, unsigned long val,

			  struct netlink_ext_ack *extack);

int __br_vlan_set_proto(struct net_bridge *br, __be16 proto);

int __br_vlan_set_proto(struct net_bridge *br, __be16 proto,

			struct netlink_ext_ack *extack);

int br_vlan_set_proto(struct net_bridge *br, unsigned long val,

		      struct netlink_ext_ack *extack);

int br_vlan_set_stats(struct net_bridge *br, unsigned long val);