UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2015-09-24 10:02:47 +02:00 committed by David S. Miller
parent 2b8a61a6fd
commit 9f6467cf22
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/net/switchdev.h
View File

@ -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,
}; };

10
net/switchdev/switchdev.c
View File

@ -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)
* 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;
} }