| Message ID | 1436572138-16542-1-git-send-email-vivien.didelot@savoirfairelinux.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Sat, Jul 11, 2015 at 01:48:58AM CEST, vivien.didelot@savoirfairelinux.com wrote: >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> Sounds reasonable. Acked-by: Jiri Pirko <jiri@resnulli.us> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Jul 10, 2015 at 4:48 PM, Vivien Didelot <vivien.didelot@savoirfairelinux.com> wrote: > 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: Scott Feldman <sfeldma@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Date: Fri, 10 Jul 2015 19:48:58 -0400 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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> --- net/switchdev/switchdev.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)