diff options
Diffstat (limited to 'net/nfc/netlink.c')
-rw-r--r-- | net/nfc/netlink.c | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index fe6760d328a0..3092df313fb1 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c | |||
@@ -194,7 +194,8 @@ int nfc_genl_targets_found(struct nfc_dev *dev) | |||
194 | 194 | ||
195 | genlmsg_end(msg, hdr); | 195 | genlmsg_end(msg, hdr); |
196 | 196 | ||
197 | return genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC); | 197 | return genlmsg_multicast(&nfc_genl_family, msg, 0, |
198 | nfc_genl_event_mcgrp.id, GFP_ATOMIC); | ||
198 | 199 | ||
199 | nla_put_failure: | 200 | nla_put_failure: |
200 | genlmsg_cancel(msg, hdr); | 201 | genlmsg_cancel(msg, hdr); |
@@ -223,7 +224,8 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx) | |||
223 | 224 | ||
224 | genlmsg_end(msg, hdr); | 225 | genlmsg_end(msg, hdr); |
225 | 226 | ||
226 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 227 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
228 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
227 | 229 | ||
228 | return 0; | 230 | return 0; |
229 | 231 | ||
@@ -255,7 +257,8 @@ int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol) | |||
255 | 257 | ||
256 | genlmsg_end(msg, hdr); | 258 | genlmsg_end(msg, hdr); |
257 | 259 | ||
258 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 260 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
261 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
259 | 262 | ||
260 | return 0; | 263 | return 0; |
261 | 264 | ||
@@ -285,7 +288,8 @@ int nfc_genl_tm_deactivated(struct nfc_dev *dev) | |||
285 | 288 | ||
286 | genlmsg_end(msg, hdr); | 289 | genlmsg_end(msg, hdr); |
287 | 290 | ||
288 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 291 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
292 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
289 | 293 | ||
290 | return 0; | 294 | return 0; |
291 | 295 | ||
@@ -318,7 +322,8 @@ int nfc_genl_device_added(struct nfc_dev *dev) | |||
318 | 322 | ||
319 | genlmsg_end(msg, hdr); | 323 | genlmsg_end(msg, hdr); |
320 | 324 | ||
321 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 325 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
326 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
322 | 327 | ||
323 | return 0; | 328 | return 0; |
324 | 329 | ||
@@ -348,7 +353,8 @@ int nfc_genl_device_removed(struct nfc_dev *dev) | |||
348 | 353 | ||
349 | genlmsg_end(msg, hdr); | 354 | genlmsg_end(msg, hdr); |
350 | 355 | ||
351 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 356 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
357 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
352 | 358 | ||
353 | return 0; | 359 | return 0; |
354 | 360 | ||
@@ -414,7 +420,8 @@ int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list) | |||
414 | 420 | ||
415 | genlmsg_end(msg, hdr); | 421 | genlmsg_end(msg, hdr); |
416 | 422 | ||
417 | return genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC); | 423 | return genlmsg_multicast(&nfc_genl_family, msg, 0, |
424 | nfc_genl_event_mcgrp.id, GFP_ATOMIC); | ||
418 | 425 | ||
419 | nla_put_failure: | 426 | nla_put_failure: |
420 | genlmsg_cancel(msg, hdr); | 427 | genlmsg_cancel(msg, hdr); |
@@ -448,7 +455,8 @@ int nfc_genl_se_added(struct nfc_dev *dev, u32 se_idx, u16 type) | |||
448 | 455 | ||
449 | genlmsg_end(msg, hdr); | 456 | genlmsg_end(msg, hdr); |
450 | 457 | ||
451 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 458 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
459 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
452 | 460 | ||
453 | return 0; | 461 | return 0; |
454 | 462 | ||
@@ -479,7 +487,8 @@ int nfc_genl_se_removed(struct nfc_dev *dev, u32 se_idx) | |||
479 | 487 | ||
480 | genlmsg_end(msg, hdr); | 488 | genlmsg_end(msg, hdr); |
481 | 489 | ||
482 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 490 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
491 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
483 | 492 | ||
484 | return 0; | 493 | return 0; |
485 | 494 | ||
@@ -600,7 +609,8 @@ int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx, | |||
600 | 609 | ||
601 | dev->dep_link_up = true; | 610 | dev->dep_link_up = true; |
602 | 611 | ||
603 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC); | 612 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
613 | nfc_genl_event_mcgrp.id, GFP_ATOMIC); | ||
604 | 614 | ||
605 | return 0; | 615 | return 0; |
606 | 616 | ||
@@ -632,7 +642,8 @@ int nfc_genl_dep_link_down_event(struct nfc_dev *dev) | |||
632 | 642 | ||
633 | genlmsg_end(msg, hdr); | 643 | genlmsg_end(msg, hdr); |
634 | 644 | ||
635 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_ATOMIC); | 645 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
646 | nfc_genl_event_mcgrp.id, GFP_ATOMIC); | ||
636 | 647 | ||
637 | return 0; | 648 | return 0; |
638 | 649 | ||
@@ -1137,7 +1148,8 @@ int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name, | |||
1137 | 1148 | ||
1138 | genlmsg_end(msg, hdr); | 1149 | genlmsg_end(msg, hdr); |
1139 | 1150 | ||
1140 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 1151 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
1152 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
1141 | 1153 | ||
1142 | return 0; | 1154 | return 0; |
1143 | 1155 | ||
@@ -1308,7 +1320,8 @@ static void se_io_cb(void *context, u8 *apdu, size_t apdu_len, int err) | |||
1308 | 1320 | ||
1309 | genlmsg_end(msg, hdr); | 1321 | genlmsg_end(msg, hdr); |
1310 | 1322 | ||
1311 | genlmsg_multicast(msg, 0, nfc_genl_event_mcgrp.id, GFP_KERNEL); | 1323 | genlmsg_multicast(&nfc_genl_family, msg, 0, |
1324 | nfc_genl_event_mcgrp.id, GFP_KERNEL); | ||
1312 | 1325 | ||
1313 | kfree(ctx); | 1326 | kfree(ctx); |
1314 | 1327 | ||