@@ -19,7 +19,6 @@
enum switchdev_trans_ph {
SWITCHDEV_TRANS_PREPARE,
- SWITCHDEV_TRANS_ABORT,
SWITCHDEV_TRANS_COMMIT,
};
@@ -240,11 +240,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;
}
@@ -326,11 +323,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;
}