scsi: replace obsolete NLMSG_* with type safe nlmsg_*

Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index e894ca7b54c0..e106c276aa00 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -35,7 +35,6 @@
 #include <scsi/scsi_transport.h>
 #include <scsi/scsi_transport_fc.h>
 #include <scsi/scsi_cmnd.h>
-#include <linux/netlink.h>
 #include <net/netlink.h>
 #include <scsi/scsi_netlink_fc.h>
 #include <scsi/scsi_bsg_fc.h>
@@ -534,7 +533,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         struct nlmsghdr *nlh;
         struct fc_nl_event *event;
         const char *name;
-        u32 len, skblen;
+        u32 len;
         int err;
 
         if (!scsi_nl_sock) {
@@ -543,21 +542,19 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         }
 
         len = FC_NL_MSGALIGN(sizeof(*event));
-        skblen = NLMSG_SPACE(len);
 
-        skb = alloc_skb(skblen, GFP_KERNEL);
+        skb = nlmsg_new(len, GFP_KERNEL);
         if (!skb) {
                 err = -ENOBUFS;
                 goto send_fail;
         }
 
-        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,
-                                skblen - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
         if (!nlh) {
                 err = -ENOBUFS;
                 goto send_fail_skb;
         }
-        event = NLMSG_DATA(nlh);
+        event = nlmsg_data(nlh);
 
         INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
                                 FC_NL_ASYNC_EVENT, len);
@@ -604,7 +601,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         struct sk_buff *skb;
         struct nlmsghdr *nlh;
         struct fc_nl_event *event;
-        u32 len, skblen;
+        u32 len;
         int err;
 
         if (!scsi_nl_sock) {
@@ -613,21 +610,19 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         }
 
         len = FC_NL_MSGALIGN(sizeof(*event) + data_len);
-        skblen = NLMSG_SPACE(len);
 
-        skb = alloc_skb(skblen, GFP_KERNEL);
+        skb = nlmsg_new(len, GFP_KERNEL);
         if (!skb) {
                 err = -ENOBUFS;
                 goto send_vendor_fail;
         }
 
-        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG,
-                                skblen - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, 0, SCSI_TRANSPORT_MSG, len, 0);
         if (!nlh) {
                 err = -ENOBUFS;
                 goto send_vendor_fail_skb;
         }
-        event = NLMSG_DATA(nlh);
+        event = nlmsg_data(nlh);
 
         INIT_SCSI_NL_HDR(&event->snlh, SCSI_NL_TRANSPORT_FC,
                                 FC_NL_ASYNC_EVENT, len);