 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_vioif.c,v 1.99 2023/03/23 02:48:29 yamaguchi Exp $	*/
+/*	$NetBSD: if_vioif.c,v 1.100 2023/03/23 02:52:29 yamaguchi Exp $	*/
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
  * Copyright (c) 2010 Minoura Makoto.
  * 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
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.99 2023/03/23 02:48:29 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.100 2023/03/23 02:52:29 yamaguchi Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/condvar.h>
 #include <sys/device.h>
 #include <sys/evcnt.h>
 @@ -316,27 +316,27 @@ struct vioif_softc {
 	int			sc_max_nvq_pairs;
 	int			sc_req_nvq_pairs;
 	int			sc_act_nvq_pairs;
 	uint8_t			sc_mac[ETHER_ADDR_LEN];
 	struct ethercom		sc_ethercom;
 	int			sc_link_state;
 	struct vioif_netqueue	*sc_netqs;
 	bool			sc_has_ctrl;
 	struct vioif_ctrlqueue	sc_ctrlq;
-	bus_dma_segment_t	sc_hdr_segs[1];
+	bus_dma_segment_t	 sc_segs[1];
 	void			*sc_dmamem;
 	void			*sc_kmem;
 	void			*sc_ctl_softint;
 	struct workqueue	*sc_txrx_workqueue;
 	bool			 sc_txrx_workqueue_sysctl;
 	u_int			 sc_tx_intr_process_limit;
 	u_int			 sc_tx_process_limit;
 	u_int			 sc_rx_intr_process_limit;
 	u_int			 sc_rx_process_limit;
 };
 #define VIRTIO_NET_TX_MAXNSEGS		(16) /* XXX */
 @@ -742,34 +742,34 @@ vioif_alloc_mems(struct vioif_softc *sc)
 	if (sc->sc_has_ctrl) {
 		dmamemsize += sizeof(struct virtio_net_ctrl_cmd);
 		dmamemsize += sizeof(struct virtio_net_ctrl_status);
 		dmamemsize += sizeof(struct virtio_net_ctrl_rx);
 		dmamemsize += sizeof(struct virtio_net_ctrl_mac_tbl)
 		    + ETHER_ADDR_LEN;
 		dmamemsize += sizeof(struct virtio_net_ctrl_mac_tbl)
 		    + ETHER_ADDR_LEN * VIRTIO_NET_CTRL_MAC_MAXENTRIES;
 		dmamemsize += sizeof(struct virtio_net_ctrl_mac_addr);
 		dmamemsize += sizeof(struct virtio_net_ctrl_mq);
+	}
 	r = bus_dmamem_alloc(virtio_dmat(vsc), dmamemsize, 0, 0,
-	    &sc->sc_hdr_segs[0], 1, &rsegs, BUS_DMA_NOWAIT);
+	    &sc->sc_segs[0], 1, &rsegs, BUS_DMA_NOWAIT);
 	if (r != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "DMA memory allocation failed, size %zu, "
 		    "error code %d\n", dmamemsize, r);
 		goto err_none;
+	}
-	r = bus_dmamem_map(virtio_dmat(vsc),&sc->sc_hdr_segs[0], 1,
+	r = bus_dmamem_map(virtio_dmat(vsc), &sc->sc_segs[0], 1,
 	    dmamemsize, &vaddr, BUS_DMA_NOWAIT);
 	if (r != 0) {
 		aprint_error_dev(sc->sc_dev,
 		    "DMA memory map failed, error code %d\n", r);
 		goto err_dmamem_alloc;
+	}
 	/* assign DMA memory */
 	memset(vaddr, 0, dmamemsize);
 	sc->sc_dmamem = vaddr;
 	p = (intptr_t) vaddr;
 	for (qid = 0; qid < netq_num; qid++) {
 @@ -943,27 +943,27 @@ err_reqs:
 		maps = sc->sc_netqs[qid].netq_maps;
 		for (i = 0; i < vq_num; i++) {
 			vioif_dmamap_destroy(sc, &maps[i].vnm_mbuf_map);
 			vioif_dmamap_destroy(sc, &maps[i].vnm_hdr_map);
+		}
+	}
 	if (sc->sc_kmem) {
 		kmem_free(sc->sc_kmem, kmemsize);
 		sc->sc_kmem = NULL;
+	}
 	bus_dmamem_unmap(virtio_dmat(vsc), sc->sc_dmamem, dmamemsize);
 err_dmamem_alloc:
-	bus_dmamem_free(virtio_dmat(vsc), &sc->sc_hdr_segs[0], 1);
+	bus_dmamem_free(virtio_dmat(vsc), &sc->sc_segs[0], 1);
 err_none:
 	return -1;
+}
 static void
 vioif_attach(device_t parent, device_t self, void *aux)
+{
 	struct vioif_softc *sc = device_private(self);
 	struct virtio_softc *vsc = device_private(parent);
 	struct vioif_netqueue *txq0;
 	struct vioif_ctrlqueue *ctrlq = &sc->sc_ctrlq;
 	uint64_t features, req_features;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;