git: 283da05b7d94 - main - vtnet(4): Small fix to style so that it follows the styleguide
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 28 Apr 2025 16:30:53 UTC
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=283da05b7d9477e1633a37be17ebd086dabfe152 commit 283da05b7d9477e1633a37be17ebd086dabfe152 Author: Bjoern Jakobsen <Bjoern.Jakobsen@lrz.de> AuthorDate: 2025-04-28 06:07:23 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-04-28 16:30:36 +0000 vtnet(4): Small fix to style so that it follows the styleguide Signed-off-by: Bjoern Jakobsen <Bjoern.Jakobsen@lrz.de> Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1679 --- sys/dev/virtio/network/if_vtnet.c | 8 ++++---- sys/dev/virtio/network/if_vtnetvar.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index cf512b73de81..5060861ca7e0 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -657,7 +657,7 @@ vtnet_negotiate_features(struct vtnet_softc *sc) mtu = virtio_read_dev_config_2(dev, offsetof(struct virtio_net_config, mtu)); - if (mtu < VTNET_MIN_MTU /* || mtu > VTNET_MAX_MTU */) { + if (mtu < VTNET_MIN_MTU) { device_printf(dev, "Invalid MTU value: %d. " "MTU feature disabled.\n", mtu); features &= ~VIRTIO_NET_F_MTU; @@ -1037,19 +1037,19 @@ vtnet_alloc_virtqueues(struct vtnet_softc *sc) "%s-rx%d", device_get_nameunit(dev), rxq->vtnrx_id); txq = &sc->vtnet_txqs[i]; - VQ_ALLOC_INFO_INIT(&info[idx+1], sc->vtnet_tx_nsegs, + VQ_ALLOC_INFO_INIT(&info[idx + 1], sc->vtnet_tx_nsegs, vtnet_tx_vq_intr, txq, &txq->vtntx_vq, "%s-tx%d", device_get_nameunit(dev), txq->vtntx_id); } /* These queues will not be used so allocate the minimum resources. */ - for (/**/; i < sc->vtnet_max_vq_pairs; i++, idx += 2) { + for (; i < sc->vtnet_max_vq_pairs; i++, idx += 2) { rxq = &sc->vtnet_rxqs[i]; VQ_ALLOC_INFO_INIT(&info[idx], 0, NULL, rxq, &rxq->vtnrx_vq, "%s-rx%d", device_get_nameunit(dev), rxq->vtnrx_id); txq = &sc->vtnet_txqs[i]; - VQ_ALLOC_INFO_INIT(&info[idx+1], 0, NULL, txq, &txq->vtntx_vq, + VQ_ALLOC_INFO_INIT(&info[idx + 1], 0, NULL, txq, &txq->vtntx_vq, "%s-tx%d", device_get_nameunit(dev), txq->vtntx_id); } diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index d690ad3bf63c..46dad385345d 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -374,7 +374,7 @@ CTASSERT(((VTNET_TX_SEGS_MAX - 1) * MCLBYTES) >= VTNET_MAX_MTU); */ #define VTNET_DEFAULT_BUFRING_SIZE 4096 -#define VTNET_CORE_MTX(_sc) &(_sc)->vtnet_mtx +#define VTNET_CORE_MTX(_sc) (&(_sc)->vtnet_mtx) #define VTNET_CORE_LOCK(_sc) mtx_lock(VTNET_CORE_MTX((_sc))) #define VTNET_CORE_UNLOCK(_sc) mtx_unlock(VTNET_CORE_MTX((_sc))) #define VTNET_CORE_LOCK_DESTROY(_sc) mtx_destroy(VTNET_CORE_MTX((_sc)))