| From 800cb192403a75817ecb9123aaff12340715fdc7 Mon Sep 17 00:00:00 2001 |
| From: Guillaume Nault <g.nault@alphalink.fr> |
| Date: Wed, 12 Jun 2013 16:07:36 +0200 |
| Subject: l2tp: Fix sendmsg() return value |
| |
| From: Guillaume Nault <g.nault@alphalink.fr> |
| |
| [ 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> |
| --- |
| net/l2tp/l2tp_ppp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/l2tp/l2tp_ppp.c |
| +++ b/net/l2tp/l2tp_ppp.c |
| @@ -362,7 +362,7 @@ static int pppol2tp_sendmsg(struct kiocb |
| sock_put(ps->tunnel_sock); |
| sock_put(sk); |
| |
| - return error; |
| + return total_len; |
| |
| error_put_sess_tun: |
| sock_put(ps->tunnel_sock); |
