From nobody Mon Apr 28 16:30:53 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZmTTV40Hxz5vYck; Mon, 28 Apr 2025 16:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmTTT75jsz3WPB; Mon, 28 Apr 2025 16:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745857854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4pj2hN4HvzVL9Cq3ZIQjhdsOiZr54KGGbFJ36JPANo=; b=Pn/Cx8f8vAgJ9IGwA9csNW+PPxVWc7qG4vn/tIi3wRhpr7NxOQuM2fpFSP3YrTffIQIghY mIfLJFGwdKS85PCMqyt8q1ZcVVraDbbDDPXeH16MfVdUnRu4aU5KWGb7TLAmnlWXJQp+uP e36DC3rxH91+6jMNodNFR7eOFhz0mWIDF1JcCFDBP3jVz34GSHo/SUor11kLnol68gXihp cygeniElcb0rOvFCKNRf2aZmsUdzLedkOwam1FG6DQM1dJagnvTcPVZ3YQS+Ssiu2KGgMx LqInKsSssz7HwSK6jAA3zbGQl7/zMgZHX8mIx28Wjj2bZwwI/8Qyo+Jqe9xt1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745857854; a=rsa-sha256; cv=none; b=sQ1o7aWqYxG9Hbc5W7cqtUcOolOcNGpeflPgbZmrChUKcGEgrZwVajqWSh8NDvacgKirHQ 5UrdyWf0Hdg/Ue2iRA6JvB0b4UJ4Hvfy2rekGuXHeNPCdbb/cFZ8C301/OeWo087HpXtDG rrxbZ0MfcD8MRSx/4VEFLgS8gpnew/GpXNGAS2i02W0UfldYMd6+8FG5GN0MU0TvQ4QiB0 hyKKXMDcWq1eNTDWlWNEwhV3S0xC1mFAqTiP/zwGdalwVV80zWYCfWHK4Ok1UMrquuGVxu ydnu/0BCGcebLXsrUkApTNB6c70pd9IP0ipbUCuefAsnyAbTbQ2RHlVUxLxO/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745857854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a4pj2hN4HvzVL9Cq3ZIQjhdsOiZr54KGGbFJ36JPANo=; b=LSfyJ8fDmafMYeEP0Zr+q+EWwPG+Ojtp17UDTkYpqVDxlNwNrUUIjvgGCnTVfBZji35khy mGJIsHvO66MUXqdig4MHYiGz8nIS9lH9pg+HmpR9o0oWjzwmTzhvFJsJrW4WlhGvHx+2CJ h/oAM1PO/tnwsSOWw8pBz4WlaaovqA8eQ560LfrOuYcq780E1hv7yi+T7s3w7DDcd0yqz0 53AhuIymaAJrrPaHFlC8UmsPNdpR6S2b3gVmjWnqVZAo6EJujLXUp4LrmQz7R2xQd8pdal S+7YLHXNKnLwRVYHgeFS1Ow1kD3ebrJF4yRiDlZuAOH81020UiampQ4s7JtJ6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZmTTT6js4zjYj; Mon, 28 Apr 2025 16:30:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53SGUrYj088524; Mon, 28 Apr 2025 16:30:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SGUrHN088507; Mon, 28 Apr 2025 16:30:53 GMT (envelope-from git) Date: Mon, 28 Apr 2025 16:30:53 GMT Message-Id: <202504281630.53SGUrHN088507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 283da05b7d94 - main - vtnet(4): Small fix to style so that it follows the styleguide List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283da05b7d9477e1633a37be17ebd086dabfe152 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=283da05b7d9477e1633a37be17ebd086dabfe152 commit 283da05b7d9477e1633a37be17ebd086dabfe152 Author: Bjoern Jakobsen AuthorDate: 2025-04-28 06:07:23 +0000 Commit: Warner Losh 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 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)))