Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[deliverable/linux.git] / drivers / scsi / scsi_netlink.c

diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index c77628afbf9f3e4dbb53c76e6ccf30b054b0f28a..8818dd681c194a445ea937c6f1e4b0dd70efff5f 100644 (file)
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -486,6 +486,10 @@ void
 scsi_netlink_init(void)
 {
        int error;
+       struct netlink_kernel_cfg cfg = {
+               .input  = scsi_nl_rcv_msg,
+               .groups = SCSI_NL_GRP_CNT,
+       };
 
        INIT_LIST_HEAD(&scsi_nl_drivers);
 
@@ -497,8 +501,7 @@ scsi_netlink_init(void)
        }
 
        scsi_nl_sock = netlink_kernel_create(&init_net, NETLINK_SCSITRANSPORT,
-                               SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
-                               THIS_MODULE);
+                                            THIS_MODULE, &cfg);
        if (!scsi_nl_sock) {
                printk(KERN_ERR "%s: register of receive handler failed\n",
                                __func__);