d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/sfc: fix setting empty multicast list

Browse Source 
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 <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
This commit is contained in:
Ivan Malov 2017-02-01 08:17:11 +00:00 committed by Ferruh Yigit
parent 05d7777b6f
commit e9ddf37a50
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/sfc/sfc_ethdev.c
View File

@ -805,8 +805,7 @@ sfc_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *mc_addr_set,
uint32_t nb_mc_addr) uint32_t nb_mc_addr)
{ {
struct sfc_adapter *sa = dev->data->dev_private; struct sfc_adapter *sa = dev->data->dev_private;
uint8_t *mc_addrs_p; uint8_t *mc_addrs_p = NULL;
uint8_t *mc_addrs;
int rc; int rc;
unsigned int i; unsigned int i;
@ -816,16 +815,20 @@ sfc_set_mc_addr_list(struct rte_eth_dev *dev, struct ether_addr *mc_addr_set,
return -EINVAL; return -EINVAL;
} }
mc_addrs_p = rte_calloc("mc-addrs", nb_mc_addr, EFX_MAC_ADDR_LEN, 0); if (nb_mc_addr != 0) {
if (mc_addrs_p == NULL) uint8_t *mc_addrs;
return -ENOMEM;
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) { mc_addrs = mc_addrs_p;
(void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes, for (i = 0; i < nb_mc_addr; ++i) {
EFX_MAC_ADDR_LEN); (void)rte_memcpy(mc_addrs, mc_addr_set[i].addr_bytes,
mc_addrs += EFX_MAC_ADDR_LEN; EFX_MAC_ADDR_LEN);
mc_addrs += EFX_MAC_ADDR_LEN;
}
} }
rc = efx_mac_multicast_list_set(sa->nic, mc_addrs_p, nb_mc_addr); rc = efx_mac_multicast_list_set(sa->nic, mc_addrs_p, nb_mc_addr);