forked from luck/tmp_suning_uos_patched
ixgbe: add missing braces
This patch adds missing braces around the 10gig link check to include the check for KR support. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Reported-by: Sascha Wildner <saw@online.de> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
69f1de1f7c
commit
55461ddbcb
@ -804,12 +804,13 @@ static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
|
|||||||
link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
|
link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
|
||||||
/* Set KX4/KX/KR support according to speed requested */
|
/* Set KX4/KX/KR support according to speed requested */
|
||||||
autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
|
autoc &= ~(IXGBE_AUTOC_KX4_KX_SUPP_MASK | IXGBE_AUTOC_KR_SUPP);
|
||||||
if (speed & IXGBE_LINK_SPEED_10GB_FULL)
|
if (speed & IXGBE_LINK_SPEED_10GB_FULL) {
|
||||||
if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
|
if (orig_autoc & IXGBE_AUTOC_KX4_SUPP)
|
||||||
autoc |= IXGBE_AUTOC_KX4_SUPP;
|
autoc |= IXGBE_AUTOC_KX4_SUPP;
|
||||||
if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
|
if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
|
||||||
(hw->phy.smart_speed_active == false))
|
(hw->phy.smart_speed_active == false))
|
||||||
autoc |= IXGBE_AUTOC_KR_SUPP;
|
autoc |= IXGBE_AUTOC_KR_SUPP;
|
||||||
|
}
|
||||||
if (speed & IXGBE_LINK_SPEED_1GB_FULL)
|
if (speed & IXGBE_LINK_SPEED_1GB_FULL)
|
||||||
autoc |= IXGBE_AUTOC_KX_SUPP;
|
autoc |= IXGBE_AUTOC_KX_SUPP;
|
||||||
} else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
|
} else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
|
||||||
|
Loading…
Reference in New Issue
Block a user