diff options
author | Jiri Pirko <jiri@mellanox.com> | 2015-09-24 04:02:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-09-25 01:59:22 -0400 |
commit | 9f6467cf229a0e8a7580401b07de2a76e4c8618d (patch) | |
tree | bbe254dbd8442b7ac4c3e19cf1309cd83683cfcc /net/switchdev | |
parent | 2b8a61a6fd5fdd161ae16e4f76bfb09d6de95ddd (diff) |
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>
Diffstat (limited to 'net/switchdev')
-rw-r--r-- | net/switchdev/switchdev.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index d1c7d51620b1..1adeedade0fb 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c | |||
@@ -248,11 +248,8 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) | |||
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) | |||
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 | } |