switchdev: move transaction phase enum under transaction structure
Before it disappears completely, move transaction phase enum under
transaction structure and make attr/obj structures a bit cleaner.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 35e2967..d1c7d51 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -240,7 +240,7 @@
* but should not commit the attr.
*/
- attr->trans_ph = SWITCHDEV_TRANS_PREPARE;
+ trans.ph = SWITCHDEV_TRANS_PREPARE;
err = __switchdev_port_attr_set(dev, attr, &trans);
if (err) {
/* Prepare phase failed: abort the transaction. Any
@@ -249,7 +249,7 @@
*/
if (err != -EOPNOTSUPP) {
- attr->trans_ph = SWITCHDEV_TRANS_ABORT;
+ trans.ph = SWITCHDEV_TRANS_ABORT;
__switchdev_port_attr_set(dev, attr, &trans);
switchdev_trans_items_destroy(&trans);
}
@@ -262,7 +262,7 @@
* because the driver said everythings was OK in phase I.
*/
- attr->trans_ph = SWITCHDEV_TRANS_COMMIT;
+ trans.ph = SWITCHDEV_TRANS_COMMIT;
err = __switchdev_port_attr_set(dev, attr, &trans);
WARN(err, "%s: Commit of attribute (id=%d) failed.\n",
dev->name, attr->id);
@@ -326,7 +326,7 @@
* but should not commit the obj.
*/
- obj->trans_ph = SWITCHDEV_TRANS_PREPARE;
+ trans.ph = SWITCHDEV_TRANS_PREPARE;
err = __switchdev_port_obj_add(dev, obj, &trans);
if (err) {
/* Prepare phase failed: abort the transaction. Any
@@ -335,7 +335,7 @@
*/
if (err != -EOPNOTSUPP) {
- obj->trans_ph = SWITCHDEV_TRANS_ABORT;
+ trans.ph = SWITCHDEV_TRANS_ABORT;
__switchdev_port_obj_add(dev, obj, &trans);
switchdev_trans_items_destroy(&trans);
}
@@ -348,7 +348,7 @@
* because the driver said everythings was OK in phase I.
*/
- obj->trans_ph = SWITCHDEV_TRANS_COMMIT;
+ trans.ph = SWITCHDEV_TRANS_COMMIT;
err = __switchdev_port_obj_add(dev, obj, &trans);
WARN(err, "%s: Commit of object (id=%d) failed.\n", dev->name, obj->id);
switchdev_trans_items_warn_destroy(dev, &trans);