From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Rybchenko Subject: [PATCH] net/sfc: multicast list set must not fail if list is empty Date: Wed, 1 Feb 2017 08:17:11 +0000 Message-ID: <1485937031-23172-1-git-send-email-arybchenko@solarflare.com> Mime-Version: 1.0 Content-Type: text/plain Cc: Ivan Malov To: Return-path: Received: from nbfkord-smmo03.seg.att.com (nbfkord-smmo03.seg.att.com [209.65.160.84]) by dpdk.org (Postfix) with ESMTP id 1CFDBDE5 for ; Wed, 1 Feb 2017 09:17:32 +0100 (CET) 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: Ivan Malov The patch is to fix sfc_set_mc_addr_list() behaviour in order to make it accept an empty multicast address list thus making it possible to remove multicast addresses inserted previously Fixes: 0fa0070e4391 ("net/sfc: support multicast addresses list controls") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- We have decided do not rely on rte_calloc() behaviour for 0 elements. So, a bit longer patch to handle zero elements. drivers/net/sfc/sfc_ethdev.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 3ad9ada..71587fb 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -805,8 +805,7 @@ uint32_t nb_mc_addr) { struct sfc_adapter *sa = dev->data->dev_private; - uint8_t *mc_addrs_p; - uint8_t *mc_addrs; + uint8_t *mc_addrs_p = NULL; int rc; unsigned int i; @@ -816,16 +815,20 @@ return -EINVAL; } - mc_addrs_p = rte_calloc("mc-addrs", nb_mc_addr, EFX_MAC_ADDR_LEN, 0); - if (mc_addrs_p == NULL) - return -ENOMEM; + if (nb_mc_addr != 0) { + uint8_t *mc_addrs; - mc_addrs = mc_addrs_p; + mc_addrs_p = rte_calloc("mc-addrs", nb_mc_addr, + EFX_MAC_ADDR_LEN, 0); + if (mc_addrs_p == NULL) + return -ENOMEM; - for (i = 0; i < nb_mc_addr; ++i) { - (void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes, - EFX_MAC_ADDR_LEN); - mc_addrs += EFX_MAC_ADDR_LEN; + mc_addrs = mc_addrs_p; + for (i = 0; i < nb_mc_addr; ++i) { + (void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes, + EFX_MAC_ADDR_LEN); + mc_addrs += EFX_MAC_ADDR_LEN; + } } rc = efx_mac_multicast_list_set(sa->nic, mc_addrs_p, nb_mc_addr); -- 1.8.2.3