diff options
| author | David C Somayajulu <davidcs@FreeBSD.org> | 2015-06-30 20:40:38 +0000 |
|---|---|---|
| committer | David C Somayajulu <davidcs@FreeBSD.org> | 2015-06-30 20:40:38 +0000 |
| commit | b9672ecc6cf3a49ec717759774a601a7064b896c (patch) | |
| tree | 9cd34186bf8ec1ff7cab5a7c53c31d4d3f705ce7 | |
| parent | 190c8e68c1aaab48980f09bf80774f3f90db11f2 (diff) | |
Notes
| -rw-r--r-- | sys/dev/bxe/bxe.c | 2 | ||||
| -rw-r--r-- | sys/dev/bxe/ecore_sp.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index c71ecdf54f77..f260d71d8780 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -12546,6 +12546,7 @@ bxe_init_mcast_macs_list(struct bxe_softc *sc, BLOGE(sc, "Failed to allocate temp mcast list\n"); return (-1); } + bzero(mc_mac, (sizeof(*mc_mac) * mc_count)); TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) { @@ -12596,6 +12597,7 @@ bxe_set_mc_list(struct bxe_softc *sc) rc = ecore_config_mcast(sc, &rparam, ECORE_MCAST_CMD_DEL); if (rc < 0) { BLOGE(sc, "Failed to clear multicast configuration: %d\n", rc); + BXE_MCAST_UNLOCK(sc); return (rc); } diff --git a/sys/dev/bxe/ecore_sp.c b/sys/dev/bxe/ecore_sp.c index b716085222de..2685453a68c9 100644 --- a/sys/dev/bxe/ecore_sp.c +++ b/sys/dev/bxe/ecore_sp.c @@ -474,7 +474,7 @@ static void __ecore_vlan_mac_h_exec_pending(struct bxe_softc *sc, o->head_exe_request = FALSE; o->saved_ramrod_flags = 0; rc = ecore_exe_queue_step(sc, &o->exe_queue, &ramrod_flags); - if (rc != ECORE_SUCCESS) { + if ((rc != ECORE_SUCCESS) && (rc != ECORE_PENDING)) { ECORE_ERR("execution of pending commands failed with rc %d\n", rc); #ifdef ECORE_STOP_ON_ERROR |