diff options
| author | John Crispin <john@openwrt.org> | 2015-03-06 07:57:03 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-03-06 07:57:03 +0000 |
| commit | 57c7bed820edc45d59575c82d1bfd30cacf38395 (patch) | |
| tree | da8a248614c1607e67e52a42ca2e489e2c132e00 /target/linux/generic/files/drivers/net | |
| parent | 3ddd2b49a9c59d0b7a1b73bdc177d4f294beb526 (diff) | |
| download | upstream-57c7bed820edc45d59575c82d1bfd30cacf38395.tar.gz upstream-57c7bed820edc45d59575c82d1bfd30cacf38395.tar.bz2 upstream-57c7bed820edc45d59575c82d1bfd30cacf38395.zip | |
swconfig: fix build with linux 4.0
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
SVN-Revision: 44617
Diffstat (limited to 'target/linux/generic/files/drivers/net')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/swconfig.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/swconfig.c b/target/linux/generic/files/drivers/net/phy/swconfig.c index b0ba90d16f..6bb3be1348 100644 --- a/target/linux/generic/files/drivers/net/phy/swconfig.c +++ b/target/linux/generic/files/drivers/net/phy/swconfig.c @@ -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; |