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

net: Get rid of switchdev_port_attr_get() 



With the bridge no longer calling switchdev_port_attr_get() to obtain
the supported bridge port flags from a driver but instead trying to set
the bridge port flags directly and relying on driver to reject
unsupported configurations, we can effectively get rid of
switchdev_port_attr_get() entirely since this was the only place where
it was called.

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

Documentation/networking/switchdev.txt

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ 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, the driver implements switchdev op

switchdev_port_attr_get/set for SWITCHDEV_ATTR_PORT_ID_BRIDGE_FLAGS.

switchdev_port_attr_set for SWITCHDEV_ATTR_PORT_ID_{PRE}_BRIDGE_FLAGS.



FDB Ageing

^^^^^^^^^^

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

+0 −7
Original line number Diff line number Diff line
@@ -431,12 +431,6 @@ static void mlxsw_sp_bridge_vlan_put(struct mlxsw_sp_bridge_vlan *bridge_vlan) 
		mlxsw_sp_bridge_vlan_destroy(bridge_vlan);

}



static int mlxsw_sp_port_attr_get(struct net_device *dev,

				  struct switchdev_attr *attr)

{

	return -EOPNOTSUPP;

}



static int

mlxsw_sp_port_bridge_vlan_stp_set(struct mlxsw_sp_port *mlxsw_sp_port,

				  struct mlxsw_sp_bridge_vlan *bridge_vlan,
@@ -1945,7 +1939,6 @@ static struct mlxsw_sp_port *mlxsw_sp_lag_rep_port(struct mlxsw_sp *mlxsw_sp, 
}



static const struct switchdev_ops mlxsw_sp_port_switchdev_ops = {

	.switchdev_port_attr_get	= mlxsw_sp_port_attr_get,

	.switchdev_port_attr_set	= mlxsw_sp_port_attr_set,

};

drivers/net/ethernet/rocker/rocker_main.c

+0 −7
Original line number Diff line number Diff line
@@ -2066,12 +2066,6 @@ static const struct net_device_ops rocker_port_netdev_ops = { 
 * swdev interface

 ********************/



static int rocker_port_attr_get(struct net_device *dev,

				struct switchdev_attr *attr)

{

	return -EOPNOTSUPP;

}



static int rocker_port_attr_set(struct net_device *dev,

				const struct switchdev_attr *attr,

				struct switchdev_trans *trans)
@@ -2148,7 +2142,6 @@ static int rocker_port_obj_del(struct net_device *dev, 
}



static const struct switchdev_ops rocker_port_switchdev_ops = {

	.switchdev_port_attr_get	= rocker_port_attr_get,

	.switchdev_port_attr_set	= rocker_port_attr_set,

};

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

+0 −7
Original line number Diff line number Diff line
@@ -640,12 +640,6 @@ static void ethsw_teardown_irqs(struct fsl_mc_device *sw_dev) 
	fsl_mc_free_irqs(sw_dev);

}



static int swdev_port_attr_get(struct net_device *netdev,

			       struct switchdev_attr *attr)

{

	return -EOPNOTSUPP;

}



static int port_attr_stp_state_set(struct net_device *netdev,

				   struct switchdev_trans *trans,

				   u8 state)
@@ -932,7 +926,6 @@ static int swdev_port_obj_del(struct net_device *netdev, 
}



static const struct switchdev_ops ethsw_port_switchdev_ops = {

	.switchdev_port_attr_get	= swdev_port_attr_get,

	.switchdev_port_attr_set	= swdev_port_attr_set,

};

include/net/switchdev.h

+0 −8
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ switchdev_notifier_info_to_extack(const struct switchdev_notifier_info *info) 
#ifdef CONFIG_NET_SWITCHDEV



void switchdev_deferred_process(void);

int switchdev_port_attr_get(struct net_device *dev,

			    struct switchdev_attr *attr);

int switchdev_port_attr_set(struct net_device *dev,

			    const struct switchdev_attr *attr);

int switchdev_port_obj_add(struct net_device *dev,
@@ -225,12 +223,6 @@ static inline void switchdev_deferred_process(void) 
{

}



static inline int switchdev_port_attr_get(struct net_device *dev,

					  struct switchdev_attr *attr)

{

	return -EOPNOTSUPP;

}



static inline int switchdev_port_attr_set(struct net_device *dev,

					  const struct switchdev_attr *attr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE