git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'rxrpc-next-20171111' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
net
/
ipv6
/
ping.c
diff --git
a/net/ipv6/ping.c
b/net/ipv6/ping.c
index ac826dd338ff0825eaf0d2d74cee92d008e018bb..d12c55dad7d141e632a6407a58eeeefe57c6b7c3 100644
(file)
--- a/
net/ipv6/ping.c
+++ b/
net/ipv6/ping.c
@@
-154,9
+154,8
@@
static int ping_v6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
ICMP6_MIB_OUTERRORS);
ip6_flush_pending_frames(sk);
} else {
- err = icmpv6_push_pending_frames(sk, &fl6,
- (struct icmp6hdr *) &pfh.icmph,
- len);
+ icmpv6_push_pending_frames(sk, &fl6,
+ (struct icmp6hdr *)&pfh.icmph, len);
}
release_sock(sk);