diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-07-10 19:48:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-11 21:29:55 -0700 |
| commit | 2ee94014d9bd3868b1c0d17405f96d63bec83f28 (patch) | |
| tree | c3de5eb5e5eac625aab00c7bb23b885b6b6eb244 /net | |
| parent | c590032f9ab8d03aab235a7601db22a267c2d958 (diff) | |
| download | op-kernel-dev-2ee94014d9bd3868b1c0d17405f96d63bec83f28.zip op-kernel-dev-2ee94014d9bd3868b1c0d17405f96d63bec83f28.tar.gz | |
net: switchdev: don't abort unsupported operations
There is no need to abort attribute setting or object addition, if the
prepare phase returned operation not supported.
Thus, abort these two transactions only if the error is not -EOPNOTSUPP.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Scott Feldman <sfeldma@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/switchdev/switchdev.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 84f77a0..9f2add3 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -171,8 +171,10 @@ int switchdev_port_attr_set(struct net_device *dev, struct switchdev_attr *attr) * released. */ - attr->trans = SWITCHDEV_TRANS_ABORT; - __switchdev_port_attr_set(dev, attr); + if (err != -EOPNOTSUPP) { + attr->trans = SWITCHDEV_TRANS_ABORT; + __switchdev_port_attr_set(dev, attr); + } return err; } @@ -249,8 +251,10 @@ int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj) * released. */ - obj->trans = SWITCHDEV_TRANS_ABORT; - __switchdev_port_obj_add(dev, obj); + if (err != -EOPNOTSUPP) { + obj->trans = SWITCHDEV_TRANS_ABORT; + __switchdev_port_obj_add(dev, obj); + } return err; } |
