aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-03-06 07:57:03 +0000
committerJohn Crispin <blogic@openwrt.org>2015-03-06 07:57:03 +0000
commit5a24f85217cec6c03e3cb3d2da75ff050bcaaa0d (patch)
treed5d3bddb2b48dd253bfa9e57a99de27802176e99 /target/linux/generic
parentee7476481113895ec109c1f70e9c5d7676cb2d28 (diff)
downloadupstream-5a24f85217cec6c03e3cb3d2da75ff050bcaaa0d.tar.gz
upstream-5a24f85217cec6c03e3cb3d2da75ff050bcaaa0d.tar.bz2
upstream-5a24f85217cec6c03e3cb3d2da75ff050bcaaa0d.zip
swconfig: fix build with linux 4.0
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44617 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/files/drivers/net/phy/swconfig.c9
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;