i40e: fix odd formatting and indent

The compiler warned on an oddly indented bit of code, and when
investigating that, noted that the functions themselves had
an odd flow. The if condition was checked, and would exclude
a call to AQ, but then the aq_ret would be checked unconditionally
which just looks really weird, and is likely to cause objections.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
index ba327e90f32adeb5ac882278b62b49c09bbe2442..2e261bb59d1025b1160faa4de70ac6f8f116d191 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1741,16 +1741,14 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf,
                                                            NULL);
        } else if (i40e_getnum_vf_vsi_vlan_filters(vsi)) {
                hash_for_each(vsi->mac_filter_hash, bkt, f, hlist) {
-                       aq_ret = 0;
-                       if (f->vlan >= 0 && f->vlan <= I40E_MAX_VLANID) {
-                               aq_ret =
-                               i40e_aq_set_vsi_uc_promisc_on_vlan(hw,
-                                                                  vsi->seid,
-                                                                  alluni,
-                                                                  f->vlan,
-                                                                  NULL);
-                               aq_err = pf->hw.aq.asq_last_status;
-                       }
+                       if (f->vlan < 0 || f->vlan > I40E_MAX_VLANID)
+                               continue;
+                       aq_ret = i40e_aq_set_vsi_uc_promisc_on_vlan(hw,
+                                                                   vsi->seid,
+                                                                   alluni,
+                                                                   f->vlan,
+                                                                   NULL);
+                       aq_err = pf->hw.aq.asq_last_status;
                        if (aq_ret)
                                dev_err(&pf->pdev->dev,
                                        "Could not add VLAN %d to Unicast promiscuous domain err %s aq_err %s\n",