aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2017-02-09 15:54:35 +0100
committerDavid S. Miller <davem@davemloft.net>2017-02-10 14:43:00 -0500
commit1a6aa36b6f92b1a2f2e6789f6785372d4d6ddca9 (patch)
treec1b423beb7e86b1567ec6e637a91f4719dfc4aef
parentdevlink: rename devlink_eswitch_fill to devlink_nl_eswitch_fill (diff)
downloadlinux-dev-1a6aa36b6f92b1a2f2e6789f6785372d4d6ddca9.tar.xz
linux-dev-1a6aa36b6f92b1a2f2e6789f6785372d4d6ddca9.zip
devlink: use nla_put_failure goto label instead of out
Be aligned with the rest of the code and use label named nla_put_failure. Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/devlink.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c
index f36192406f9a..7f88cc879d43 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1408,29 +1408,29 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink,
err = devlink_nl_put_handle(msg, devlink);
if (err)
- goto out;
+ goto nla_put_failure;
err = ops->eswitch_mode_get(devlink, &mode);
if (err)
- goto out;
+ goto nla_put_failure;
err = nla_put_u16(msg, DEVLINK_ATTR_ESWITCH_MODE, mode);
if (err)
- goto out;
+ goto nla_put_failure;
if (ops->eswitch_inline_mode_get) {
err = ops->eswitch_inline_mode_get(devlink, &inline_mode);
if (err)
- goto out;
+ goto nla_put_failure;
err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_INLINE_MODE,
inline_mode);
if (err)
- goto out;
+ goto nla_put_failure;
}
genlmsg_end(msg, hdr);
return 0;
-out:
+nla_put_failure:
genlmsg_cancel(msg, hdr);
return err;
}