swconfig: fix build with linux 4.0
authorJohn Crispin <john@openwrt.org>
Fri, 6 Mar 2015 07:57:03 +0000 (07:57 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 6 Mar 2015 07:57:03 +0000 (07:57 +0000)
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 44617

target/linux/generic/files/drivers/net/phy/swconfig.c

index b0ba90d..6bb3be1 100644 (file)
@@ -396,7 +396,8 @@ swconfig_dump_attr(struct swconfig_callback *cb, void *arg)
                        op->description))
                        goto nla_put_failure;
 
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return msg->len;
 nla_put_failure:
        genlmsg_cancel(msg, hdr);
        return -EMSGSIZE;
@@ -828,7 +829,8 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
                err = -EINVAL;
                goto error;
        }
-       err = genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       err = msg->len;
        if (err < 0)
                goto nla_put_failure;
 
@@ -891,7 +893,8 @@ swconfig_send_switch(struct sk_buff *msg, u32 pid, u32 seq, int flags,
                nla_nest_end(msg, p);
        }
        nla_nest_end(msg, m);
-       return genlmsg_end(msg, hdr);
+       genlmsg_end(msg, hdr);
+       return msg->len;
 nla_put_failure:
        genlmsg_cancel(msg, hdr);
        return -EMSGSIZE;