diff options
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')
-rw-r--r-- | net/l2tp/l2tp_ppp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index cc7a828fc914..e9b0dec56b8e 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c | |||
@@ -185,9 +185,8 @@ static int pppol2tp_recv_payload_hook(struct sk_buff *skb) | |||
185 | 185 | ||
186 | /* Receive message. This is the recvmsg for the PPPoL2TP socket. | 186 | /* Receive message. This is the recvmsg for the PPPoL2TP socket. |
187 | */ | 187 | */ |
188 | static int pppol2tp_recvmsg(struct kiocb *iocb, struct socket *sock, | 188 | static int pppol2tp_recvmsg(struct socket *sock, struct msghdr *msg, |
189 | struct msghdr *msg, size_t len, | 189 | size_t len, int flags) |
190 | int flags) | ||
191 | { | 190 | { |
192 | int err; | 191 | int err; |
193 | struct sk_buff *skb; | 192 | struct sk_buff *skb; |
@@ -295,7 +294,7 @@ static void pppol2tp_session_sock_put(struct l2tp_session *session) | |||
295 | * when a user application does a sendmsg() on the session socket. L2TP and | 294 | * when a user application does a sendmsg() on the session socket. L2TP and |
296 | * PPP headers must be inserted into the user's data. | 295 | * PPP headers must be inserted into the user's data. |
297 | */ | 296 | */ |
298 | static int pppol2tp_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, | 297 | static int pppol2tp_sendmsg(struct socket *sock, struct msghdr *m, |
299 | size_t total_len) | 298 | size_t total_len) |
300 | { | 299 | { |
301 | static const unsigned char ppph[2] = { 0xff, 0x03 }; | 300 | static const unsigned char ppph[2] = { 0xff, 0x03 }; |