summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ping.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2017-10-06 08:46:14 +0200
committerDavid S. Miller <davem@davemloft.net>2017-10-06 18:52:31 +0200
commit4e64b1ed15e25b8dcc2819c6d43dab72eb0bea26 (patch)
tree08750707dce33adb6a282af6c240f6d50068a1cb /net/ipv6/ping.c
parentnet/ipv6: remove unused err variable on icmpv6_push_pending_frames (diff)
downloadlinux-4e64b1ed15e25b8dcc2819c6d43dab72eb0bea26.tar.xz
linux-4e64b1ed15e25b8dcc2819c6d43dab72eb0bea26.zip
net/ipv6: Convert icmpv6_push_pending_frames to void
commit cc71b7b07119 ("net/ipv6: remove unused err variable on icmpv6_push_pending_frames") exposed icmpv6_push_pending_frames return value not being used. Remove now unnecessary int err declarations and uses. Miscellanea: o Remove unnecessary goto and out: labels o Realign arguments Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ping.c')
-rw-r--r--net/ipv6/ping.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index ac826dd338ff..d12c55dad7d1 100644
--- 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);