aboutsummaryrefslogtreecommitdiff
path: root/net/devlink
diff options
context:
space:
mode:
authorGravatar Jiri Pirko <jiri@nvidia.com> 2023-09-13 09:12:37 +0200
committerGravatar David S. Miller <davem@davemloft.net> 2023-09-17 14:01:46 +0100
commit1c2197c47a93d0ea36e73e437271c7cbcc0e1ceb (patch)
treea0fd58ed81891d65eef1abea1c4b9da4845c6daa /net/devlink
parentdevlink: move devlink_nl_put_nested_handle() into netlink.c (diff)
downloadlinux-1c2197c47a93d0ea36e73e437271c7cbcc0e1ceb.tar.gz
linux-1c2197c47a93d0ea36e73e437271c7cbcc0e1ceb.tar.bz2
linux-1c2197c47a93d0ea36e73e437271c7cbcc0e1ceb.zip
devlink: extend devlink_nl_put_nested_handle() with attrtype arg
As the next patch is going to call this helper with need to fill another type of nested attribute, pass it over function arg. Signed-off-by: Jiri Pirko <jiri@nvidia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/devlink')
-rw-r--r--net/devlink/devl_internal.h2
-rw-r--r--net/devlink/linecard.c3
-rw-r--r--net/devlink/netlink.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index fbf00de1accf..53449dbd6545 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -146,7 +146,7 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
}
int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,
- struct devlink *devlink);
+ struct devlink *devlink, int attrtype);
int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);
/* Notify */
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 688e89daee6a..36170f466878 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -114,7 +114,8 @@ static int devlink_nl_linecard_fill(struct sk_buff *msg,
if (linecard->nested_devlink &&
devlink_nl_put_nested_handle(msg, devlink_net(devlink),
- linecard->nested_devlink))
+ linecard->nested_devlink,
+ DEVLINK_ATTR_NESTED_DEVLINK))
goto nla_put_failure;
genlmsg_end(msg, hdr);
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 48b5cfc2842f..499304d9de49 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -83,11 +83,11 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
};
int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,
- struct devlink *devlink)
+ struct devlink *devlink, int attrtype)
{
struct nlattr *nested_attr;
- nested_attr = nla_nest_start(msg, DEVLINK_ATTR_NESTED_DEVLINK);
+ nested_attr = nla_nest_start(msg, attrtype);
if (!nested_attr)
return -EMSGSIZE;
if (devlink_nl_put_handle(msg, devlink))