diff options
| author | Hong zhi guo <honkiko@gmail.com> | 2013-03-27 06:47:04 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-28 14:25:25 -0400 |
| commit | 573ce260b385a4d14a1ef046558fad9f1daeee42 (patch) | |
| tree | b577de870934c583a66514b1206964fbd262c340 /net/netlink/af_netlink.c | |
| parent | e5c5d22e8dcf7c2d430336cbf8e180bd38e8daf1 (diff) | |
| download | op-kernel-dev-573ce260b385a4d14a1ef046558fad9f1daeee42.zip op-kernel-dev-573ce260b385a4d14a1ef046558fad9f1daeee42.tar.gz | |
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>
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index a500ce2..ce2e006 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1646,7 +1646,7 @@ struct nlmsghdr * __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int flags) { struct nlmsghdr *nlh; - int size = NLMSG_LENGTH(len); + int size = nlmsg_msg_size(len); nlh = (struct nlmsghdr*)skb_put(skb, NLMSG_ALIGN(size)); nlh->nlmsg_type = type; @@ -1655,7 +1655,7 @@ __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int fla nlh->nlmsg_pid = portid; nlh->nlmsg_seq = seq; if (!__builtin_constant_p(size) || NLMSG_ALIGN(size) - size != 0) - memset(NLMSG_DATA(nlh) + len, 0, NLMSG_ALIGN(size) - size); + memset(nlmsg_data(nlh) + len, 0, NLMSG_ALIGN(size) - size); return nlh; } EXPORT_SYMBOL(__nlmsg_put); |
