[dpdk-dev] [PATCH]Upgrade NIC share codes: fix a compilation error when RTE_NIC_BYPASS=y

[dpdk-dev] [PATCH]Upgrade NIC share codes: fix a compilation error when RTE_NIC_BYPASS=y

[Jijiang Liu]

There is a compilation error using latest NIC share codes when RTE_NIC_BYPASS=y, 
the root cause is that the setup_link API have already changed in the share codes, so change ixgbe_setup_mac_link_multispeed_fixed_fiber()
for eliminating the compilation error. 

Signed-off-by: jijiangl <jijiang.liu@intel.com>
Tested-by: Waterman Cao <waterman.cao@intel.com>
---
 lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
index c4aeb0c..916bda9 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
@@ -112,14 +112,13 @@ out:
  *  ixgbe_setup_mac_link_multispeed_fixed_fiber - Set MAC link speed
  *  @hw: pointer to hardware structure
  *  @speed: new link speed
- *  @autoneg: true if autonegotiation enabled
  *  @autoneg_wait_to_complete: true when waiting for completion is needed
  *
  *  Set the link speed in the AUTOC register and restarts link.
  **/
 static s32
 ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
-				     ixgbe_link_speed speed, bool autoneg,
+				     ixgbe_link_speed speed,
 				     bool autoneg_wait_to_complete)
 {
 	s32 status = IXGBE_SUCCESS;
@@ -168,7 +167,6 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
 
 		status = ixgbe_setup_mac_link_82599(hw,
 						    IXGBE_LINK_SPEED_10GB_FULL,
-						    autoneg,
 						    autoneg_wait_to_complete);
 		if (status != IXGBE_SUCCESS)
 			return status;
@@ -217,7 +215,6 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
 
 		status = ixgbe_setup_mac_link_82599(hw,
 						    IXGBE_LINK_SPEED_1GB_FULL,
-						    autoneg,
 						    autoneg_wait_to_complete);
 		if (status != IXGBE_SUCCESS)
 			return status;
@@ -244,7 +241,7 @@ ixgbe_setup_mac_link_multispeed_fixed_fiber(struct ixgbe_hw *hw,
 	 */
 	if (speedcnt > 1)
 		status = ixgbe_setup_mac_link_multispeed_fixed_fiber(hw,
-			highest_link_speed, autoneg, autoneg_wait_to_complete);
+			highest_link_speed, autoneg_wait_to_complete);
 
 out:
 	/* Set autoneg_advertised value based on input link speed */
-- 
1.7.7.6

Re: [dpdk-dev] [PATCH]Upgrade NIC share codes: fix a compilation error when RTE_NIC_BYPASS=y

[Thomas Monjalon]

2014-05-29 16:47, Jijiang Liu:
> There is a compilation error using latest NIC share codes when
> RTE_NIC_BYPASS=y, the root cause is that the setup_link API have already
> changed in the share codes, so change
> ixgbe_setup_mac_link_multispeed_fixed_fiber() for eliminating the
> compilation error.
> 
> Signed-off-by: jijiangl <jijiang.liu@intel.com>
> Tested-by: Waterman Cao <waterman.cao@intel.com>

It is merged in this commit:
	http://dpdk.org/browse/dpdk/commit/?id=8ef32003772a
Thanks
-- 
Thomas