diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-21 07:57:44 +0200 |
| commit | f6a74a5e15df32f289837feeabf8c84829312b06 (patch) | |
| tree | c8d16b12ef76c7a9e21693d1bad31f59f78436cd /net/switchdev/switchdev.c | |
| parent | 60cd37eb100c4880b28078a47f3062fac7572095 (diff) | |
| parent | 9d634c410b07be7bf637ea03362d3ff132088fe3 (diff) | |
| download | linux-next-f6a74a5e15df32f289837feeabf8c84829312b06.tar.gz linux-next-f6a74a5e15df32f289837feeabf8c84829312b06.zip | |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/switchdev/switchdev.c')
| -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 84f77a054025..9f2add3cba26 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; } |