EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

swconfig: fix build with linux 4.0

Browse Source 
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 44617
This commit is contained in:
John Crispin 2015-03-06 07:57:03 +00:00
parent 3ddd2b49a9
commit 57c7bed820
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/files/drivers/net/phy/swconfig.c
View File

@ -396,7 +396,8 @@ swconfig_dump_attr(struct swconfig_callback *cb, void *arg)
op->description)) op->description))
goto nla_put_failure; goto nla_put_failure;
return genlmsg_end(msg, hdr); genlmsg_end(msg, hdr);
return msg->len;
nla_put_failure: nla_put_failure:
genlmsg_cancel(msg, hdr); genlmsg_cancel(msg, hdr);
return -EMSGSIZE; return -EMSGSIZE;
@ -828,7 +829,8 @@ swconfig_get_attr(struct sk_buff *skb, struct genl_info *info)
err = -EINVAL; err = -EINVAL;
goto error; goto error;
} }
err = genlmsg_end(msg, hdr); genlmsg_end(msg, hdr);
err = msg->len;
if (err < 0) if (err < 0)
goto nla_put_failure; 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, p);
} }
nla_nest_end(msg, m); nla_nest_end(msg, m);
return genlmsg_end(msg, hdr); genlmsg_end(msg, hdr);
return msg->len;
nla_put_failure: nla_put_failure:
genlmsg_cancel(msg, hdr); genlmsg_cancel(msg, hdr);
return -EMSGSIZE; return -EMSGSIZE;