projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv6
/
ping.c
diff --git
a/net/ipv6/ping.c
b/net/ipv6/ping.c
index a2dfff6ff227e09607d1d267265e7635d64a2030..263a5164a6f5af1520158293dfb3ab641c223ae2 100644
(file)
--- a/
net/ipv6/ping.c
+++ b/
net/ipv6/ping.c
@@
-77,8
+77,7
@@
static int dummy_ipv6_chk_addr(struct net *net, const struct in6_addr *addr,
return 0;
}
return 0;
}
-int ping_v6_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
- size_t len)
+int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
{
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
{
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);