summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGuillaume Nault <g.nault@alphalink.fr>2013-06-12 16:07:36 +0200
committerDavid S. Miller <davem@davemloft.net>2013-06-13 02:39:04 -0700
commita6f79d0f26704214b5b702bbac525cb72997f984 (patch)
tree5a639b7834c667446f7326dea18a097cbe9d3866 /net
parent55b92b7a11690bc377b5d373872a6b650ae88e64 (diff)
downloadlinux-a6f79d0f26704214b5b702bbac525cb72997f984.tar.gz
linux-a6f79d0f26704214b5b702bbac525cb72997f984.tar.bz2
linux-a6f79d0f26704214b5b702bbac525cb72997f984.zip
l2tp: Fix sendmsg() return value
PPPoL2TP sockets should comply with the standard send*() return values (i.e. return number of bytes sent instead of 0 upon success). Signed-off-by: Guillaume Nault <g.nault@alphalink.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/l2tp/l2tp_ppp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 681c626068b4..8dec6876dc50 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -358,7 +358,7 @@ static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msgh
sock_put(ps->tunnel_sock);
sock_put(sk);
- return error;
+ return total_len;
error_put_sess_tun:
sock_put(ps->tunnel_sock);