From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shaopeng He Subject: [PATCH] fm10k: fix an error message when adding default VLAN Date: Fri, 26 Jun 2015 10:37:26 +0800 Message-ID: <1435286246-22170-1-git-send-email-shaopeng.he@intel.com> Cc: Shaopeng He To: dev@dpdk.org Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 18038C79C for ; Fri, 26 Jun 2015 04:37:35 +0200 (CEST) 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" The default MAC address is directly copied to Device Ethernet Link address array in the device initialize phase, which bypasses fm10k MAC address number check mechanism, and will cause an error message when adding default VLAN. Fix it by moving default MAC address registration to device initialize phase. Signed-off-by: Shaopeng He --- drivers/net/fm10k/fm10k_ethdev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 406c350..df32665 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -791,14 +791,10 @@ fm10k_dev_start(struct rte_eth_dev *dev) } } - if (hw->mac.default_vid && hw->mac.default_vid <= ETHER_MAX_VLAN_ID) { - /* Update default vlan */ + /* Update default vlan */ + if (hw->mac.default_vid && hw->mac.default_vid <= ETHER_MAX_VLAN_ID) fm10k_vlan_filter_set(dev, hw->mac.default_vid, true); - /* Add default mac/vlan filter to PF/Switch manager */ - fm10k_MAC_filter_set(dev, hw->mac.addr, true); - } - return 0; } @@ -2144,6 +2140,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) fm10k_mbx_unlock(hw); + /* Add default mac address */ + fm10k_MAC_filter_set(dev, hw->mac.addr, true); return 0; } -- 1.9.3