projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
380537b
)
net/ipv6: remove unused err variable on icmpv6_push_pending_frames
author
Tim Hansen
<
[email protected]
>
Thu, 5 Oct 2017 19:45:32 +0000
(15:45 -0400)
committer
David S. Miller
<
[email protected]
>
Fri, 6 Oct 2017 04:56:26 +0000
(21:56 -0700)
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 <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/ipv6/icmp.c
patch
|
blob
|
history
diff --git
a/net/ipv6/icmp.c
b/net/ipv6/icmp.c
index 5acb54405b10b637962a7c59c9badb6b4f4f17bd..aeb49b4d8c7dd7888731127621c6515f21a59620 100644
(file)
--- 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 {