summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Hansen <devtimhansen@gmail.com>2017-10-05 15:45:32 -0400
committerDavid S. Miller <davem@davemloft.net>2017-10-05 21:56:26 -0700
commitcc71b7b071192ac1c288e272fdc3f3877eb96663 (patch)
tree1260878b87c3e32f4a6f375f25f130604e5c0178
parent380537b4f7f2e706e499695b38eabc90a5f72fa8 (diff)
downloadlinux-cc71b7b071192ac1c288e272fdc3f3877eb96663.tar.bz2
net/ipv6: remove unused err variable on icmpv6_push_pending_frames
int err is unused by icmpv6_push_pending_frames(), this patch returns removes the variable and returns the function with 0. git bisect shows this variable has been around since linux has been in git in commit 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2. This was found by running make coccicheck M=net/ipv6/ on linus' tree on commit 77ede3a014a32746002f7889211f0cecf4803163 (current HEAD as of this patch). Signed-off-by: Tim Hansen <devtimhansen@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/icmp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 5acb54405b10..aeb49b4d8c7d 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -255,7 +255,6 @@ int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,
{
struct sk_buff *skb;
struct icmp6hdr *icmp6h;
- int err = 0;
skb = skb_peek(&sk->sk_write_queue);
if (!skb)
@@ -288,7 +287,7 @@ int icmpv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6,
}
ip6_push_pending_frames(sk);
out:
- return err;
+ return 0;
}
struct icmpv6_msg {