gdm72xx: replace obsolete NLMSG_* with type safe nlmsg_*
Subsystems (3)
PATCH 4/6 gdm72xx: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by Hong Zhiguo <[email protected]>
--- drivers/staging/gdm72xx/netlink_k.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/gdm72xx/netlink_k.c +6 -6
@@ -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 ;
Signature · 1 line
1.7.10.4
Quoted 13 lines · Hong Zhiguo
Signed-off-by Hong Zhiguo <[email protected]>--- drivers/staging/gdm72xx/netlink_k.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/staging/gdm72xx/netlink_k.c +0
-0@@ -25,12 +25,12 @@#define ND_MAX_GROUP 30#define ND_IFINDEX_LEN sizeof(int)
drivers/staging/gdm72xx/netlink_k.c line 34
Quoted 10 lines
drivers/staging/gdm72xx/netlink_k.c +3
-3-#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
This is not pretty at all but outside of the context of your patch.
Acked-by Thomas Graf <[email protected]>
From: Hong Zhiguo <[email protected]>
Date: Thu, 28 Mar 2013 00:52:17 +0800
Quoted 1 line
Signed-off-by Hong Zhiguo <[email protected]>
Applied.