[PATCH] net-hsr: Delete unnecessary checks before the function call "kfree_skb"
From: SF Markus Elfring <hidden>
Date: 2015-11-14 21:33:46
Also in:
kernel-janitors, lkml
Subsystem:
hsr network protocol, networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Markus Elfring <redacted> Date: Sat, 14 Nov 2015 22:23:48 +0100 The kfree_skb() function tests whether its argument is NULL and then returns immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <redacted> --- net/hsr/hsr_forward.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index 7871ed6..55ba943 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c@@ -355,11 +355,8 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port) goto out_drop; hsr_register_frame_in(frame.node_src, port, frame.sequence_nr); hsr_forward_do(&frame); - - if (frame.skb_hsr != NULL) - kfree_skb(frame.skb_hsr); - if (frame.skb_std != NULL) - kfree_skb(frame.skb_std); + kfree_skb(frame.skb_hsr); + kfree_skb(frame.skb_std); return; out_drop:
--
2.6.2