From nobody Thu Dec 28 17:24:51 2023 X-Original-To: dev-commits-src-all@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 4T1FkW3tSCz56Crf; Thu, 28 Dec 2023 17:24:51 +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 4T1FkW26Pcz3df2; Thu, 28 Dec 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703784291; 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=JbTIsXm+RvJkU0yvX5vOHzZ+eMYWcxOwgYCIX1ypZQc=; b=L0WQDXzwvaow8wl89zg7kQxbYxHHhiVvAYNk9CfmvHkn9JLZtiMBnVIgzOJdpLx3WgstSC amHssD/sitxUiTMoAr/kDpwHqNEaHC847IgeTFHWhQVhlw0HcVybxUOXNDTXZC5fZqxb7L /oJKh1qS0CRxwmi9yrpwj76X0VnnkZ+bcVosMQhuV0TbDMYIvlXss2tCiEmd+JJS7dHMIS U/oR1XI7UZcaa4hpc8Gmw+VOoQwImXZnOYjgNyKYaobGz7Z071KBhdnzi88EsOCwxeDBGy HN4liVTKvDnQ7IpF1Q+1RfITJCj6L5dFKcuuI/uWBeGBsghM3+2WcMoiUG8+7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703784291; a=rsa-sha256; cv=none; b=CtgbdZHNaI6ytOQW0wMvPkNcTpVzRXNAQ5I1AwBf0N+IUfysg8FbCk6ovkkiDKhHA3gAln yHlv0k9tK+j9gRgCVkeVoyoQWEHU39jRp7vpLVkOH3cLdJc9XEhpZvSH1Um3EbxWZFwCyc 3TpueHS7r4JoX7x2+19itKL9hEy3mfmTy4FAE6mK2+I2L3ufy4CxY+6vNCxuetWAd62F0S KJjLc+KvifUUyR6128Z8Vw81GZ6PMPnIZCgeVuEg+t+gjl9x5zL68pzhrBEpUWfDDFLbt3 bd7zQUr2DuwjoSNRBRjj978q/jKAW98vU3nkqeCqChL/oYQoyuyPp2iYaaOngQ== 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=1703784291; 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=JbTIsXm+RvJkU0yvX5vOHzZ+eMYWcxOwgYCIX1ypZQc=; b=CXk3zY70ggKmpwnkT9Bq0NppDOKKWKEFupgdHAaPAazOC9oKVvl8WHAF4YQzCm1tez0N8h kq7wjmBfoWIvBgK7AAYFlOPy0UnyJTN3tf5veT8iH35TjH2WRN/oJUp7VysXxnZhFXf3GN Og90YTSkJZF8DZly2Oibp260U7+wv1rrIXB0nGyB/W48YT/TNYKyOhUbbH74L5Fl3cDsp8 t4Uf+PdZsWdE3bYIKcTh+gcoGmYl2JCp99GR52mJYSPIYctU+jFb4q0zgsAA2oyrNROdTn RmPYS6zv+vcOkaHk1+rzXDN+e8E9S9BT0FOpomU8TEtsjETUHtVYaviCbIhcrA== 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 4T1FkW19xBzWmY; Thu, 28 Dec 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BSHOpjq090658; Thu, 28 Dec 2023 17:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BSHOpas090655; Thu, 28 Dec 2023 17:24:51 GMT (envelope-from git) Date: Thu, 28 Dec 2023 17:24:51 GMT Message-Id: <202312281724.3BSHOpas090655@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: 23699ff23c36 - main - Revert "vtnet: Adjust rx buffer so IP header 32-bit aligned" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 23699ff23c36f6df1b02c1bc745d36591c712322 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=23699ff23c36f6df1b02c1bc745d36591c712322 commit 23699ff23c36f6df1b02c1bc745d36591c712322 Author: Warner Losh AuthorDate: 2023-12-28 17:20:42 +0000 Commit: Warner Losh CommitDate: 2023-12-28 17:22:23 +0000 Revert "vtnet: Adjust rx buffer so IP header 32-bit aligned" This reverts commit 9e6d11ce9a51d75ed6a94e180f2fb4e9188a2ba4. This wasn't right to start with... Requested by: markj --- sys/dev/virtio/network/if_vtnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 360176e4f845..287af7751066 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1532,8 +1532,8 @@ vtnet_rx_alloc_buf(struct vtnet_softc *sc, int nbufs, struct mbuf **m_tailp) m_freem(m_head); return (NULL); } + m->m_len = size; - m_adj(m, ETHER_ALIGN); if (m_head != NULL) { m_tail->m_next = m; m_tail = m;