From patchwork Fri Nov 6 07:48:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Helin" X-Patchwork-Id: 8747 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 558498E6A; Fri, 6 Nov 2015 08:48:51 +0100 (CET) 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) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 05 Nov 2015 23:48:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,251,1444719600"; d="scan'208";a="828896122" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga001.fm.intel.com with ESMTP; 05 Nov 2015 23:48:47 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id tA67mjLP007518; Fri, 6 Nov 2015 15:48:45 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id tA67mfiT001268; Fri, 6 Nov 2015 15:48:43 +0800 Received: (from hzhan75@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tA67mf6H001264; Fri, 6 Nov 2015 15:48:41 +0800 From: Helin Zhang To: dev@dpdk.org Date: Fri, 6 Nov 2015 15:48:35 +0800 Message-Id: <1446796116-1219-3-git-send-email-helin.zhang@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1446796116-1219-1-git-send-email-helin.zhang@intel.com> References: <1446796116-1219-1-git-send-email-helin.zhang@intel.com> Subject: [dpdk-dev] [PATCH 2/3] i40e: fix ICC compile issue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list 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++) {