connector: replace obsolete NLMSG_* with type safe nlmsg_*
Subsystems (2)
PATCH 6/6 connector: replace obsolete NLMSG_* with type safe nlmsg_*
Signed-off-by Hong Zhiguo <[email protected]>
--- drivers/connector/connector.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/connector/connector.c +6 -6
@@ -23,7 +23,7 @@#include <linux/module.h> #include <linux/list.h> #include <linux/skbuff.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/moduleparam.h> #include <linux/connector.h> #include <linux/slab.h>
@@ -95,13 +95,13 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)if (!netlink_has_listeners (dev->nls, group))return -ESRCH ; - size =NLMSG_SPACE (sizeof (*msg) + msg->len); + size =sizeof (*msg) + msg->len; - skb =alloc_skb (size, gfp_mask); + skb =nlmsg_new (size, gfp_mask);if (!skb)return -ENOMEM ; - nlh =nlmsg_put (skb,0 , msg->seq,NLMSG_DONE , size -sizeof (*nlh),0 ); + nlh =nlmsg_put (skb,0 , msg->seq,NLMSG_DONE , size,0 );if (!nlh) {kfree_skb (skb);return -EMSGSIZE ;
@@ -124,7 +124,7 @@ static int cn_call_callback(struct sk_buff *skb) {struct cn_callback_entry *i, *cbq =NULL ;struct cn_dev *dev = &cdev; -struct cn_msg *msg =NLMSG_DATA (nlmsg_hdr (skb)); +struct cn_msg *msg =nlmsg_data (nlmsg_hdr (skb));struct netlink_skb_parms *nsp = &NETLINK_CB (skb);int err = -ENODEV ;
@@ -162,7 +162,7 @@ static void cn_rx_skb(struct sk_buff *__skb) skb =skb_get (__skb); -if (skb->len >=NLMSG_SPACE (0 )) { +if (skb->len >=NLMSG_HDRLEN ) { nlh =nlmsg_hdr (skb); if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
Signature · 1 line
1.7.10.4
Quoted 1 line · Hong Zhiguo
Signed-off-by Hong Zhiguo <[email protected]>
Acked-by Thomas Graf <[email protected]>
From: Hong Zhiguo <[email protected]>
Date: Thu, 28 Mar 2013 00:54:56 +0800
Quoted 1 line
Signed-off-by Hong Zhiguo <[email protected]>
Applied.