net-next: replace obsolete NLMSG_* with type safe nlmsg_*

Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 8 insertions, 8 deletions

diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index fc42a0afd306..b15c1d1720fb 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -19,7 +19,7 @@
 #include <linux/sockios.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/proc_fs.h>
 #include <linux/netdevice.h>
@@ -492,7 +492,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)
         if (!net_eq(net, &init_net))
                 return 0;
 
-        if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) &&
+        if (nlmsg_len(cb->nlh) >= sizeof(struct rtmsg) &&
                 ((struct rtmsg *)nlmsg_data(cb->nlh))->rtm_flags&RTM_F_CLONED)
                         return dn_cache_dump(skb, cb);
 
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index dfe42012a044..2a7efe388344 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -19,7 +19,7 @@
 #include <linux/netdevice.h>
 #include <linux/netfilter.h>
 #include <linux/spinlock.h>
-#include <linux/netlink.h>
+#include <net/netlink.h>
 #include <linux/netfilter_decnet.h>
 
 #include <net/sock.h>
@@ -39,21 +39,21 @@ static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp)
         unsigned char *ptr;
         struct nf_dn_rtmsg *rtm;
 
-        size = NLMSG_SPACE(rt_skb->len);
-        size += NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg));
-        skb = alloc_skb(size, GFP_ATOMIC);
+        size = NLMSG_ALIGN(rt_skb->len) +
+               NLMSG_ALIGN(sizeof(struct nf_dn_rtmsg));
+        skb = nlmsg_new(size, GFP_ATOMIC);
         if (!skb) {
                 *errp = -ENOMEM;
                 return NULL;
         }
         old_tail = skb->tail;
-        nlh = nlmsg_put(skb, 0, 0, 0, size - sizeof(*nlh), 0);
+        nlh = nlmsg_put(skb, 0, 0, 0, size, 0);
         if (!nlh) {
                 kfree_skb(skb);
                 *errp = -ENOMEM;
                 return NULL;
         }
-        rtm = (struct nf_dn_rtmsg *)NLMSG_DATA(nlh);
+        rtm = (struct nf_dn_rtmsg *)nlmsg_data(nlh);
         rtm->nfdn_ifindex = rt_skb->dev->ifindex;
         ptr = NFDN_RTMSG(rtm);
         skb_copy_from_linear_data(rt_skb, ptr, rt_skb->len);