Commit cc71b7b0 authored Oct 05, 2017 by Tim Hansen Committed by David S. Miller Oct 05, 2017

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 1da177e4.

This was found by running make coccicheck M=net/ipv6/ on linus' tree on commit 77ede3a0 (current HEAD as of this patch).

Signed-off-by: Tim Hansen <devtimhansen@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 380537b4

net/ipv6/icmp.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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 {