net/ipv6: remove unused err variable on icmpv6_push_pending_frames

Tim Hansen · davem330 · commit cc71b7b07119 · 2017-10-05T21:56:26.000-07:00
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 1da177e. This was found by running make coccicheck M=net/ipv6/ on linus' tree on commit 77ede3a (current HEAD as of this patch). Signed-off-by: Tim Hansen <devtimhansen@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,6 @@ int icmpv6_push_pending_frames(struct sock sk, struct flowi6 fl6,`
`255`	`255`	`{`
`256`	`256`	`struct sk_buff *skb;`
`257`	`257`	`struct icmp6hdr *icmp6h;`
`258`		`- int err = 0;`
`259`	`258`
`260`	`259`	`skb = skb_peek(&sk->sk_write_queue);`
`261`	`260`	`if (!skb)`
`@@ -288,7 +287,7 @@ int icmpv6_push_pending_frames(struct sock sk, struct flowi6 fl6,`
`288`	`287`	`}`
`289`	`288`	`ip6_push_pending_frames(sk);`
`290`	`289`	`out:`
`291`		`- return err;`
	`290`	`+ return 0;`
`292`	`291`	`}`
`293`	`292`
`294`	`293`	`struct icmpv6_msg {`