No longer used by drivers, as transaction queue with item destructors takes care of abort phase internally in switchdev code. So kill it.
Unified · Split
| @@ -19,7 +19,6 @@ · 18 unmodified lines | |||
| 19 | 19 | ||
| 20 | enum switchdev_trans_ph { | 20 | enum switchdev_trans_ph { |
| 21 | SWITCHDEV_TRANS_PREPARE, | 21 | SWITCHDEV_TRANS_PREPARE, |
| 22 | SWITCHDEV_TRANS_ABORT, | ||
| 23 | SWITCHDEV_TRANS_COMMIT, | 22 | SWITCHDEV_TRANS_COMMIT, |
| 24 | }; | 23 | }; |
| 25 | 24 | ||
| @@ -248,11 +248,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) · 247 unmodified lines | |||
| 248 | * released. | 248 | * released. |
| 249 | */ | 249 | */ |
| 250 | 250 | ||
| 251 | if (err != -EOPNOTSUPP) { | 251 | if (err != -EOPNOTSUPP) |
| 252 | trans.ph = SWITCHDEV_TRANS_ABORT; | ||
| 253 | __switchdev_port_attr_set(dev, attr, &trans); | ||
| 254 | switchdev_trans_items_destroy(&trans); | 252 | switchdev_trans_items_destroy(&trans); |
| 255 | } | ||
| 256 | 253 | ||
| 257 | return err; | 254 | return err; |
| 258 | } | 255 | } |
| @@ -334,11 +331,8 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) · 75 unmodified lines | |||
| 334 | * released. | 331 | * released. |
| 335 | */ | 332 | */ |
| 336 | 333 | ||
| 337 | if (err != -EOPNOTSUPP) { | 334 | if (err != -EOPNOTSUPP) |
| 338 | trans.ph = SWITCHDEV_TRANS_ABORT; | ||
| 339 | __switchdev_port_obj_add(dev, obj, &trans); | ||
| 340 | switchdev_trans_items_destroy(&trans); | 335 | switchdev_trans_items_destroy(&trans); |
| 341 | } | ||
| 342 | 336 | ||
| 343 | return err; | 337 | return err; |
| 344 | } | 338 | } |