[patch net-next v3 08/10] switchdev: remove "ABORT" transaction phase

[Jiri Pirko]

From: Jiri Pirko <j...@mellanox.com>

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 <j...@mellanox.com>
---
 include/net/switchdev.h   |  1 -
 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 f61ee38..9cf372f 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 d1c7d51..1adeeda 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;
        }
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html