diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2016-02-23 20:13:54 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-25 23:20:20 +0300 |
| commit | 65aebfc002abc1827ac7c8644a2bba0459ce3ce2 (patch) | |
| tree | 60a6298a94bbee916fd1853059b4dff31be40596 | |
| parent | 2a04c7baded1cb2717ef8d02759e2ce13ae28602 (diff) | |
| download | linux-65aebfc002abc1827ac7c8644a2bba0459ce3ce2.tar.xz | |
net: dsa: add port_vlan_dump routine
Similar to port_fdb_dump, add a port_vlan_dump function to DSA drivers
which gets passed the switchdev VLAN object and callback.
This function, if implemented, takes precedence over the soon legacy
vlan_getnext/port_pvid_get approach.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | Documentation/networking/dsa/dsa.txt | 4 | ||||
| -rw-r--r-- | include/net/dsa.h | 3 | ||||
| -rw-r--r-- | net/dsa/slave.c | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/networking/dsa/dsa.txt b/Documentation/networking/dsa/dsa.txt index ebf21530471f..350a502e031f 100644 --- a/Documentation/networking/dsa/dsa.txt +++ b/Documentation/networking/dsa/dsa.txt @@ -554,6 +554,10 @@ Bridge VLAN filtering - port_vlan_del: bridge layer function invoked when a VLAN is removed from the given switch port +- port_vlan_dump: bridge layer function invoked with a switchdev callback + function that the driver has to call for each VLAN the given port is a member + of. A switchdev object is used to carry the VID and bridge flags. + - vlan_getnext: bridge layer function invoked to query the next configured VLAN in the switch, i.e. returns the bitmaps of members and untagged ports diff --git a/include/net/dsa.h b/include/net/dsa.h index 1c845d7bf0b2..ebc0d9ea96a1 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -313,6 +313,9 @@ struct dsa_switch_driver { struct switchdev_trans *trans); int (*port_vlan_del)(struct dsa_switch *ds, int port, const struct switchdev_obj_port_vlan *vlan); + int (*port_vlan_dump)(struct dsa_switch *ds, int port, + struct switchdev_obj_port_vlan *vlan, + int (*cb)(struct switchdev_obj *obj)); int (*port_pvid_get)(struct dsa_switch *ds, int port, u16 *pvid); int (*vlan_getnext)(struct dsa_switch *ds, u16 *vid, unsigned long *ports, unsigned long *untagged); diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 14ca9784ec0c..a9cbb72fb155 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -248,6 +248,9 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev, 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; |