From owner-dev-commits-src-main@freebsd.org Tue Jan 19 05:08:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 22F284E5601; Tue, 19 Jan 2021 05:08:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DKcBD4NtHz4XX9; Tue, 19 Jan 2021 05:08:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 57D5E20BA5; Tue, 19 Jan 2021 05:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10J58Wlo086140; Tue, 19 Jan 2021 05:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10J58WHt086139; Tue, 19 Jan 2021 05:08:32 GMT (envelope-from git) Date: Tue, 19 Jan 2021 05:08:32 GMT Message-Id: <202101190508.10J58WHt086139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Venteicher Subject: git: 74cd316a09e8 - main - if_vtnet: Resort softc fields MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bryanv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74cd316a09e8e5ae237278695329a97b9827559c Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 05:08:37 -0000 The branch main has been updated by bryanv: URL: https://cgit.FreeBSD.org/src/commit/?id=74cd316a09e8e5ae237278695329a97b9827559c commit 74cd316a09e8e5ae237278695329a97b9827559c Author: Bryan Venteicher AuthorDate: 2021-01-19 04:55:25 +0000 Commit: Bryan Venteicher CommitDate: 2021-01-19 04:55:25 +0000 if_vtnet: Resort softc fields Reviewed by: grehan (mentor) Differential Revision: https://reviews.freebsd.org/D27925 --- sys/dev/virtio/network/if_vtnetvar.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnetvar.h b/sys/dev/virtio/network/if_vtnetvar.h index 7781e1c9b398..c9403c0dbb0e 100644 --- a/sys/dev/virtio/network/if_vtnetvar.h +++ b/sys/dev/virtio/network/if_vtnetvar.h @@ -140,6 +140,7 @@ struct vtnet_softc { struct vtnet_rxq *vtnet_rxqs; struct vtnet_txq *vtnet_txqs; pfil_head_t vtnet_pfil; + uint64_t vtnet_features; uint32_t vtnet_flags; #define VTNET_FLAG_MODERN 0x0001 @@ -158,18 +159,18 @@ struct vtnet_softc { #define VTNET_FLAG_FIXUP_NEEDS_CSUM 0x2000 #define VTNET_FLAG_SW_LRO 0x4000 - int vtnet_link_active; int vtnet_hdr_size; - int vtnet_rx_process_limit; - int vtnet_rx_nsegs; int vtnet_rx_nmbufs; int vtnet_rx_clustersz; - int vtnet_tx_nsegs; - int vtnet_if_flags; - int vtnet_max_mtu; + int vtnet_rx_nsegs; + int vtnet_rx_process_limit; + int vtnet_link_active; int vtnet_act_vq_pairs; int vtnet_req_vq_pairs; int vtnet_max_vq_pairs; + int vtnet_tx_nsegs; + int vtnet_if_flags; + int vtnet_max_mtu; int vtnet_lro_entry_count; int vtnet_lro_mbufq_depth; @@ -177,7 +178,6 @@ struct vtnet_softc { struct vtnet_mac_filter *vtnet_mac_filter; uint32_t *vtnet_vlan_filter; - uint64_t vtnet_features; uint64_t vtnet_negotiated_features; struct vtnet_statistics vtnet_stats; struct callout vtnet_tick_ch;