Commit 9f6467cf authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

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: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b8a61a6
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
enum switchdev_trans_ph { enum switchdev_trans_ph {
SWITCHDEV_TRANS_PREPARE, SWITCHDEV_TRANS_PREPARE,
SWITCHDEV_TRANS_ABORT,
SWITCHDEV_TRANS_COMMIT, SWITCHDEV_TRANS_COMMIT,
}; };
......
...@@ -248,11 +248,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) ...@@ -248,11 +248,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr)
* released. * released.
*/ */
if (err != -EOPNOTSUPP) { if (err != -EOPNOTSUPP)
trans.ph = SWITCHDEV_TRANS_ABORT;
__switchdev_port_attr_set(dev, attr, &trans);
switchdev_trans_items_destroy(&trans); switchdev_trans_items_destroy(&trans);
}
return err; return err;
} }
...@@ -334,11 +331,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) ...@@ -334,11 +331,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj)
* released. * released.
*/ */
if (err != -EOPNOTSUPP) { if (err != -EOPNOTSUPP)
trans.ph = SWITCHDEV_TRANS_ABORT;
__switchdev_port_obj_add(dev, obj, &trans);
switchdev_trans_items_destroy(&trans); switchdev_trans_items_destroy(&trans);
}
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment