aboutsummaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorGuillaume Nault <g.nault@alphalink.fr>2013-06-12 16:07:36 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-06-27 10:34:33 -0700
commit60ab7833a93b180b420a18e24e88e3a9528a7038 (patch)
tree261ea5540ff5fae84530f60f6e331a01da3526c6 /net/l2tp
parent6e092615d27d7036832c18f1c14b691c6c1cbb1d (diff)
downloadkernel_samsung_espresso10-60ab7833a93b180b420a18e24e88e3a9528a7038.zip
kernel_samsung_espresso10-60ab7833a93b180b420a18e24e88e3a9528a7038.tar.gz
kernel_samsung_espresso10-60ab7833a93b180b420a18e24e88e3a9528a7038.tar.bz2
l2tp: Fix sendmsg() return value
[ Upstream commit a6f79d0f26704214b5b702bbac525cb72997f984 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/l2tp')
-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 6af7be6..4613225 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -362,7 +362,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);