diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-02 21:18:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-02 21:18:57 -0500 |
| commit | 5420683ae3d2b986f04efa99a7afd2d57e092004 (patch) | |
| tree | 934469e8b3fe39d8d5e6c743384ccb1d8a9788a7 /include/net/dsa.h | |
| parent | 183dea5818315c0a172d21ecbcd2554894bf01e3 (diff) | |
| parent | e6db98db8a9595f8001958e489ff07ed97a15a54 (diff) | |
| download | linux-5420683ae3d2b986f04efa99a7afd2d57e092004.tar.gz linux-5420683ae3d2b986f04efa99a7afd2d57e092004.tar.bz2 linux-5420683ae3d2b986f04efa99a7afd2d57e092004.zip | |
Merge branch 'dsa-simplify-switchdev-prepare-phase'
Vivien Didelot says:
====================
net: dsa: simplify switchdev prepare phase
This patch series brings no functional changes.
It removes the unused switchdev_trans arguments from the dsa_switch_ops
for both MDB and VLAN operations, and provides functions to prepare and
add these objects for a given bitmap of ports.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dsa.h')
| -rw-r--r-- | include/net/dsa.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 2a05738570d8..6700dff46a80 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -412,12 +412,10 @@ struct dsa_switch_ops { */ int (*port_vlan_filtering)(struct dsa_switch *ds, int port, bool vlan_filtering); - int (*port_vlan_prepare)(struct dsa_switch *ds, int port, - const struct switchdev_obj_port_vlan *vlan, - struct switchdev_trans *trans); - void (*port_vlan_add)(struct dsa_switch *ds, int port, - const struct switchdev_obj_port_vlan *vlan, - struct switchdev_trans *trans); + int (*port_vlan_prepare)(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_vlan *vlan); + void (*port_vlan_add)(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_vlan *vlan); int (*port_vlan_del)(struct dsa_switch *ds, int port, const struct switchdev_obj_port_vlan *vlan); /* @@ -433,12 +431,10 @@ struct dsa_switch_ops { /* * Multicast database */ - int (*port_mdb_prepare)(struct dsa_switch *ds, int port, - const struct switchdev_obj_port_mdb *mdb, - struct switchdev_trans *trans); - void (*port_mdb_add)(struct dsa_switch *ds, int port, - const struct switchdev_obj_port_mdb *mdb, - struct switchdev_trans *trans); + int (*port_mdb_prepare)(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb); + void (*port_mdb_add)(struct dsa_switch *ds, int port, + const struct switchdev_obj_port_mdb *mdb); int (*port_mdb_del)(struct dsa_switch *ds, int port, const struct switchdev_obj_port_mdb *mdb); /* |