aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid C Somayajulu <davidcs@FreeBSD.org>2018-05-09 21:50:20 +0000
committerDavid C Somayajulu <davidcs@FreeBSD.org>2018-05-09 21:50:20 +0000
commitf8c0c096a4f5299555e682af12146d82e92eaaaf (patch)
treeea6aa58bcac6bab5b3adc8dd09e3e0ef3c802105
parent5a2057c18dbb73d8cf762ccb40341da9adcc52d9 (diff)
Notes
-rw-r--r--sys/dev/bxe/bxe.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 7f5a7c6229da..2b018f865229 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"
@@ -12001,11 +12001,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;
@@ -12041,6 +12040,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);
}