Commit 1a49a2fb authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: remove port_fdb_getnext 



No driver implements port_fdb_getnext anymore, and port_fdb_dump is
preferred anyway, so remove this function from DSA.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c49471b

include/net/dsa.h

+0 −3
Original line number Diff line number Diff line
@@ -328,9 +328,6 @@ struct dsa_switch_driver { 
				struct switchdev_trans *trans);

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

				const struct switchdev_obj_port_fdb *fdb);

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

				    unsigned char *addr, u16 *vid,

				    bool *is_static);

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

				 struct switchdev_obj_port_fdb *fdb,

				 int (*cb)(struct switchdev_obj *obj));

net/dsa/slave.c

+1 −24
Original line number Diff line number Diff line
@@ -378,34 +378,11 @@ static int dsa_slave_port_fdb_dump(struct net_device *dev, 
{

	struct dsa_slave_priv *p = netdev_priv(dev);

	struct dsa_switch *ds = p->parent;

	unsigned char addr[ETH_ALEN] = { 0 };

	u16 vid = 0;

	int ret;



	if (ds->drv->port_fdb_dump)

		return ds->drv->port_fdb_dump(ds, p->port, fdb, cb);



	if (!ds->drv->port_fdb_getnext)

	return -EOPNOTSUPP;



	for (;;) {

		bool is_static;



		ret = ds->drv->port_fdb_getnext(ds, p->port, addr, &vid,

						&is_static);

		if (ret < 0)

			break;



		ether_addr_copy(fdb->addr, addr);

		fdb->vid = vid;

		fdb->ndm_state = is_static ? NUD_NOARP : NUD_REACHABLE;



		ret = cb(&fdb->obj);

		if (ret < 0)

			break;

	}



	return ret == -ENOENT ? 0 : ret;

}



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