From: Michal Kalderon <michal.kalderon@marvell.com>
Date: Thu, 30 May 2019 15:20:40 +0300
Subject: qed: Fix static checker warning
Patch-mainline: v5.3-rc1
Git-commit: 8e2ea3ea962535c64800e82e03e3e1b6cfd9c64f
References: bsc#1136460 jsc#SLE-4691 bsc#1136461 jsc#SLE-4692
In some cases abs_ppfid could be printed without being initialized.
Fixes: 79284adeb99e ("qed: Add llh ppfid interface and 100g support for offload protocols")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Michal Kalderon <michal.kalderon@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/qlogic/qed/qed_dev.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -1138,12 +1138,12 @@ qed_llh_add_protocol_filter(struct qed_d
if (rc)
goto err;
+ rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+ if (rc)
+ goto err;
+
/* Configure the LLH only in case of a new the filter */
if (ref_cnt == 1) {
- rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
- if (rc)
- goto err;
-
rc = qed_llh_protocol_filter_to_hilo(cdev, type,
source_port_or_eth_type,
dest_port, &high, &low);
@@ -1195,12 +1195,12 @@ void qed_llh_remove_mac_filter(struct qe
if (rc)
goto err;
+ rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+ if (rc)
+ goto err;
+
/* Remove from the LLH in case the filter is not in use */
if (!ref_cnt) {
- rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
- if (rc)
- goto err;
-
rc = qed_llh_remove_filter(p_hwfn, p_ptt, abs_ppfid,
filter_idx);
if (rc)
@@ -1253,12 +1253,12 @@ void qed_llh_remove_protocol_filter(stru
if (rc)
goto err;
+ rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
+ if (rc)
+ goto err;
+
/* Remove from the LLH in case the filter is not in use */
if (!ref_cnt) {
- rc = qed_llh_abs_ppfid(cdev, ppfid, &abs_ppfid);
- if (rc)
- goto err;
-
rc = qed_llh_remove_filter(p_hwfn, p_ptt, abs_ppfid,
filter_idx);
if (rc)