Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d37444 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-Remove-unused-variables' 



Florian Fainelli says:

====================
Remove unused variables

This removes unused variables from mlxsw and ethsw after the recent
removal of SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, build scripts are now
fixed to take care of those warnings :).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd3606c2 fd80a143

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

+0 −3
Original line number Diff line number Diff line
@@ -434,9 +434,6 @@ 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)

{

	struct mlxsw_sp_port *mlxsw_sp_port = netdev_priv(dev);

	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp;



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD |

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

+0 −2
Original line number Diff line number Diff line
@@ -643,8 +643,6 @@ 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)

{

	struct ethsw_port_priv *port_priv = netdev_priv(netdev);



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		attr->u.brport_flags_support = BR_LEARNING | BR_FLOOD;