From nobody Fri Aug 18 00:33:18 2023 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 4RRjXG46lCz4qNdD; Fri, 18 Aug 2023 00:33:18 +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 4RRjXG3Pgqz3Gpr; Fri, 18 Aug 2023 00:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318798; 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=4hlUqt1PIXafAPoMNE0UI7k4OBUzTpcTTBss4tMyjfw=; b=bg6yOwwxJo1L6L0w6cN+ZsLgSsv9y1wLRjY/v8c/w2Tx1LPUgRG/b0ofTZiTOH8+HUi2JT EGL/rWcRTwibjtv0WpgFTaoMn30MXZCagO2uI5+KemWyQjwf5h065kaIOYAQ+xuF4D+tb3 VcAor14eJwwqME2oLJl6OBMaQkv0ua25aYpVMuW+wGUKZo0An70ZrA9hyjGE+1L1nEer9f eSNzoPSutYi2/K33GM0PpwhzyMQVo1jm9j35RqDxAAoIdMD+hZ8O3wD1TsSBEETVdYQgBR gsjfclv529+AzK5eKjn3MKk1Yxm6Coy+eXOKN/XX6B1IGHxPmQQkZzpJNqjaow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318798; 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=4hlUqt1PIXafAPoMNE0UI7k4OBUzTpcTTBss4tMyjfw=; b=YiHdS8eixwNgzZeirxSdzp5r14Zy06ezpYSaNirvdPoHVMdqkHLmw5m2oaVLvKW0cFbhPI 2tAnasGXT2If6/ovqe//Snu8QcUf1QmCS798COBeqX0jf56ltHKm4U7Kb4rHHFjEannHsc 9aHLXYAiJvHThqJWd6Txyhm5NNcn2RkY1l7rNQfsrm63eu0vt/8V3Ug7IIMe08udVUP818 Ot1Z4Lx1/WagmeQORZPw+VaVbwys2ZKnDFCq4rVulsWbBaYZuaiSJk6Tp5yBItFX4d7YzY ip54hyvWjpD9cwfXxOHiRCjVOmqMUx+tQZAXo6fiX0WjHOEl4uSS4y29tMPmVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692318798; a=rsa-sha256; cv=none; b=S1B5z8YgPTMSh8IhhIL3DtgIW2150XPgapnju4WVJir20qUk9Z0XqeEWphHNYjaR85T5oJ Q7fFQ96dgEiGygX9Ts0xMdC5/mstpOd7juj9ATUXGaPympB/B06umbRYSMl925nLh0FmAJ /u/kOFU9ywL6NzsYQwbQTW6po1IVoCs+2sF+3zTNsR46E0Bvr1XM89lCJBMfFkk456dUh2 VtQ0HQseihHZmZQ1KbeVBbSSQnoJoxoP9SjyNJh31iUGf6KKI57o9E+RprwrtPAk0tUW75 CGuzQCfIZt7He2PsNeKOd97tTU4PrAA01NX5iDaXRMYzotuEy/3b5m1ujsoTwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RRjXG2QLWzvML; Fri, 18 Aug 2023 00:33:18 +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 37I0XIaQ046225; Fri, 18 Aug 2023 00:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0XIBW046222; Fri, 18 Aug 2023 00:33:18 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:33:18 GMT Message-Id: <202308180033.37I0XIBW046222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 3bbf655b2826 - stable/13 - e1000: Fix off by one ipcse 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3bbf655b282690a70051f386c64aa95430b5fb64 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbf655b282690a70051f386c64aa95430b5fb64 commit 3bbf655b282690a70051f386c64aa95430b5fb64 Author: Kevin Bowling AuthorDate: 2023-08-15 21:37:43 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 00:33:08 +0000 e1000: Fix off by one ipcse This has been off by one in the FreeBSD drivers as far back as I've looked. Emperically HW and SW emulations I have available don't seem to mind. Noticed while debugging other issues. (cherry picked from commit eac761e967b34066aa7183474249df87d79a2f32) --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index b90ab21cd825..765458d621f9 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -290,7 +290,7 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, offsetof(struct ip, ip_sum); if (csum_flags & CSUM_IP) { *txd_upper |= E1000_TXD_POPTS_IXSM << 8; - TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len); + TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len - 1); cmd |= E1000_TXD_CMD_IP; } else if (csum_flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) TXD->lower_setup.ip_fields.ipcse = htole16(0);