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

Commit c069fcd8 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

net: dsa: Remove support for bypass bridge port attributes/vlan set 



The bridge port attributes/vlan for DSA devices should be set only
from bridge code. Furthermore, The vlans are synced totally with the
bridge so there is no need for special dump support.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a0b6b8c9

include/net/dsa.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -378,10 +378,6 @@ struct dsa_switch_ops { 
				 struct switchdev_trans *trans);

				 struct switchdev_trans *trans);

	int	(*port_vlan_del)(struct dsa_switch *ds, int port,

	int	(*port_vlan_del)(struct dsa_switch *ds, int port,

				 const struct switchdev_obj_port_vlan *vlan);

				 const struct switchdev_obj_port_vlan *vlan);

	int	(*port_vlan_dump)(struct dsa_switch *ds, int port,

				  struct switchdev_obj_port_vlan *vlan,

				  switchdev_obj_dump_cb_t *cb);



	/*

	/*

	 * Forwarding database

	 * Forwarding database

	 */

	 */

net/dsa/dsa_priv.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -147,10 +147,6 @@ int dsa_port_vlan_add(struct dsa_port *dp, 
		      struct switchdev_trans *trans);

		      struct switchdev_trans *trans);

int dsa_port_vlan_del(struct dsa_port *dp,

int dsa_port_vlan_del(struct dsa_port *dp,

		      const struct switchdev_obj_port_vlan *vlan);

		      const struct switchdev_obj_port_vlan *vlan);

int dsa_port_vlan_dump(struct dsa_port *dp,

		       struct switchdev_obj_port_vlan *vlan,

		       switchdev_obj_dump_cb_t *cb);



/* slave.c */

/* slave.c */

extern const struct dsa_device_ops notag_netdev_ops;

extern const struct dsa_device_ops notag_netdev_ops;

void dsa_slave_mii_bus_init(struct dsa_switch *ds);

void dsa_slave_mii_bus_init(struct dsa_switch *ds);

net/dsa/port.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -246,15 +246,3 @@ int dsa_port_vlan_del(struct dsa_port *dp, 




	return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);

	return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);

}
 
}
 


int dsa_port_vlan_dump(struct dsa_port *dp,

		       struct switchdev_obj_port_vlan *vlan,

		       switchdev_obj_dump_cb_t *cb)

{

	struct dsa_switch *ds = dp->ds;



	if (ds->ops->port_vlan_dump)

		return ds->ops->port_vlan_dump(ds, dp->index, vlan, cb);



	return -EOPNOTSUPP;

}

net/dsa/slave.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -302,9 +302,6 @@ static int dsa_slave_port_obj_dump(struct net_device *dev, 
	case SWITCHDEV_OBJ_ID_PORT_MDB:

	case SWITCHDEV_OBJ_ID_PORT_MDB:

		err = dsa_port_mdb_dump(dp, SWITCHDEV_OBJ_PORT_MDB(obj), cb);

		err = dsa_port_mdb_dump(dp, SWITCHDEV_OBJ_PORT_MDB(obj), cb);

		break;

		break;

	case SWITCHDEV_OBJ_ID_PORT_VLAN:

		err = dsa_port_vlan_dump(dp, SWITCHDEV_OBJ_PORT_VLAN(obj), cb);

		break;

	default:

	default:

		err = -EOPNOTSUPP;

		err = -EOPNOTSUPP;

		break;

		break;
@@ -988,9 +985,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = { 
	.ndo_netpoll_cleanup	= dsa_slave_netpoll_cleanup,

	.ndo_netpoll_cleanup	= dsa_slave_netpoll_cleanup,

	.ndo_poll_controller	= dsa_slave_poll_controller,

	.ndo_poll_controller	= dsa_slave_poll_controller,

#endif

#endif

	.ndo_bridge_getlink	= switchdev_port_bridge_getlink,

	.ndo_bridge_setlink	= switchdev_port_bridge_setlink,

	.ndo_bridge_dellink	= switchdev_port_bridge_dellink,

	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,

	.ndo_get_phys_port_name	= dsa_slave_get_phys_port_name,

	.ndo_setup_tc		= dsa_slave_setup_tc,

	.ndo_setup_tc		= dsa_slave_setup_tc,

	.ndo_get_stats64	= dsa_slave_get_stats64,

	.ndo_get_stats64	= dsa_slave_get_stats64,