From: Vivien Didelot Date: Thu, 22 Oct 2015 13:34:43 +0000 (-0400) Subject: net: dsa: remove port_fdb_getnext X-Git-Tag: MMI-PSA29.97-13-9~9125^2~84^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1a49a2fbf8c15d63a0b5e60d935ec7d5d3d07fd5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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: Vivien Didelot Signed-off-by: David S. Miller --- diff --git a/include/net/dsa.h b/include/net/dsa.h index 0cfa44af8fd2..98ccbdef646f 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -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)); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index d76e62b8dc9c..481754ee062a 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -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; + return -EOPNOTSUPP; } static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)