From mboxrd@z Thu Jan 1 00:00:00 1970 From: Helin Zhang Subject: [PATCH 2/3] i40e: fix ICC compile issue Date: Fri, 6 Nov 2015 15:48:35 +0800 Message-ID: <1446796116-1219-3-git-send-email-helin.zhang@intel.com> References: <1446796116-1219-1-git-send-email-helin.zhang@intel.com> To: dev@dpdk.org Return-path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id C1AED8E56 for ; Fri, 6 Nov 2015 08:48:48 +0100 (CET) In-Reply-To: <1446796116-1219-1-git-send-email-helin.zhang@intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" It fixes compile issue on ICC 13.0.0. Error logs: i40e_ethdev.c(7943): error #188: enumerated type mixed with another type PMD_INIT_LOG(ERR, Signed-off-by: Helin Zhang --- drivers/net/i40e/i40e_ethdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index ddf3d38..8c1809a 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -7942,7 +7942,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi) if (ret) { PMD_INIT_LOG(ERR, "couldn't get PF vsi bw config, err %s aq_err %s\n", - i40e_stat_str(hw, ret), + i40e_stat_str(hw, (enum i40e_status_code)ret), i40e_aq_str(hw, hw->aq.asq_last_status)); return -EINVAL; } @@ -7953,7 +7953,7 @@ i40e_vsi_get_bw_info(struct i40e_vsi *vsi) if (ret) { PMD_INIT_LOG(ERR, "couldn't get PF vsi ets bw config, err %s aq_err %s\n", - i40e_stat_str(hw, ret), + i40e_stat_str(hw, (enum i40e_status_code)ret), i40e_aq_str(hw, hw->aq.asq_last_status)); return -EINVAL; } @@ -8122,7 +8122,7 @@ i40e_vsi_config_tc(struct i40e_vsi *vsi, u8 tc_map) if (ret) { PMD_INIT_LOG(ERR, "Failed updating vsi bw info, err %s aq_err %s", - i40e_stat_str(hw, ret), + i40e_stat_str(hw, (enum i40e_status_code)ret), i40e_aq_str(hw, hw->aq.asq_last_status)); goto out; } @@ -8173,9 +8173,9 @@ i40e_dcb_hw_configure(struct i40e_pf *pf, if (ret) { PMD_INIT_LOG(ERR, "Set DCB Config failed, err %s aq_err %s\n", - i40e_stat_str(hw, ret), + i40e_stat_str(hw, (enum i40e_status_code)ret), i40e_aq_str(hw, hw->aq.asq_last_status)); - return ret; + return (enum i40e_status_code)ret; } /* set receive Arbiter to RR mode and ETS scheme by default */ for (i = 0; i <= I40E_PRTDCB_RETSTCC_MAX_INDEX; i++) { -- 1.8.1.4