Skip to content

Commit 71179ac

Browse files
Jiri Pirkokuba-moo
authored andcommitted
devlink: move devlink_notify_register/unregister() to dev.c
At last, move the last bits out of leftover.c, the devlink_notify_register/unregister() functions to dev.c Signed-off-by: Jiri Pirko <jiri@nvidia.com> Link: https://lore.kernel.org/r/20230828061657.300667-16-jiri@resnulli.us Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 29a390d commit 71179ac

4 files changed

Lines changed: 30 additions & 64 deletions

File tree

net/devlink/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
obj-y := leftover.o core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \
3+
obj-y := core.o netlink.o netlink_gen.o dev.o port.o sb.o dpipe.o \
44
resource.o param.o region.o health.o trap.o rate.o linecard.o

net/devlink/dev.c

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static int devlink_nl_fill(struct sk_buff *msg, struct devlink *devlink,
174174
return -EMSGSIZE;
175175
}
176176

177-
void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
177+
static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
178178
{
179179
struct sk_buff *msg;
180180
int err;
@@ -230,6 +230,32 @@ int devlink_nl_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb)
230230
return devlink_nl_dumpit(msg, cb, devlink_nl_get_dump_one);
231231
}
232232

233+
void devlink_notify_register(struct devlink *devlink)
234+
{
235+
devlink_notify(devlink, DEVLINK_CMD_NEW);
236+
devlink_linecards_notify_register(devlink);
237+
devlink_ports_notify_register(devlink);
238+
devlink_trap_policers_notify_register(devlink);
239+
devlink_trap_groups_notify_register(devlink);
240+
devlink_traps_notify_register(devlink);
241+
devlink_rates_notify_register(devlink);
242+
devlink_regions_notify_register(devlink);
243+
devlink_params_notify_register(devlink);
244+
}
245+
246+
void devlink_notify_unregister(struct devlink *devlink)
247+
{
248+
devlink_params_notify_unregister(devlink);
249+
devlink_regions_notify_unregister(devlink);
250+
devlink_rates_notify_unregister(devlink);
251+
devlink_traps_notify_unregister(devlink);
252+
devlink_trap_groups_notify_unregister(devlink);
253+
devlink_trap_policers_notify_unregister(devlink);
254+
devlink_ports_notify_unregister(devlink);
255+
devlink_linecards_notify_unregister(devlink);
256+
devlink_notify(devlink, DEVLINK_CMD_DEL);
257+
}
258+
233259
static void devlink_reload_failed_set(struct devlink *devlink,
234260
bool reload_failed)
235261
{

net/devlink/devl_internal.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ typedef int devlink_nl_dump_one_func_t(struct sk_buff *msg,
124124
struct devlink *
125125
devlink_get_from_attrs_lock(struct net *net, struct nlattr **attrs);
126126

127-
void devlink_notify_unregister(struct devlink *devlink);
128-
void devlink_notify_register(struct devlink *devlink);
129-
130127
int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb,
131128
devlink_nl_dump_one_func_t *dump_one);
132129

@@ -151,7 +148,8 @@ devlink_nl_put_handle(struct sk_buff *msg, struct devlink *devlink)
151148
int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);
152149

153150
/* Notify */
154-
void devlink_notify(struct devlink *devlink, enum devlink_command cmd);
151+
void devlink_notify_register(struct devlink *devlink);
152+
void devlink_notify_unregister(struct devlink *devlink);
155153
void devlink_ports_notify_register(struct devlink *devlink);
156154
void devlink_ports_notify_unregister(struct devlink *devlink);
157155
void devlink_params_notify_register(struct devlink *devlink);

net/devlink/leftover.c

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)