X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fconnector%2Fconnector.c;h=a7b9e9bb3e8d54017480857d2b7cc6dbceedcc6f;hb=26f6cb999366a71b8e318bceaf8fafc1ffecae40;hp=a905f782033196259dcdb46b5931701d0a642bad;hpb=445c9b5507b9d09a2e9b0b4dbb16517708aa40e6;p=linux-2.6

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index a905f78203..a7b9e9bb3e 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -212,7 +212,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
 	skb = skb_get(__skb);
 
 	if (skb->len >= NLMSG_SPACE(0)) {
-		nlh = (struct nlmsghdr *)skb->data;
+		nlh = nlmsg_hdr(skb);
 
 		if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
 		    skb->len < nlh->nlmsg_len ||
@@ -448,7 +448,7 @@ static int __devinit cn_init(void)
 
 	dev->nls = netlink_kernel_create(NETLINK_CONNECTOR,
 					 CN_NETLINK_USERS + 0xf,
-					 dev->input, THIS_MODULE);
+					 dev->input, NULL, THIS_MODULE);
 	if (!dev->nls)
 		return -EIO;