summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorYueHaibing <yuehaibing@huawei.com>2018-05-26 07:15:48 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-29 09:53:38 -0400
commitc1c9a3c9663b2e15176758626278792862f1ed32 (patch)
treea227c72136a62865d12af106a354c3bb522adb16 /net/nfc
parent77ab8d5d2950cd0e18ba943336c1172b46e9f53e (diff)
net: remove unnecessary genlmsg_cancel() calls
the message be freed immediately, no need to trim it back to the previous size. Inspired by commit 7a9b3ec1e19f ("nl80211: remove unnecessary genlmsg_cancel() calls") Signed-off-by: YueHaibing <yuehaibing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/netlink.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index f018eafc2a0d..376181cc1def 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -206,7 +206,6 @@ int nfc_genl_targets_found(struct nfc_dev *dev)
206 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC); 206 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
207 207
208nla_put_failure: 208nla_put_failure:
209 genlmsg_cancel(msg, hdr);
210free_msg: 209free_msg:
211 nlmsg_free(msg); 210 nlmsg_free(msg);
212 return -EMSGSIZE; 211 return -EMSGSIZE;
@@ -237,7 +236,6 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
237 return 0; 236 return 0;
238 237
239nla_put_failure: 238nla_put_failure:
240 genlmsg_cancel(msg, hdr);
241free_msg: 239free_msg:
242 nlmsg_free(msg); 240 nlmsg_free(msg);
243 return -EMSGSIZE; 241 return -EMSGSIZE;
@@ -269,7 +267,6 @@ int nfc_genl_tm_activated(struct nfc_dev *dev, u32 protocol)
269 return 0; 267 return 0;
270 268
271nla_put_failure: 269nla_put_failure:
272 genlmsg_cancel(msg, hdr);
273free_msg: 270free_msg:
274 nlmsg_free(msg); 271 nlmsg_free(msg);
275 return -EMSGSIZE; 272 return -EMSGSIZE;
@@ -299,7 +296,6 @@ int nfc_genl_tm_deactivated(struct nfc_dev *dev)
299 return 0; 296 return 0;
300 297
301nla_put_failure: 298nla_put_failure:
302 genlmsg_cancel(msg, hdr);
303free_msg: 299free_msg:
304 nlmsg_free(msg); 300 nlmsg_free(msg);
305 return -EMSGSIZE; 301 return -EMSGSIZE;
@@ -340,7 +336,6 @@ int nfc_genl_device_added(struct nfc_dev *dev)
340 return 0; 336 return 0;
341 337
342nla_put_failure: 338nla_put_failure:
343 genlmsg_cancel(msg, hdr);
344free_msg: 339free_msg:
345 nlmsg_free(msg); 340 nlmsg_free(msg);
346 return -EMSGSIZE; 341 return -EMSGSIZE;
@@ -370,7 +365,6 @@ int nfc_genl_device_removed(struct nfc_dev *dev)
370 return 0; 365 return 0;
371 366
372nla_put_failure: 367nla_put_failure:
373 genlmsg_cancel(msg, hdr);
374free_msg: 368free_msg:
375 nlmsg_free(msg); 369 nlmsg_free(msg);
376 return -EMSGSIZE; 370 return -EMSGSIZE;
@@ -434,8 +428,6 @@ int nfc_genl_llc_send_sdres(struct nfc_dev *dev, struct hlist_head *sdres_list)
434 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC); 428 return genlmsg_multicast(&nfc_genl_family, msg, 0, 0, GFP_ATOMIC);
435 429
436nla_put_failure: 430nla_put_failure:
437 genlmsg_cancel(msg, hdr);
438
439free_msg: 431free_msg:
440 nlmsg_free(msg); 432 nlmsg_free(msg);
441 433
@@ -470,7 +462,6 @@ int nfc_genl_se_added(struct nfc_dev *dev, u32 se_idx, u16 type)
470 return 0; 462 return 0;
471 463
472nla_put_failure: 464nla_put_failure:
473 genlmsg_cancel(msg, hdr);
474free_msg: 465free_msg:
475 nlmsg_free(msg); 466 nlmsg_free(msg);
476 return -EMSGSIZE; 467 return -EMSGSIZE;
@@ -501,7 +492,6 @@ int nfc_genl_se_removed(struct nfc_dev *dev, u32 se_idx)
501 return 0; 492 return 0;
502 493
503nla_put_failure: 494nla_put_failure:
504 genlmsg_cancel(msg, hdr);
505free_msg: 495free_msg:
506 nlmsg_free(msg); 496 nlmsg_free(msg);
507 return -EMSGSIZE; 497 return -EMSGSIZE;
@@ -546,7 +536,6 @@ int nfc_genl_se_transaction(struct nfc_dev *dev, u8 se_idx,
546 return 0; 536 return 0;
547 537
548nla_put_failure: 538nla_put_failure:
549 genlmsg_cancel(msg, hdr);
550free_msg: 539free_msg:
551 /* evt_transaction is no more used */ 540 /* evt_transaction is no more used */
552 devm_kfree(&dev->dev, evt_transaction); 541 devm_kfree(&dev->dev, evt_transaction);
@@ -585,7 +574,6 @@ int nfc_genl_se_connectivity(struct nfc_dev *dev, u8 se_idx)
585 return 0; 574 return 0;
586 575
587nla_put_failure: 576nla_put_failure:
588 genlmsg_cancel(msg, hdr);
589free_msg: 577free_msg:
590 nlmsg_free(msg); 578 nlmsg_free(msg);
591 return -EMSGSIZE; 579 return -EMSGSIZE;
@@ -703,7 +691,6 @@ int nfc_genl_dep_link_up_event(struct nfc_dev *dev, u32 target_idx,
703 return 0; 691 return 0;
704 692
705nla_put_failure: 693nla_put_failure:
706 genlmsg_cancel(msg, hdr);
707free_msg: 694free_msg:
708 nlmsg_free(msg); 695 nlmsg_free(msg);
709 return -EMSGSIZE; 696 return -EMSGSIZE;
@@ -735,7 +722,6 @@ int nfc_genl_dep_link_down_event(struct nfc_dev *dev)
735 return 0; 722 return 0;
736 723
737nla_put_failure: 724nla_put_failure:
738 genlmsg_cancel(msg, hdr);
739free_msg: 725free_msg:
740 nlmsg_free(msg); 726 nlmsg_free(msg);
741 return -EMSGSIZE; 727 return -EMSGSIZE;
@@ -1030,7 +1016,6 @@ static int nfc_genl_send_params(struct sk_buff *msg,
1030 return 0; 1016 return 0;
1031 1017
1032nla_put_failure: 1018nla_put_failure:
1033
1034 genlmsg_cancel(msg, hdr); 1019 genlmsg_cancel(msg, hdr);
1035 return -EMSGSIZE; 1020 return -EMSGSIZE;
1036} 1021}
@@ -1290,7 +1275,6 @@ int nfc_genl_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
1290 return 0; 1275 return 0;
1291 1276
1292nla_put_failure: 1277nla_put_failure:
1293 genlmsg_cancel(msg, hdr);
1294free_msg: 1278free_msg:
1295 nlmsg_free(msg); 1279 nlmsg_free(msg);
1296 return -EMSGSIZE; 1280 return -EMSGSIZE;
@@ -1507,7 +1491,6 @@ static void se_io_cb(void *context, u8 *apdu, size_t apdu_len, int err)
1507 return; 1491 return;
1508 1492
1509nla_put_failure: 1493nla_put_failure:
1510 genlmsg_cancel(msg, hdr);
1511free_msg: 1494free_msg:
1512 nlmsg_free(msg); 1495 nlmsg_free(msg);
1513 kfree(ctx); 1496 kfree(ctx);
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-17 03:21:25 -0400