[dpdk-dev] pmd: Fixed compilation error due to old RTE_DRV_LOG when bypass=y

Message ID 1412202445-7832-1-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

De Lara Guarch, Pablo Oct. 1, 2014, 10:27 p.m. UTC
  RTE_DRV_LOG macro has changed, so now it requires at least 2 arguments,
which have been added in ixgbe_bypass, specifying log type, to fix compilation error

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c |   10 +++++-----
 lib/librte_pmd_ixgbe/ixgbe_bypass.c       |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
  

Comments

Thomas Monjalon Oct. 9, 2014, 6:38 p.m. UTC | #1
2014-10-01 23:27, Pablo de Lara:
> RTE_DRV_LOG macro has changed, so now it requires at least 2 arguments,
> which have been added in ixgbe_bypass, specifying log type, to fix compilation error
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

Applied with this commit log:

ixgbe: fix build with bypass enabled
Since commit aae1047905621 ("use the right debug macro"),
DEBUGOUT was replaced by PMD_DRV_LOG which requires at least
2 arguments. But the level argument was missing.

Thanks
  

Patch

diff --git a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
index 2623419..12cc01d 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_82599_bypass.c
@@ -63,7 +63,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 		rs = IXGBE_SFF_SOFT_RS_SELECT_1G;
 		break;
 	default:
-		PMD_DRV_LOG("Invalid fixed module speed");
+		PMD_DRV_LOG(ERR, "Invalid fixed module speed");
 		return;
 	}
 
@@ -72,7 +72,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					   IXGBE_I2C_EEPROM_DEV_ADDR2,
 					   &eeprom_data);
 	if (status) {
-		PMD_DRV_LOG("Failed to read Rx Rate Select RS0");
+		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS0");
 		goto out;
 	}
 
@@ -82,7 +82,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					    IXGBE_I2C_EEPROM_DEV_ADDR2,
 					    eeprom_data);
 	if (status) {
-		PMD_DRV_LOG("Failed to write Rx Rate Select RS0");
+		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS0");
 		goto out;
 	}
 
@@ -91,7 +91,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					   IXGBE_I2C_EEPROM_DEV_ADDR2,
 					   &eeprom_data);
 	if (status) {
-		PMD_DRV_LOG("Failed to read Rx Rate Select RS1");
+		PMD_DRV_LOG(ERR, "Failed to read Rx Rate Select RS1");
 		goto out;
 	}
 
@@ -101,7 +101,7 @@  ixgbe_set_fiber_fixed_speed(struct ixgbe_hw *hw, ixgbe_link_speed speed)
 					    IXGBE_I2C_EEPROM_DEV_ADDR2,
 					    eeprom_data);
 	if (status) {
-		PMD_DRV_LOG("Failed to write Rx Rate Select RS1");
+		PMD_DRV_LOG(ERR, "Failed to write Rx Rate Select RS1");
 		goto out;
 	}
 out:
diff --git a/lib/librte_pmd_ixgbe/ixgbe_bypass.c b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
index 1a980b8..15203a4 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_bypass.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_bypass.c
@@ -114,7 +114,7 @@  ixgbe_bypass_init(struct rte_eth_dev *dev)
 	/* Only allow BYPASS ops on the first port */
 	if (hw->device_id != IXGBE_DEV_ID_82599_BYPASS ||
 			hw->bus.func != 0) {
-		PMD_DRV_LOG("bypass function is not supported on that device");
+		PMD_DRV_LOG(ERR, "bypass function is not supported on that device");
 		return;
 	}