 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_bnx.c,v 1.113 2024/02/09 22:08:35 andvar Exp $	*/
+/*	$NetBSD: if_bnx.c,v 1.114 2024/04/23 15:34:07 hans Exp $	*/
 /*	$OpenBSD: if_bnx.c,v 1.101 2013/03/28 17:21:44 brad Exp $	*/
 /*-
  * Copyright (c) 2006-2010 Broadcom Corporation
  *	David Christensen <davidch@broadcom.com>.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -25,27 +25,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if 0
 __FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.113 2024/02/09 22:08:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bnx.c,v 1.114 2024/04/23 15:34:07 hans Exp $");
 /*
  * The following controllers are supported by this driver:
  *   BCM5706C A2, A3
  *   BCM5706S A2, A3
  *   BCM5708C B1, B2
  *   BCM5708S B1, B2
  *   BCM5709C A1, C0
  *   BCM5709S A1, C0
  *   BCM5716  C0
+ *
  * The following controllers are not supported by this driver:
  *   BCM5706C A0, A1
 @@ -5657,27 +5657,27 @@ allmulti:
 /* Called periodically to updates statistics from the controllers           */
 /* statistics block.                                                        */
 /*                                                                          */
 /* Returns:                                                                 */
 /*   Nothing.                                                               */
 /****************************************************************************/
 void
 bnx_stats_update(struct bnx_softc *sc)
+{
 	struct ifnet		*ifp = &sc->bnx_ec.ec_if;
 	struct statistics_block	*stats;
 	DBPRINT(sc, BNX_EXCESSIVE, "Entering %s()\n", __func__);
-	bus_dmamap_sync(sc->bnx_dmatag, sc->status_map, 0, BNX_STATUS_BLK_SZ,
+	bus_dmamap_sync(sc->bnx_dmatag, sc->stats_map, 0, BNX_STATS_BLK_SZ,
 	    BUS_DMASYNC_POSTREAD);
 	stats = (struct statistics_block *)sc->stats_block;
 	net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
 	uint64_t value;
 	/*
 	 * Update the interface statistics from the
 	 * hardware statistics.
 	 */
 	value = (u_long)stats->stat_EtherStatsCollisions;
 	if_statadd_ref(nsr, if_collisions, value - sc->if_stat_collisions);
 @@ -6247,27 +6247,27 @@ bnx_dump_status_block(struct bnx_softc *
 		    sblk->status_cmd_consumer_index);
 	device_printf(sc->bnx_dev, "-------------------------------------------"
 	    "-----------------------------\n");
+}
 /*
  * This routine prints the statistics block.
  */
 void
 bnx_dump_stats_block(struct bnx_softc *sc)
+{
 	struct statistics_block	*sblk;
-	bus_dmamap_sync(sc->bnx_dmatag, sc->status_map, 0, BNX_STATUS_BLK_SZ,
+	bus_dmamap_sync(sc->bnx_dmatag, sc->stats_map, 0, BNX_STATS_BLK_SZ,
 	    BUS_DMASYNC_POSTREAD);
 	sblk = sc->stats_block;
 	device_printf(sc->bnx_dev, ""
 	    "-----------------------------"
 	    " Stats  Block "
 	    "-----------------------------\n");
 	BNX_PRINTF(sc, "IfHcInOctets         = 0x%08X:%08X, "
 	    "IfHcInBadOctets      = 0x%08X:%08X\n",
 	    sblk->stat_IfHCInOctets_hi, sblk->stat_IfHCInOctets_lo,
 	    sblk->stat_IfHCInBadOctets_hi, sblk->stat_IfHCInBadOctets_lo);