From patchwork Thu Dec 28 02:12:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chas Williams <3chas3@gmail.com> X-Patchwork-Id: 32775 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 38B781B243; Thu, 28 Dec 2017 03:12:39 +0100 (CET) Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by dpdk.org (Postfix) with ESMTP id 1DCA81B1BC for ; Thu, 28 Dec 2017 03:12:38 +0100 (CET) Received: by mail-qk0-f195.google.com with SMTP id a8so10929278qkb.8 for ; Wed, 27 Dec 2017 18:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fAoH7P+28HJxKJXB7zGv+ccg4LxRyykXxdE0WSsmuHw=; b=U1xF/njf6ld4vfqGgNUJamjSjIT2CPPxoHnuhuXRlLcBYADJ6eO2zmyyYpN9HlB5+Q 8FhG29gV7F1TqdusEy8y1RuRSnFxy72INPGCrNER5LiIHZbnGyu/BpHQ9vx5M35uzOiC Tre2A6OF6Xm8b5vWKSnA2rFW/rOy8tgRSd+oa7jMBCiYcK1QlZ6LpM+54psKFhpQKD1Z P4ebE3N4w2JZl9gLTFIY9dc9m/ZqjMGatimjkVzIgvZGqddbjbw+ST9OSGEJ1bbZzuVR 0kyafmNVkcDFCRoGlRlBJmMXubLb+/KRzdr6tYdmcRvvO/JVxo1a+CjuBMmem2Wto4KQ yI5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fAoH7P+28HJxKJXB7zGv+ccg4LxRyykXxdE0WSsmuHw=; b=g3r4JzdOLgCRVQLhzVkqeabdd6YxEFa62eARUHBB/6R5QPcw7svcjHMC4n/l0+D2sL JmjmOPe252WxlJNjj53cSRcHxNn+rXY8tHd4sxIt9ZP219zDrpknIOBNp8XFIpQhnCHj ht+IMPzHfYNgdWmN55L4hWtHT1ig0jyKvgvmR+bx+ROZgPfLE6d6Apvl/80HyAwT26ja DqvhMUspZspwew9h0GCZBR3WoPUXm8f1bJ6HaqVZqwdhcwfnPqJEWnjcj5Tq6lDS6J6j C3xSxBtQ4QNFBuk48xdKBZ7EpCV9V0nUysB605s4kkUtJAMxsW42NhM6CFcbKyyP0ozg XRtA== X-Gm-Message-State: AKGB3mIx69LfgiHNbWFMK0nQTnTAUOjFO5q8RXyRiCpzoKsv04HcKzM7 TV0vkGvijE/mUGKQQ9g5iyUDDQ== X-Google-Smtp-Source: ACJfBosmRCj1mkMYWrPv95+LTw0fDVuyff7RbHXtOfMj7FBW0SPFu3IzIbYyNqWspnigbS+eZhwxiQ== X-Received: by 10.55.112.199 with SMTP id l190mr31427041qkc.220.1514427157391; Wed, 27 Dec 2017 18:12:37 -0800 (PST) Received: from monolith.home (pool-173-79-224-159.washdc.fios.verizon.net. [173.79.224.159]) by smtp.gmail.com with ESMTPSA id r17sm10525760qtb.95.2017.12.27.18.12.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Dec 2017 18:12:36 -0800 (PST) From: Chas Williams <3chas3@gmail.com> To: dev@dpdk.org Cc: declan.doherty@intel.com, Chas Williams Date: Wed, 27 Dec 2017 21:12:31 -0500 Message-Id: <20171228021231.15363-1-3chas3@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [dpdk-dev] [PATCH] net/bonding: set slave MAC addresses correctly X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Chas Williams Use rte_eth_dev_default_mac_addr_set() to change a slave MAC address. mac_address_set() only updates the software copy and does nothing to update the hardware. Signed-off-by: Chas Williams Acked-by: Declan Doherty --- drivers/net/bonding/rte_eth_bond_api.c | 2 +- drivers/net/bonding/rte_eth_bond_pmd.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index 703bb39..532683b 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -453,7 +453,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, &rte_eth_devices[bonded_port_id].data->port_id); /* Restore original MAC address of slave device */ - mac_address_set(&rte_eth_devices[slave_port_id], + rte_eth_dev_default_mac_addr_set(slave_port_id, &(internals->slaves[slave_idx].persisted_mac_addr)); slave_eth_dev = &rte_eth_devices[slave_port_id]; diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index d1d3663..02688f7 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1511,7 +1511,8 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) case BONDING_MODE_BALANCE: case BONDING_MODE_BROADCAST: for (i = 0; i < internals->slave_count; i++) { - if (mac_address_set(&rte_eth_devices[internals->slaves[i].port_id], + if (rte_eth_dev_default_mac_addr_set( + internals->slaves[i].port_id, bonded_eth_dev->data->mac_addrs)) { RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address", internals->slaves[i].port_id); @@ -1529,15 +1530,16 @@ mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) for (i = 0; i < internals->slave_count; i++) { if (internals->slaves[i].port_id == internals->current_primary_port) { - if (mac_address_set(&rte_eth_devices[internals->primary_port], + if (rte_eth_dev_default_mac_addr_set( + internals->primary_port, bonded_eth_dev->data->mac_addrs)) { RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address", internals->current_primary_port); return -1; } } else { - if (mac_address_set( - &rte_eth_devices[internals->slaves[i].port_id], + if (rte_eth_dev_default_mac_addr_set( + internals->slaves[i].port_id, &internals->slaves[i].persisted_mac_addr)) { RTE_BOND_LOG(ERR, "Failed to update port Id %d MAC address", internals->slaves[i].port_id);