diff options
| author | Jiri Pirko <jiri@mellanox.com> | 2015-09-24 10:02:47 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-24 22:59:22 -0700 |
| commit | 9f6467cf229a0e8a7580401b07de2a76e4c8618d (patch) | |
| tree | bbe254dbd8442b7ac4c3e19cf1309cd83683cfcc | |
| parent | 2b8a61a6fd5fdd161ae16e4f76bfb09d6de95ddd (diff) | |
| download | linux-9f6467cf229a0e8a7580401b07de2a76e4c8618d.tar.bz2 | |
switchdev: remove "ABORT" transaction phase
No longer used by drivers, as transaction queue with item destructors
takes care of abort phase internally in switchdev code. So kill it.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/switchdev.h | 1 | ||||
| -rw-r--r-- | net/switchdev/switchdev.c | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/include/net/switchdev.h b/include/net/switchdev.h index f61ee38c7c96..9cf372fe1365 100644 --- a/include/net/switchdev.h +++ b/include/net/switchdev.h @@ -19,7 +19,6 @@ enum switchdev_trans_ph { SWITCHDEV_TRANS_PREPARE, - SWITCHDEV_TRANS_ABORT, SWITCHDEV_TRANS_COMMIT, }; diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index d1c7d51620b1..1adeedade0fb 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -248,11 +248,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) * released. */ - if (err != -EOPNOTSUPP) { - trans.ph = SWITCHDEV_TRANS_ABORT; - __switchdev_port_attr_set(dev, attr, &trans); + if (err != -EOPNOTSUPP) switchdev_trans_items_destroy(&trans); - } return err; } @@ -334,11 +331,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) * released. */ - if (err != -EOPNOTSUPP) { - trans.ph = SWITCHDEV_TRANS_ABORT; - __switchdev_port_obj_add(dev, obj, &trans); + if (err != -EOPNOTSUPP) switchdev_trans_items_destroy(&trans); - } return err; } |