Skip to content

Commit 5648de0

Browse files
Jiri PirkoPaolo Abeni
authored andcommitted
devlink: introduce a helper for netlink multicast send
Introduce a helper devlink_nl_notify_send() so each object notification function does not have to call genlmsg_multicast_netns() with the same arguments. Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent cddbff4 commit 5648de0

File tree

9 files changed

+18
-22
lines changed

9 files changed

+18
-22
lines changed

net/devlink/dev.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
217217
return;
218218
}
219219

220-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
221-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
220+
devlink_nl_notify_send(devlink, msg);
222221
}
223222

224223
int devlink_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
@@ -1013,8 +1012,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
10131012
if (err)
10141013
goto out_free_msg;
10151014

1016-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
1017-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
1015+
devlink_nl_notify_send(devlink, msg);
10181016
return;
10191017

10201018
out_free_msg:

net/devlink/devl_internal.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,13 @@ static inline bool devlink_nl_notify_need(struct devlink *devlink)
191191
DEVLINK_MCGRP_CONFIG);
192192
}
193193

194+
static inline void devlink_nl_notify_send(struct devlink *devlink,
195+
struct sk_buff *msg)
196+
{
197+
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
198+
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
199+
}
200+
194201
/* Notify */
195202
void devlink_notify_register(struct devlink *devlink);
196203
void devlink_notify_unregister(struct devlink *devlink);

net/devlink/health.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +509,7 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
509509
return;
510510
}
511511

512-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
513-
0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
512+
devlink_nl_notify_send(devlink, msg);
514513
}
515514

516515
void

net/devlink/linecard.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
150150
return;
151151
}
152152

153-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
154-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
153+
devlink_nl_notify_send(devlink, msg);
155154
}
156155

157156
void devlink_linecards_notify_register(struct devlink *devlink)

net/devlink/param.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@ static void devlink_param_notify(struct devlink *devlink,
356356
return;
357357
}
358358

359-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
360-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
359+
devlink_nl_notify_send(devlink, msg);
361360
}
362361

363362
static void devlink_params_notify(struct devlink *devlink,

net/devlink/port.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
525525
return;
526526
}
527527

528-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
529-
0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
528+
devlink_nl_notify_send(devlink, msg);
530529
}
531530

532531
static void devlink_ports_notify(struct devlink *devlink,

net/devlink/rate.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
159159
return;
160160
}
161161

162-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
163-
0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
162+
devlink_nl_notify_send(devlink, msg);
164163
}
165164

166165
void devlink_rates_notify_register(struct devlink *devlink)

net/devlink/region.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ static void devlink_nl_region_notify(struct devlink_region *region,
242242
if (IS_ERR(msg))
243243
return;
244244

245-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
246-
0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
245+
devlink_nl_notify_send(devlink, msg);
247246
}
248247

249248
void devlink_regions_notify_register(struct devlink *devlink)

net/devlink/trap.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,7 @@ devlink_trap_group_notify(struct devlink *devlink,
11881188
return;
11891189
}
11901190

1191-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
1192-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
1191+
devlink_nl_notify_send(devlink, msg);
11931192
}
11941193

11951194
void devlink_trap_groups_notify_register(struct devlink *devlink)
@@ -1249,8 +1248,7 @@ static void devlink_trap_notify(struct devlink *devlink,
12491248
return;
12501249
}
12511250

1252-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
1253-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
1251+
devlink_nl_notify_send(devlink, msg);
12541252
}
12551253

12561254
void devlink_traps_notify_register(struct devlink *devlink)
@@ -1727,8 +1725,7 @@ devlink_trap_policer_notify(struct devlink *devlink,
17271725
return;
17281726
}
17291727

1730-
genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
1731-
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
1728+
devlink_nl_notify_send(devlink, msg);
17321729
}
17331730

17341731
void devlink_trap_policers_notify_register(struct devlink *devlink)

0 commit comments

Comments
 (0)