diff options
Diffstat (limited to 'net/ipv6/raw.c')
-rw-r--r-- | net/ipv6/raw.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 0d84b2c7f24e..a5287b3582a4 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c | |||
@@ -456,9 +456,8 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb) | |||
456 | * we return it, otherwise we block. | 456 | * we return it, otherwise we block. |
457 | */ | 457 | */ |
458 | 458 | ||
459 | static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, | 459 | static int rawv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, |
460 | struct msghdr *msg, size_t len, | 460 | int noblock, int flags, int *addr_len) |
461 | int noblock, int flags, int *addr_len) | ||
462 | { | 461 | { |
463 | struct ipv6_pinfo *np = inet6_sk(sk); | 462 | struct ipv6_pinfo *np = inet6_sk(sk); |
464 | DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name); | 463 | DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name); |
@@ -730,8 +729,7 @@ static int raw6_getfrag(void *from, char *to, int offset, int len, int odd, | |||
730 | return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb); | 729 | return ip_generic_getfrag(rfv->msg, to, offset, len, odd, skb); |
731 | } | 730 | } |
732 | 731 | ||
733 | static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk, | 732 | static int rawv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) |
734 | struct msghdr *msg, size_t len) | ||
735 | { | 733 | { |
736 | struct ipv6_txoptions opt_space; | 734 | struct ipv6_txoptions opt_space; |
737 | DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name); | 735 | DECLARE_SOCKADDR(struct sockaddr_in6 *, sin6, msg->msg_name); |