OSDN Git Service

qed: Fix static checker warning
authorMichal Kalderon <michal.kalderon@marvell.com>
Thu, 30 May 2019 12:20:40 +0000 (15:20 +0300)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2019 22:01:07 +0000 (15:01 -0700)
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>
drivers/net/ethernet/qlogic/qed/qed_dev.c

index a971418..eec7cb6 100644 (file)
@@ -1138,12 +1138,12 @@ qed_llh_add_protocol_filter(struct qed_dev *cdev,
        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 qed_dev *cdev,
        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(struct qed_dev *cdev,
        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)