Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 573ce260 authored by Hong zhi guo's avatar Hong zhi guo Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarHong Zhiguo <honkiko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e5c5d22e

net/bridge/netfilter/ebt_ulog.c

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/skbuff.h>

#include <linux/kernel.h>

#include <linux/timer.h>

#include <linux/netlink.h>

#include <net/netlink.h>

#include <linux/netdevice.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter_bridge/ebtables.h>
@@ -134,7 +134,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb, 
	else

		copy_len = uloginfo->cprange;



	size = NLMSG_SPACE(sizeof(*pm) + copy_len);

	size = nlmsg_total_size(sizeof(*pm) + copy_len);

	if (size > nlbufsiz) {

		pr_debug("Size %Zd needed, but nlbufsiz=%d\n", size, nlbufsiz);

		return;

net/core/rtnetlink.c

+2 −2
Original line number Diff line number Diff line
@@ -2613,10 +2613,10 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	type -= RTM_BASE;



	/* All the messages must have at least 1 byte length */

	if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(struct rtgenmsg)))

	if (nlmsg_len(nlh) < sizeof(struct rtgenmsg))

		return 0;



	family = ((struct rtgenmsg *)NLMSG_DATA(nlh))->rtgen_family;

	family = ((struct rtgenmsg *)nlmsg_data(nlh))->rtgen_family;

	sz_idx = type>>2;

	kind = type&3;

net/decnet/dn_table.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/decnet/netfilter/dn_rtmsg.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

net/ieee802154/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct sk_buff *ieee802154_nl_create(int flags, u8 req) 
int ieee802154_nl_mcast(struct sk_buff *msg, unsigned int group)

{

	/* XXX: nlh is right at the start of msg */

	void *hdr = genlmsg_data(NLMSG_DATA(msg->data));

	void *hdr = genlmsg_data(nlmsg_data(msg->data));



	if (genlmsg_end(msg, hdr) < 0)

		goto out;
@@ -98,7 +98,7 @@ struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info, 
int ieee802154_nl_reply(struct sk_buff *msg, struct genl_info *info)

{

	/* XXX: nlh is right at the start of msg */

	void *hdr = genlmsg_data(NLMSG_DATA(msg->data));

	void *hdr = genlmsg_data(nlmsg_data(msg->data));



	if (genlmsg_end(msg, hdr) < 0)

		goto out;