d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/ixgbe/base: fix build error

Browse Source 
Fix ICC build error by removing the EWARN third parameter.

Build error:
.../drivers/net/ixgbe/base/ixgbe_phy.c(1543):
	error #268: the format string ends before this argument
			EWARN(hw, "WARNING: Intel (R) Network "
			^

.../drivers/net/ixgbe/base/ixgbe_phy.c(1805):
	error #268: the format string ends before this argument
			EWARN(hw, "WARNING: Intel (R) Network "
			^

Fixes: aa4fc14d2cee ("ixgbe: update base driver")
Fixes: b94a06c1b451 ("ixgbe/base: support qsfp and lco")
Cc: stable@dpdk.org

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
This commit is contained in:
Wenzhuo Lu 2017-03-01 14:04:51 +08:00 committed by Ferruh Yigit
parent 6b3e9c956c
commit 9dad5b9e89
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/net/ixgbe/base/ixgbe_phy.c
View File

@ -1540,16 +1540,10 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
status = IXGBE_SUCCESS; status = IXGBE_SUCCESS;
} else { } else {
if (hw->allow_unsupported_sfp == true) { if (hw->allow_unsupported_sfp == true) {
EWARN(hw, "WARNING: Intel (R) Network " EWARN(hw,
"Connections are quality tested " "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. "
"using Intel (R) Ethernet Optics." "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. "
" Using untested modules is not " "Intel Corporation is not responsible for any harm caused by using untested modules.\n");
"supported and may cause unstable"
" operation or damage to the "
"module or the adapter. Intel "
"Corporation is not responsible "
"for any harm caused by using "
"untested modules.\n", status);
status = IXGBE_SUCCESS; status = IXGBE_SUCCESS;
} else { } else {
DEBUGOUT("SFP+ module not supported\n"); DEBUGOUT("SFP+ module not supported\n");
@ -1802,16 +1796,10 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw)
status = IXGBE_SUCCESS; status = IXGBE_SUCCESS;
} else { } else {
if (hw->allow_unsupported_sfp == true) { if (hw->allow_unsupported_sfp == true) {
EWARN(hw, "WARNING: Intel (R) Network " EWARN(hw,
"Connections are quality tested " "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. "
"using Intel (R) Ethernet Optics." "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. "
" Using untested modules is not " "Intel Corporation is not responsible for any harm caused by using untested modules.\n");
"supported and may cause unstable"
" operation or damage to the "
"module or the adapter. Intel "
"Corporation is not responsible "
"for any harm caused by using "
"untested modules.\n", status);
status = IXGBE_SUCCESS; status = IXGBE_SUCCESS;
} else { } else {
DEBUGOUT("QSFP module not supported\n"); DEBUGOUT("QSFP module not supported\n");
@ -1836,7 +1824,6 @@ err_read_i2c_eeprom:
return IXGBE_ERR_SFP_NOT_PRESENT; return IXGBE_ERR_SFP_NOT_PRESENT;
} }
/** /**
* ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence * ixgbe_get_sfp_init_sequence_offsets - Provides offset of PHY init sequence
* @hw: pointer to hardware structure * @hw: pointer to hardware structure