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

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

gdm72xx: replace obsolete NLMSG_* with type safe nlmsg_* 



Signed-off-by: default avatarHong Zhiguo <honkiko@gmail.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 77954983

drivers/staging/gdm72xx/netlink_k.c

+6 −6
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include <linux/module.h>

#include <linux/etherdevice.h>

#include <linux/netlink.h>

#include <net/netlink.h>

#include <asm/byteorder.h>

#include <net/sock.h>
@@ -25,12 +25,12 @@ 


#define ND_MAX_GROUP			30

#define ND_IFINDEX_LEN			sizeof(int)

#define ND_NLMSG_SPACE(len)		(NLMSG_SPACE(len) + ND_IFINDEX_LEN)

#define ND_NLMSG_SPACE(len)		(nlmsg_total_size(len) + ND_IFINDEX_LEN)

#define ND_NLMSG_DATA(nlh) \

	((void *)((char *)NLMSG_DATA(nlh) + ND_IFINDEX_LEN))

	((void *)((char *)nlmsg_data(nlh) + ND_IFINDEX_LEN))

#define ND_NLMSG_S_LEN(len)		(len+ND_IFINDEX_LEN)

#define ND_NLMSG_R_LEN(nlh)		(nlh->nlmsg_len-ND_IFINDEX_LEN)

#define ND_NLMSG_IFIDX(nlh)		NLMSG_DATA(nlh)

#define ND_NLMSG_IFIDX(nlh)		nlmsg_data(nlh)

#define ND_MAX_MSG_LEN			8096



#if defined(DEFINE_MUTEX)
@@ -51,7 +51,7 @@ static void netlink_rcv_cb(struct sk_buff *skb) 
	void *msg;

	int ifindex;



	if (skb->len >= NLMSG_SPACE(0)) {

	if (skb->len >= NLMSG_HDRLEN) {

		nlh = (struct nlmsghdr *)skb->data;



		if (skb->len < nlh->nlmsg_len ||
@@ -124,7 +124,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) 
		return -EINVAL;

	}



	skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC);

	skb = nlmsg_new(len, GFP_ATOMIC);

	if (!skb) {

		pr_err("netlink_broadcast ret=%d\n", ret);

		return -ENOMEM;