From nobody Wed Jan 21 19:45:36 2026 X-Original-To: dev-commits-src-branches@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 4dxF6S5XMMz6PdSd for ; Wed, 21 Jan 2026 19:45:36 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dxF6S2mBzz3Ds2 for ; Wed, 21 Jan 2026 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024736; 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=EnQgS/CemYwBY9uK4sSyAl/vd9rDNA4gkMRca8UYR1Y=; b=WPCbLscla5DTmyT0VEMCvEkGfO4R2kNvLyQ0MSvnW5yTuAx2Dm6It7e7VGD6H0wAka+2qp bt/VGePPhcNZQPQ+mDTUV5qik65yIA0wCEkQsUVGXkm/H3D32LfB38Mdq8j+eZcftSM+9t /1ByGZXSBKw8TUrDi8J76NhkufQUwNgqWmK9a9fhPmy1gPxSUPhLj8xRnHvvBzuPZkx9eN UgmznpLYtCMngXPXFCMJS6bUrn8BZWG1szqa3OukZbae5YG7Bc+CyshpXfGqWUKbByXXRL 2YWS/LlfE+xKcx1P2/xgmb3YZan9v3rQJLxfi0eZDIC2VfVq85QjPNrGl2uRqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769024736; 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=EnQgS/CemYwBY9uK4sSyAl/vd9rDNA4gkMRca8UYR1Y=; b=g8DmjcdSJlfX90fo1+BGDIFBMmwD5M9J8yu2eXlJ3PVrzsHmBqHY569XlQPTKOIAxH1YLf Cd86vpNBuKx08uAyKKVKhvgD8HMeu9r+ohTP6j5e6W03DoLmpTsS5gTjjkDVM3aTV6POOF 2J3KzdqwZDFIjktmmfBIGaeS1OrRUmr+ud8kRGUwKz+IEj48XkB8cWnwSw6LFBYPs8p0o5 hgEoDSeI2aTGiQ/ar+MULkETYywiCjYuluIcVYiAPjWoCvMkjUqJwerhOAX4pgvxBCmK0T 1Y5XOYZTkEa3DTsm/2VIQzrTQbYwk67ToW9o0w3Q4pxpQ/bEFi7dxvLJICz7nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769024736; a=rsa-sha256; cv=none; b=V3n2QlsLcmr5r1iZdNLH7C290alEtisBOW7PtGOacIA+4QngACgXfa49CgDF4AFPnsb2y2 9TDrKJqU3pKRXDnNkFRoNM+b+jSuxMMkD+/d4kulgYD1OwVMBMMwooFU0PQa5LSovi7hsA CwnxaOSHwZkAM+5yV/XYOeimTa5JjzW3Z9yDAnOk9h2/DiS8uwsDlao812sjN73yHSi6vO W/OWOfS+lpfj+Fns5nvsgEH0EYqCHlGRClCoaK0BEkTUQEa7Esv5HeX5H8ihyOptHU0aTV /ST2GkEb222hbfU7huOSXK/pWoILJXVktYnPAM0qCweuQRsa3DGLJL8wn8yQCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxF6S245xz11W2 for ; Wed, 21 Jan 2026 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id b311 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 21 Jan 2026 19:45:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4d95227f637e - stable/15 - vtnet: define flags in a consistent way List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4d95227f637e746ca2f59068d9a810ca89c41e94 Auto-Submitted: auto-generated Date: Wed, 21 Jan 2026 19:45:36 +0000 Message-Id: <69712ce0.b311.17524490@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4d95227f637e746ca2f59068d9a810ca89c41e94 commit 4d95227f637e746ca2f59068d9a810ca89c41e94 Author: Michael Tuexen AuthorDate: 2025-12-18 12:41:29 +0000 Commit: Michael Tuexen CommitDate: 2026-01-21 19:45:08 +0000 vtnet: define flags in a consistent way This allows adding flags in the upper 32 bits in a consistent way. No functional change intended. (cherry picked from commit e0c6c4ecfc755b78ac9135033053d2f15c62bf04) --- sys/dev/virtio/network/virtio_net.h | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/sys/dev/virtio/network/virtio_net.h b/sys/dev/virtio/network/virtio_net.h index 9ea53cbe2376..e61a4a993052 100644 --- a/sys/dev/virtio/network/virtio_net.h +++ b/sys/dev/virtio/network/virtio_net.h @@ -32,29 +32,29 @@ #define _VIRTIO_NET_H /* The feature bitmap for virtio net */ -#define VIRTIO_NET_F_CSUM 0x000001 /* Host handles pkts w/ partial csum */ -#define VIRTIO_NET_F_GUEST_CSUM 0x000002 /* Guest handles pkts w/ partial csum*/ -#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS 0x000004 /* Dynamic offload configuration. */ -#define VIRTIO_NET_F_MTU 0x000008 /* Initial MTU advice */ -#define VIRTIO_NET_F_MAC 0x000020 /* Host has given MAC address. */ -#define VIRTIO_NET_F_GSO 0x000040 /* Host handles pkts w/ any GSO type */ -#define VIRTIO_NET_F_GUEST_TSO4 0x000080 /* Guest can handle TSOv4 in. */ -#define VIRTIO_NET_F_GUEST_TSO6 0x000100 /* Guest can handle TSOv6 in. */ -#define VIRTIO_NET_F_GUEST_ECN 0x000200 /* Guest can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_GUEST_UFO 0x000400 /* Guest can handle UFO in. */ -#define VIRTIO_NET_F_HOST_TSO4 0x000800 /* Host can handle TSOv4 in. */ -#define VIRTIO_NET_F_HOST_TSO6 0x001000 /* Host can handle TSOv6 in. */ -#define VIRTIO_NET_F_HOST_ECN 0x002000 /* Host can handle TSO[6] w/ ECN in. */ -#define VIRTIO_NET_F_HOST_UFO 0x004000 /* Host can handle UFO in. */ -#define VIRTIO_NET_F_MRG_RXBUF 0x008000 /* Host can merge receive buffers. */ -#define VIRTIO_NET_F_STATUS 0x010000 /* virtio_net_config.status available*/ -#define VIRTIO_NET_F_CTRL_VQ 0x020000 /* Control channel available */ -#define VIRTIO_NET_F_CTRL_RX 0x040000 /* Control channel RX mode support */ -#define VIRTIO_NET_F_CTRL_VLAN 0x080000 /* Control channel VLAN filtering */ -#define VIRTIO_NET_F_CTRL_RX_EXTRA 0x100000 /* Extra RX mode control support */ -#define VIRTIO_NET_F_GUEST_ANNOUNCE 0x200000 /* Announce device on network */ -#define VIRTIO_NET_F_MQ 0x400000 /* Device supports Receive Flow Steering */ -#define VIRTIO_NET_F_CTRL_MAC_ADDR 0x800000 /* Set MAC address */ +#define VIRTIO_NET_F_CSUM (1ULL << 0) /* Host handles pkts w/ partial csum */ +#define VIRTIO_NET_F_GUEST_CSUM (1ULL << 1) /* Guest handles pkts w/ partial csum*/ +#define VIRTIO_NET_F_CTRL_GUEST_OFFLOADS (1ULL << 2) /* Dynamic offload configuration. */ +#define VIRTIO_NET_F_MTU (1ULL << 3) /* Initial MTU advice */ +#define VIRTIO_NET_F_MAC (1ULL << 5) /* Host has given MAC address. */ +#define VIRTIO_NET_F_GSO (1ULL << 6) /* Host handles pkts w/ any GSO type */ +#define VIRTIO_NET_F_GUEST_TSO4 (1ULL << 7) /* Guest can handle TSOv4 in. */ +#define VIRTIO_NET_F_GUEST_TSO6 (1ULL << 8) /* Guest can handle TSOv6 in. */ +#define VIRTIO_NET_F_GUEST_ECN (1ULL << 9) /* Guest can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_GUEST_UFO (1ULL << 10) /* Guest can handle UFO in. */ +#define VIRTIO_NET_F_HOST_TSO4 (1ULL << 11) /* Host can handle TSOv4 in. */ +#define VIRTIO_NET_F_HOST_TSO6 (1ULL << 12) /* Host can handle TSOv6 in. */ +#define VIRTIO_NET_F_HOST_ECN (1ULL << 13) /* Host can handle TSO[6] w/ ECN in. */ +#define VIRTIO_NET_F_HOST_UFO (1ULL << 14) /* Host can handle UFO in. */ +#define VIRTIO_NET_F_MRG_RXBUF (1ULL << 15) /* Host can merge receive buffers. */ +#define VIRTIO_NET_F_STATUS (1ULL << 16) /* virtio_net_config.status available*/ +#define VIRTIO_NET_F_CTRL_VQ (1ULL << 17) /* Control channel available */ +#define VIRTIO_NET_F_CTRL_RX (1ULL << 18) /* Control channel RX mode support */ +#define VIRTIO_NET_F_CTRL_VLAN (1ULL << 19) /* Control channel VLAN filtering */ +#define VIRTIO_NET_F_CTRL_RX_EXTRA (1ULL << 20) /* Extra RX mode control support */ +#define VIRTIO_NET_F_GUEST_ANNOUNCE (1ULL << 21) /* Announce device on network */ +#define VIRTIO_NET_F_MQ (1ULL << 22) /* Device supports Receive Flow Steering */ +#define VIRTIO_NET_F_CTRL_MAC_ADDR (1ULL << 23) /* Set MAC address */ #define VIRTIO_NET_F_SPEED_DUPLEX (1ULL << 63) /* Device set linkspeed and duplex */ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */