Commit cc0c207a authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: Remove SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT 



Now that we have converted the bridge code and the drivers to check for
bridge port(s) flags at the time we try to set them, there is no need
for a get() -> set() sequence anymore and
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT therefore becomes unused.

Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ef07644

Documentation/networking/switchdev.txt

+2 −4
Original line number Diff line number Diff line
@@ -232,10 +232,8 @@ Learning_sync attribute enables syncing of the learned/forgotten FDB entry to 
the bridge's FDB.  It's possible, but not optimal, to enable learning on the

device port and on the bridge port, and disable learning_sync.



To support learning and learning_sync port attributes, the driver implements

switchdev op switchdev_port_attr_get/set for

SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS. The driver should initialize the attributes

to the hardware defaults.

To support learning, the driver implements switchdev op

switchdev_port_attr_get/set for SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS.



FDB Ageing

^^^^^^^^^^

drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

+1 −10
Original line number Diff line number Diff line
@@ -434,18 +434,9 @@ static void mlxsw_sp_bridge_vlan_put(struct mlxsw_sp_bridge_vlan *bridge_vlan) 
static int mlxsw_sp_port_attr_get(struct net_device *dev,

				  struct switchdev_attr *attr)

{

	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD |

					       BR_MCAST_FLOOD;

		break;

	default:

	return -EOPNOTSUPP;

}



	return 0;

}



static int

mlxsw_sp_port_bridge_vlan_stp_set(struct mlxsw_sp_port *mlxsw_sp_port,

				  struct mlxsw_sp_bridge_vlan *bridge_vlan,

drivers/net/ethernet/rocker/rocker_main.c

+1 −13
Original line number Diff line number Diff line
@@ -2069,21 +2069,9 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
static int rocker_port_attr_get(struct net_device *dev,

				struct switchdev_attr *attr)

{

	const struct rocker_port *rocker_port = netdev_priv(dev);

	int err = 0;



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		err = rocker_world_port_attr_bridge_flags_support_get(rocker_port,

								      &attr->u.brport_flags_support);

		break;

	default:

	return -EOPNOTSUPP;

}



	return err;

}



static int rocker_port_attr_set(struct net_device *dev,

				const struct switchdev_attr *attr,

				struct switchdev_trans *trans)

drivers/staging/fsl-dpaa2/ethsw/ethsw.c

+1 −9
Original line number Diff line number Diff line
@@ -643,17 +643,9 @@ static void ethsw_teardown_irqs(struct fsl_mc_device *sw_dev) 
static int swdev_port_attr_get(struct net_device *netdev,

			       struct switchdev_attr *attr)

{

	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD;

		break;

	default:

	return -EOPNOTSUPP;

}



	return 0;

}



static int port_attr_stp_state_set(struct net_device *netdev,

				   struct switchdev_trans *trans,

				   u8 state)

include/net/switchdev.h

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ enum switchdev_attr_id { 
	SWITCHDEV_ATTR_ID_UNDEFINED,

	SWITCHDEV_ATTR_ID_PORT_STP_STATE,

	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS,

	SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT,

	SWITCHDEV_ATTR_ID_PORT_PRE_BRIDGE_FLAGS,

	SWITCHDEV_ATTR_ID_PORT_MROUTER,

	SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
@@ -63,7 +62,6 @@ struct switchdev_attr { 
	union {

		u8 stp_state;				/* PORT_STP_STATE */

		unsigned long brport_flags;		/* PORT_{PRE}_BRIDGE_FLAGS */

		unsigned long brport_flags_support;	/* PORT_BRIDGE_FLAGS_SUPPORT */

		bool mrouter;				/* PORT_MROUTER */

		clock_t ageing_time;			/* BRIDGE_AGEING_TIME */

		bool vlan_filtering;			/* BRIDGE_VLAN_FILTERING */

CRA Git | Maintained and supported by SUSTech CRA and CCSE