From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steve Shin Subject: [PATCH v2] ethdev: fix MAC address replay Date: Fri, 20 Jan 2017 14:23:49 -0800 Message-ID: <20170120222349.14567-1-jonshin@cisco.com> References: <20170119184721.22348-1-jonshin@cisco.com> Cc: ferruh.yigit@intel.com, iryzhov@nfware.com, Steve Shin To: dev@dpdk.org Return-path: Received: from rcdn-iport-7.cisco.com (rcdn-iport-7.cisco.com [173.37.86.78]) by dpdk.org (Postfix) with ESMTP id 19EF6100F for ; Fri, 20 Jan 2017 23:24:19 +0100 (CET) In-Reply-To: <20170119184721.22348-1-jonshin@cisco.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes a bug in replaying MAC address to the hardware in rte_eth_dev_config_restore() routine. Added default MAC replay as well. Fixes: 4bdefaade6d1 ("ethdev: VMDQ enhancements") --- v2: Added default MAC replay & Code optimization Signed-off-by: Steve Shin --- lib/librte_ether/rte_ethdev.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 4790faf..150f350 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -931,7 +931,7 @@ rte_eth_dev_config_restore(uint8_t port_id) { struct rte_eth_dev *dev; struct rte_eth_dev_info dev_info; - struct ether_addr addr; + struct ether_addr *addr; uint16_t i; uint32_t pool = 0; @@ -942,23 +942,23 @@ rte_eth_dev_config_restore(uint8_t port_id) if (RTE_ETH_DEV_SRIOV(dev).active) pool = RTE_ETH_DEV_SRIOV(dev).def_vmdq_idx; - /* replay MAC address configuration */ - for (i = 0; i < dev_info.max_mac_addrs; i++) { - addr = dev->data->mac_addrs[i]; + /* replay MAC address configuration including default MAC */ + if (*dev->dev_ops->mac_addr_set != NULL) { + addr = &dev->data->mac_addrs[0]; + (*dev->dev_ops->mac_addr_set)(dev, addr); + } - /* skip zero address */ - if (is_zero_ether_addr(&addr)) - continue; + if (*dev->dev_ops->mac_addr_add != NULL) { + for (i = 1; i < dev_info.max_mac_addrs; i++) { + addr = &dev->data->mac_addrs[i]; - /* add address to the hardware */ - if (*dev->dev_ops->mac_addr_add && - (dev->data->mac_pool_sel[i] & (1ULL << pool))) - (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool); - else { - RTE_PMD_DEBUG_TRACE("port %d: MAC address array not supported\n", - port_id); - /* exit the loop but not return an error */ - break; + /* skip zero address */ + if (is_zero_ether_addr(addr)) + continue; + + /* add address to the hardware */ + if (dev->data->mac_pool_sel[i] & (1ULL << pool)) + (*dev->dev_ops->mac_addr_add)(dev, addr, i, pool); } } -- 2.9.3