Commit 3a9afea3 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: move MDB handlers 



Move the DSA port code which handles MDB objects in port.c, where it
belongs.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1cffff0

net/dsa/dsa_priv.h

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,13 @@ int dsa_port_fdb_del(struct dsa_port *dp, 
		     const struct switchdev_obj_port_fdb *fdb);

int dsa_port_fdb_dump(struct dsa_port *dp, struct switchdev_obj_port_fdb *fdb,

		      switchdev_obj_dump_cb_t *cb);

int dsa_port_mdb_add(struct dsa_port *dp,

		     const struct switchdev_obj_port_mdb *mdb,

		     struct switchdev_trans *trans);

int dsa_port_mdb_del(struct dsa_port *dp,

		     const struct switchdev_obj_port_mdb *mdb);

int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,

		      switchdev_obj_dump_cb_t *cb);



/* slave.c */

extern const struct dsa_device_ops notag_netdev_ops;

net/dsa/port.c

+40 −0
Original line number Diff line number Diff line
@@ -207,3 +207,43 @@ int dsa_port_fdb_dump(struct dsa_port *dp, struct switchdev_obj_port_fdb *fdb, 


	return -EOPNOTSUPP;

}



int dsa_port_mdb_add(struct dsa_port *dp,

		     const struct switchdev_obj_port_mdb *mdb,

		     struct switchdev_trans *trans)

{

	struct dsa_switch *ds = dp->ds;



	if (switchdev_trans_ph_prepare(trans)) {

		if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)

			return -EOPNOTSUPP;



		return ds->ops->port_mdb_prepare(ds, dp->index, mdb, trans);

	}



	ds->ops->port_mdb_add(ds, dp->index, mdb, trans);



	return 0;

}



int dsa_port_mdb_del(struct dsa_port *dp,

		     const struct switchdev_obj_port_mdb *mdb)

{

	struct dsa_switch *ds = dp->ds;



	if (ds->ops->port_mdb_del)

		return ds->ops->port_mdb_del(ds, dp->index, mdb);



	return -EOPNOTSUPP;

}



int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,

		      switchdev_obj_dump_cb_t *cb)

{

	struct dsa_switch *ds = dp->ds;



	if (ds->ops->port_mdb_dump)

		return ds->ops->port_mdb_dump(ds, dp->index, mdb, cb);



	return -EOPNOTSUPP;

}

net/dsa/slave.c

+0 −41
Original line number Diff line number Diff line
@@ -245,47 +245,6 @@ static int dsa_port_vlan_dump(struct dsa_port *dp, 
	return -EOPNOTSUPP;

}



static int dsa_port_mdb_add(struct dsa_port *dp,

			    const struct switchdev_obj_port_mdb *mdb,

			    struct switchdev_trans *trans)

{

	struct dsa_switch *ds = dp->ds;



	if (switchdev_trans_ph_prepare(trans)) {

		if (!ds->ops->port_mdb_prepare || !ds->ops->port_mdb_add)

			return -EOPNOTSUPP;



		return ds->ops->port_mdb_prepare(ds, dp->index, mdb, trans);

	}



	ds->ops->port_mdb_add(ds, dp->index, mdb, trans);



	return 0;

}



static int dsa_port_mdb_del(struct dsa_port *dp,

			    const struct switchdev_obj_port_mdb *mdb)

{

	struct dsa_switch *ds = dp->ds;



	if (ds->ops->port_mdb_del)

		return ds->ops->port_mdb_del(ds, dp->index, mdb);



	return -EOPNOTSUPP;

}



static int dsa_port_mdb_dump(struct dsa_port *dp,

			     struct switchdev_obj_port_mdb *mdb,

			     switchdev_obj_dump_cb_t *cb)

{

	struct dsa_switch *ds = dp->ds;



	if (ds->ops->port_mdb_dump)

		return ds->ops->port_mdb_dump(ds, dp->index, mdb, cb);



	return -EOPNOTSUPP;

}



static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)

{

	struct dsa_slave_priv *p = netdev_priv(dev);