aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid C Somayajulu <davidcs@FreeBSD.org>2018-05-09 20:22:09 +0000
committerDavid C Somayajulu <davidcs@FreeBSD.org>2018-05-09 20:22:09 +0000
commit361c245571a0ef2e7b03680f66be2c1edf77a0f0 (patch)
tree89c3698f8ce17bbf9634fc356cfa0beedf52ca8d
parentac3beda956acb85906a4cb67c6071bf35dbc0d7d (diff)
Notes
-rw-r--r--sys/dev/bxe/bxe.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 1571b477af41..0e2c42fc1136 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#define BXE_DRIVER_VERSION "1.78.90"
+#define BXE_DRIVER_VERSION "1.78.91"
#include "bxe.h"
#include "ecore_sp.h"
@@ -12041,11 +12041,10 @@ bxe_init_mcast_macs_list(struct bxe_softc *sc,
ECORE_LIST_PUSH_TAIL(&mc_mac->link, &p->mcast_list);
BLOGD(sc, DBG_LOAD,
- "Setting MCAST %02X:%02X:%02X:%02X:%02X:%02X\n",
+ "Setting MCAST %02X:%02X:%02X:%02X:%02X:%02X and mc_count %d\n",
mc_mac->mac[0], mc_mac->mac[1], mc_mac->mac[2],
- mc_mac->mac[3], mc_mac->mac[4], mc_mac->mac[5]);
-
- mc_mac++;
+ mc_mac->mac[3], mc_mac->mac[4], mc_mac->mac[5], mc_count);
+ mc_mac++;
}
p->mcast_list_len = mc_count;
@@ -12053,6 +12052,7 @@ bxe_init_mcast_macs_list(struct bxe_softc *sc,
return (0);
}
+
static void
bxe_free_mcast_macs_list(struct ecore_mcast_ramrod_params *p)
{
@@ -12081,6 +12081,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);
+ /* Manual backport parts of FreeBSD upstream r284470. */
BXE_MCAST_UNLOCK(sc);
return (rc);
}