Commit ba0f66c9 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

devlink: rename devlink_nl_ops to devlink_nl_small_ops 



In order to avoid name collision with the generated split ops array
which is going to be introduced as a follow-up patch, rename
the existing ops array to devlink_nl_small_ops.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20230803111340.1074067-6-jiri@resnulli.us


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fa8ba350

net/devlink/devl_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct devlink_cmd { 
			struct netlink_callback *cb);

};



extern const struct genl_small_ops devlink_nl_ops[56];

extern const struct genl_small_ops devlink_nl_small_ops[56];



struct devlink *

devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);

net/devlink/leftover.c

+1 −1
Original line number Diff line number Diff line
@@ -6278,7 +6278,7 @@ static int devlink_nl_cmd_trap_policer_set_doit(struct sk_buff *skb, 
	return devlink_trap_policer_set(devlink, policer_item, info);

}



const struct genl_small_ops devlink_nl_ops[56] = {

const struct genl_small_ops devlink_nl_small_ops[56] = {

	{

		.cmd = DEVLINK_CMD_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

net/devlink/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ struct genl_family devlink_nl_family __ro_after_init = { 
	.pre_doit	= devlink_nl_pre_doit,

	.post_doit	= devlink_nl_post_doit,

	.module		= THIS_MODULE,

	.small_ops	= devlink_nl_ops,

	.n_small_ops	= ARRAY_SIZE(devlink_nl_ops),

	.small_ops	= devlink_nl_small_ops,

	.n_small_ops	= ARRAY_SIZE(devlink_nl_small_ops),

	.resv_start_op	= DEVLINK_CMD_SELFTESTS_RUN + 1,

	.mcgrps		= devlink_nl_mcgrps,

	.n_mcgrps	= ARRAY_SIZE(devlink_nl_mcgrps),