From: Wang Hai <wanghai38@huawei.com>
Date: Sat, 18 Jul 2020 12:53:38 +0000 (+0800)
Subject: net: hsr: remove redundant null check
X-Git-Tag: v5.9-rc1~133^2~178
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b96692bcfcd2be7c9aa55dc13440213cd54c654;p=thirdparty%2Flinux.git

net: hsr: remove redundant null check

Because kfree_skb already checked NULL skb parameter,
so the additional checks are unnecessary, just remove them.

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Wang Hai <wanghai38@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index ed13760463dec..92c8ad75200bc 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -367,10 +367,8 @@ void hsr_forward_skb(struct sk_buff *skb, struct hsr_port *port)
 		port->dev->stats.tx_bytes += skb->len;
 	}
 
-	if (frame.skb_hsr)
-		kfree_skb(frame.skb_hsr);
-	if (frame.skb_std)
-		kfree_skb(frame.skb_std);
+	kfree_skb(frame.skb_hsr);
+	kfree_skb(frame.skb_std);
 	return;
 
 out_drop: