Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / ieee802154 / netlink.c

diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 92472528106b5f7fb5d29f5d9c6eb734d4804c4f..7e49bbcc6967ebfaac72ee9e6b3e3b9032f1f88a 100644 (file)
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -64,8 +64,8 @@ struct sk_buff *ieee802154_nl_create(int flags, u8 req)
 
 int ieee802154_nl_mcast(struct sk_buff *msg, unsigned int group)
 {
-       /* XXX: nlh is right at the start of msg */
-       void *hdr = genlmsg_data(nlmsg_data(msg->data));
+       struct nlmsghdr *nlh = nlmsg_hdr(msg);
+       void *hdr = genlmsg_data(nlmsg_data(nlh));
 
        if (genlmsg_end(msg, hdr) < 0)
                goto out;
@@ -97,8 +97,8 @@ struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info,
 
 int ieee802154_nl_reply(struct sk_buff *msg, struct genl_info *info)
 {
-       /* XXX: nlh is right at the start of msg */
-       void *hdr = genlmsg_data(nlmsg_data(msg->data));
+       struct nlmsghdr *nlh = nlmsg_hdr(msg);
+       void *hdr = genlmsg_data(nlmsg_data(nlh));
 
        if (genlmsg_end(msg, hdr) < 0)
                goto out;