tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
gdm72xx: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Hong zhi guo
and committed by
David S. Miller
b96dc464
77954983
+6
-6
+6
-6
drivers/staging/gdm72xx/netlink_k.c
+6
-6
drivers/staging/gdm72xx/netlink_k.c
···
15
15
16
16
#include <linux/module.h>
17
17
#include <linux/etherdevice.h>
18
-
#include <linux/netlink.h>
18
+
#include <net/netlink.h>
19
19
#include <asm/byteorder.h>
20
20
#include <net/sock.h>
21
21
···
25
25
26
26
#define ND_MAX_GROUP 30
27
27
#define ND_IFINDEX_LEN sizeof(int)
28
-
#define ND_NLMSG_SPACE(len) (NLMSG_SPACE(len) + ND_IFINDEX_LEN)
28
+
#define ND_NLMSG_SPACE(len) (nlmsg_total_size(len) + ND_IFINDEX_LEN)
29
29
#define ND_NLMSG_DATA(nlh) \
30
-
((void *)((char *)NLMSG_DATA(nlh) + ND_IFINDEX_LEN))
30
+
((void *)((char *)nlmsg_data(nlh) + ND_IFINDEX_LEN))
31
31
#define ND_NLMSG_S_LEN(len) (len+ND_IFINDEX_LEN)
32
32
#define ND_NLMSG_R_LEN(nlh) (nlh->nlmsg_len-ND_IFINDEX_LEN)
33
-
#define ND_NLMSG_IFIDX(nlh) NLMSG_DATA(nlh)
33
+
#define ND_NLMSG_IFIDX(nlh) nlmsg_data(nlh)
34
34
#define ND_MAX_MSG_LEN 8096
35
35
36
36
#if defined(DEFINE_MUTEX)
···
51
51
void *msg;
52
52
int ifindex;
53
53
54
-
if (skb->len >= NLMSG_SPACE(0)) {
54
+
if (skb->len >= NLMSG_HDRLEN) {
55
55
nlh = (struct nlmsghdr *)skb->data;
56
56
57
57
if (skb->len < nlh->nlmsg_len ||
···
124
124
return -EINVAL;
125
125
}
126
126
127
-
skb = alloc_skb(NLMSG_SPACE(len), GFP_ATOMIC);
127
+
skb = nlmsg_new(len, GFP_ATOMIC);
128
128
if (!skb) {
129
129
pr_err("netlink_broadcast ret=%d\n", ret);
130
130
return -ENOMEM;