From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E36F9A0513 for ; Thu, 16 Jan 2020 02:20:11 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B46B81C12E; Thu, 16 Jan 2020 02:20:11 +0100 (CET) Received: from m12-14.163.com (m12-14.163.com [220.181.12.14]) by dpdk.org (Postfix) with ESMTP id 770541C066; Thu, 16 Jan 2020 02:20:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=7jePVSqw7IbtidwKiO CqpmGU7m7Ixlj4L6BwSL9ck3A=; b=YrXt5L/rA1e/Rtt9ByHjCSzdjskeNOl8sr 9Bj5d4uElh019TAhuX973qSRjwvBFLaJrVKi8BLsPtX4X8p3yudM9x9/R7SXezXz TzO1PNI/Xo5F3VrCCLHhTOqDB8w6io5J+slEzaToSrQbSupY5YNDJvRpPcZQ2Gfy DkcUFy2lE= Received: from localhost.localdomain (unknown [106.38.115.16]) by smtp10 (Coremail) with SMTP id DsCowACXzSY_uh9eTACxMQ--.61961S2; Thu, 16 Jan 2020 09:20:03 +0800 (CST) From: Zhike Wang To: dev@dpdk.org Cc: beilei.xing@intel.com, qi.z.zhang@intel.com, stable@dpdk.org, Zhike Wang Date: Thu, 16 Jan 2020 09:19:57 +0800 Message-Id: <1579137597-14076-1-git-send-email-wangzhike@jd.com> X-Mailer: git-send-email 1.8.3.1 X-CM-TRANSID: DsCowACXzSY_uh9eTACxMQ--.61961S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7GFWxtr1fGr1DWw1xGFW5Awb_yoWfuFX_Gr 1kCr1fArs8Arn29rW8CFs5JFWrt34vqr1kuFy2v3s5W3yDZr18Zr10vrn3twnrWanFk3W7 uw1ftrya9ry2kjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0GYLPUUUUU== X-Originating-IP: [106.38.115.16] X-CM-SenderInfo: pzdqw6bntsiqqrwthudrp/1tbiTRasulc7O+FGaQAAsU Subject: [dpdk-stable] [PATCH] net/i40e: fix X722 judgement when disable adminq operation X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" X722 SFPs have different flavors, eg I40E_DEV_ID_SFP_X722 /I40E_DEV_ID_SFP_I_X722. So instead we use mac.type to judge whether it is X722 or not. Fixes: 9efa8d28b ("net/i40e: fix SFP X722 with FW4.16") Signed-off-by: Zhike Wang --- drivers/net/i40e/i40e_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 5999c96..85ccb76 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1443,7 +1443,7 @@ static inline void i40e_config_automask(struct i40e_pf *pf) return -EIO; } /* Firmware of SFP x722 does not support adminq option */ - if (hw->device_id == I40E_DEV_ID_SFP_X722) + if (hw->mac.type == I40E_MAC_X722) hw->flags &= ~I40E_HW_FLAG_802_1AD_CAPABLE; PMD_INIT_LOG(INFO, "FW %d.%d API %d.%d NVM %02d.%02d.%02d eetrack %04x", -- 1.8.3.1