xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: dsa: remove port_fdb_getnext

Browse Source 
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 <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot
2015-10-22 09:34:43 -04:00
committed by David S. Miller
parent 2c49471b66
commit 1a49a2fbf8
2 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/dsa.h
View File

@@ -328,9 +328,6 @@ struct dsa_switch_driver {
struct switchdev_trans *trans); struct switchdev_trans *trans);
int (*port_fdb_del)(struct dsa_switch *ds, int port, int (*port_fdb_del)(struct dsa_switch *ds, int port,
const struct switchdev_obj_port_fdb *fdb); 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, int (*port_fdb_dump)(struct dsa_switch *ds, int port,
struct switchdev_obj_port_fdb *fdb, struct switchdev_obj_port_fdb *fdb,
int (*cb)(struct switchdev_obj *obj)); int (*cb)(struct switchdev_obj *obj));

23
net/dsa/slave.c
View File

@@ -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_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent; struct dsa_switch *ds = p->parent;
unsigned char addr[ETH_ALEN] = { 0 };
u16 vid = 0;
int ret;
if (ds->drv->port_fdb_dump) if (ds->drv->port_fdb_dump)
return ds->drv->port_fdb_dump(ds, p->port, fdb, cb); return ds->drv->port_fdb_dump(ds, p->port, fdb, cb);
if (!ds->drv->port_fdb_getnext)
return -EOPNOTSUPP; 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) static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)