Commit 63d9379a authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher

ixgbe: Reduce VT code indent in set_vfta by introducing jump label

In order to clear the way for upcoming work I thought it best to drop the
level of indent in the ixgbe_set_vfta_generic function.  Most of the code
is held in the virtualization specific section.  So the easiest approach is
to just add a jump label and jump past the bulk of the code if it is not
enabled.
Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c18fbd5f
...@@ -3051,8 +3051,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, ...@@ -3051,8 +3051,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
bool vlan_on) bool vlan_on)
{ {
u32 regidx, vfta_delta, vfta; u32 regidx, vfta_delta, vfta;
s32 vlvf_index;
u32 bits; u32 bits;
u32 vt;
if (vlan > 4095) if (vlan > 4095)
return IXGBE_ERR_PARAM; return IXGBE_ERR_PARAM;
...@@ -3088,9 +3088,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, ...@@ -3088,9 +3088,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
* Or !vlan_on * Or !vlan_on
* clear the pool bit and possibly the vind * clear the pool bit and possibly the vind
*/ */
vt = IXGBE_READ_REG(hw, IXGBE_VT_CTL); if (!(IXGBE_READ_REG(hw, IXGBE_VT_CTL) & IXGBE_VT_CTL_VT_ENABLE))
if (vt & IXGBE_VT_CTL_VT_ENABLE) { goto vfta_update;
s32 vlvf_index;
vlvf_index = ixgbe_find_vlvf_slot(hw, vlan); vlvf_index = ixgbe_find_vlvf_slot(hw, vlan);
if (vlvf_index < 0) if (vlvf_index < 0)
...@@ -3136,8 +3135,7 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, ...@@ -3136,8 +3135,7 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
} }
} }
/* /* If there are still bits set in the VLVFB registers
* If there are still bits set in the VLVFB registers
* for the VLAN ID indicated we need to see if the * for the VLAN ID indicated we need to see if the
* caller is requesting that we clear the VFTA entry bit. * caller is requesting that we clear the VFTA entry bit.
* If the caller has requested that we clear the VFTA * If the caller has requested that we clear the VFTA
...@@ -3163,8 +3161,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind, ...@@ -3163,8 +3161,8 @@ s32 ixgbe_set_vfta_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
} else { } else {
IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index), 0); IXGBE_WRITE_REG(hw, IXGBE_VLVF(vlvf_index), 0);
} }
}
vfta_update:
if (vfta_delta) if (vfta_delta)
IXGBE_WRITE_REG(hw, IXGBE_VFTA(regidx), vfta); IXGBE_WRITE_REG(hw, IXGBE_VFTA(regidx), vfta);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment