diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2013-06-12 16:07:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-27 11:27:33 -0700 |
| commit | 137b5d870487b1fd75a7aca5aab781747615d367 (patch) | |
| tree | 05fcd03baf1637e8098f0e94614fefd25bfc75e3 | |
| parent | 3bf35eb3ed7e643b9562cf05b919b281e0f1b79a (diff) | |
| download | linux-3.10-137b5d870487b1fd75a7aca5aab781747615d367.tar.gz linux-3.10-137b5d870487b1fd75a7aca5aab781747615d367.tar.bz2 linux-3.10-137b5d870487b1fd75a7aca5aab781747615d367.zip | |
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>
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index 06bb5b343d5..c6dee802bc5 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); |