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

net: dsa: drop vlan_getnext

Browse Source 
The VLAN GetNext operation is specific to some switches, and thus can be
complicated to implement for some drivers.

Remove the support for the vlan_getnext/port_pvid_get approach in favor
of the generic and simpler port_vlan_dump function.

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
2016-02-23 12:13:56 -05:00
committed by David S. Miller
parent ceff5eff3a
commit 477b184526
3 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
net/dsa/slave.c
View File

@@ -243,44 +243,11 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev,
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
DECLARE_BITMAP(members, DSA_MAX_PORTS);
DECLARE_BITMAP(untagged, DSA_MAX_PORTS);
u16 pvid, vid = 0;
int err;
if (ds->drv->port_vlan_dump)
return ds->drv->port_vlan_dump(ds, p->port, vlan, cb);
if (!ds->drv->vlan_getnext || !ds->drv->port_pvid_get)
return -EOPNOTSUPP;
err = ds->drv->port_pvid_get(ds, p->port, &pvid);
if (err)
return err;
for (;;) {
err = ds->drv->vlan_getnext(ds, &vid, members, untagged);
if (err)
break;
if (!test_bit(p->port, members))
continue;
memset(vlan, 0, sizeof(*vlan));
vlan->vid_begin = vlan->vid_end = vid;
if (vid == pvid)
vlan->flags |= BRIDGE_VLAN_INFO_PVID;
if (test_bit(p->port, untagged))
vlan->flags |= BRIDGE_VLAN_INFO_UNTAGGED;
err = cb(&vlan->obj);
if (err)
break;
}
return err == -ENOENT ? 0 : err;
return -EOPNOTSUPP;
}
static int dsa_slave_port_fdb_add(struct net_device *dev,