Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/net/switchdev.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


enum switchdev_trans_ph {

	SWITCHDEV_TRANS_PREPARE,

	SWITCHDEV_TRANS_ABORT,

	SWITCHDEV_TRANS_COMMIT,

};

net/switchdev/switchdev.c

+2 −8
Original line number Diff line number Diff line
@@ -248,11 +248,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;

	}
@@ -334,11 +331,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;

	}