74 lines
2.7 KiB
Diff
74 lines
2.7 KiB
Diff
|
From cba50f6be0db9efdf694dcf4bce4a6945a275182 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anupam Kapoor <anupam.kapoor@gmail.com>
|
||
|
|
Date: Tue, 21 Jun 2016 17:13:22 +0530
|
||
|
|
Subject: [PATCH] kni: fix build with gcc 6
|
||
|
|
|
||
|
|
This commit fixes build errors triggered due misleading indentation.
|
||
|
|
|
||
|
|
Fixes: b9ee370557f1 ("kni: update kernel driver ethtool baseline")
|
||
|
|
Fixes: 3fc5ca2f6352 ("kni: initial import")
|
||
|
|
|
||
|
|
Signed-off-by: Anupam Kapoor <anupam.kapoor@gmail.com>
|
||
|
|
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
|
||
|
|
---
|
||
|
|
lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c | 6 ++++--
|
||
|
|
lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c | 3 ++-
|
||
|
|
2 files changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
||
|
|
index df22470..140a2a4 100644
|
||
|
|
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
||
|
|
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/e1000_phy.c
|
||
|
|
@@ -3300,12 +3300,13 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
|
||
|
|
*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
|
||
|
|
|
||
|
|
/* Disable access to mPHY if it was originally disabled */
|
||
|
|
- if (locked)
|
||
|
|
+ if (locked) {
|
||
|
|
ready = e1000_is_mphy_ready(hw);
|
||
|
|
if (!ready)
|
||
|
|
return -E1000_ERR_PHY;
|
||
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
||
|
|
E1000_MPHY_DIS_ACCESS);
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return E1000_SUCCESS;
|
||
|
|
}
|
||
|
|
@@ -3365,12 +3366,13 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
|
||
|
|
E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
|
||
|
|
|
||
|
|
/* Disable access to mPHY if it was originally disabled */
|
||
|
|
- if (locked)
|
||
|
|
+ if (locked) {
|
||
|
|
ready = e1000_is_mphy_ready(hw);
|
||
|
|
if (!ready)
|
||
|
|
return -E1000_ERR_PHY;
|
||
|
|
E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
|
||
|
|
E1000_MPHY_DIS_ACCESS);
|
||
|
|
+ }
|
||
|
|
|
||
|
|
return E1000_SUCCESS;
|
||
|
|
}
|
||
|
|
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
||
|
|
index 017dfe1..c6f4130 100644
|
||
|
|
--- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
||
|
|
+++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_82599.c
|
||
|
|
@@ -867,12 +867,13 @@ s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,
|
||
|
|
link_mode == IXGBE_AUTOC_LMS_KX4_KX_KR_SGMII) {
|
||
|
|
/* Set KX4/KX/KR support according to speed requested */
|
||
|
|
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)
|
||
|
|
autoc |= IXGBE_AUTOC_KX4_SUPP;
|
||
|
|
if ((orig_autoc & IXGBE_AUTOC_KR_SUPP) &&
|
||
|
|
(hw->phy.smart_speed_active == false))
|
||
|
|
autoc |= IXGBE_AUTOC_KR_SUPP;
|
||
|
|
+ }
|
||
|
|
if (speed & IXGBE_LINK_SPEED_1GB_FULL)
|
||
|
|
autoc |= IXGBE_AUTOC_KX_SUPP;
|
||
|
|
} else if ((pma_pmd_1g == IXGBE_AUTOC_1G_SFI) &&
|
||
|
|
--
|
||
|
|
2.8.4
|
||
|
|
|