connector: Move cn_test.c away from NLMSG_PUT().
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Jun 2012 04:19:02 +0000 (21:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Jun 2012 04:19:02 +0000 (21:19 -0700)
And use nlmsg_data() while we're here too.

Signed-off-by: David S. Miller <davem@davemloft.net>
Documentation/connector/cn_test.c

index 7764594778d43650afe3423055cd4bcabaf77c17..adcca0368d602ff4cb54c10365aa4b3651a4e79b 100644 (file)
@@ -69,9 +69,13 @@ static int cn_test_want_notify(void)
                return -ENOMEM;
        }
 
-       nlh = NLMSG_PUT(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh));
+       nlh = nlmsg_put(skb, 0, 0x123, NLMSG_DONE, size - sizeof(*nlh), 0);
+       if (!nlh) {
+               kfree_skb(skb);
+               return -EMSGSIZE;
+       }
 
-       msg = (struct cn_msg *)NLMSG_DATA(nlh);
+       msg = nlmsg_data(nlh);
 
        memset(msg, 0, size0);
 
@@ -117,11 +121,6 @@ static int cn_test_want_notify(void)
        pr_info("request was sent: group=0x%x\n", ctl->group);
 
        return 0;
-
-nlmsg_failure:
-       pr_err("failed to send %u.%u\n", msg->seq, msg->ack);
-       kfree_skb(skb);
-       return -EINVAL;
 }
 #endif