From nobody Fri Aug 04 01:23:39 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 4RH7Jq2l7MzZXhm; Fri, 4 Aug 2023 01:23:39 +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 4RH7Jq28Mfz4Yps; Fri, 4 Aug 2023 01:23:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112219; 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=PosSMUJWPFTCIRMWgzpWST1jZF5vmpcoDyZaVu2Za4w=; b=pkWFXgD+XK8QTyAWIL9XjI9UwnSh2Nc6B1gc0YZ5CRKQwlk1+KOuo8IH53OJYIGfyJCX79 UElUBm2GQZg2zU9k9Ky/B1MXTHN5X8u8kr1DXMK9NyX1g0eJDIg7XhJ1BLv5MfZtlx7lN5 ivULWmi6G1TW5SQWk13Rqb9e2wXPsKuuXBdzQZi9V2D2BVNUuRR92F4wX0qZ0AH8tnLLIb q/ROg6OTdBnw8CcANUqr8Q0ZJnwae8wKb11x1Kr/YAaPSZPbo/b7Odj3fGYKhjR008LUIf +XUeCOELWpcYLp6z7Gz8EC0WSTpaBRpMkxJNAiRr+cZ3ryOt46yDBRlNo5BEyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691112219; 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=PosSMUJWPFTCIRMWgzpWST1jZF5vmpcoDyZaVu2Za4w=; b=vsFsmHO3L1/xH8mOPqnxuVIq7r1ZobzvOvJpqNFGxGI9TPAZh/QcUQLRh9Z2562pg08omB VNMsbNmfxFxMIqn0u0O04Dg2uj4+BSLVSjGwWTcW1s6BEhIoVntGIhEhHLmKuuvoEzfAy3 /VoZ3mJUa6ujQQiYZ8Q5H4GD7YTcqp1GRiJRQCKq1cqL7QdctVz5EIRur+GVfClrUUz+Zj Thhq1s+8nBwVEfUiOd3BHHMPI4yh8DlfxVxGhdUyYyD1l+67VW4O+jKdPskhP2DXF1LNKf CMulAU2m6eRxlDnbvGojUYMLNVbHP/SoN8mYAUWL9lJslJB53GF8bM1pl/6S9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691112219; a=rsa-sha256; cv=none; b=KFDlnvvUmq/iNo/Hzji+g8YvzugWz8mYHHXv4DK4DMLPZwaoOKhfIY1KbAeFT1aV/F2AaH UZTUxAjhTrDYR4bNDxlwuo+w1ewlVcozMZObAYn8ByctYCCbrGjk7/oarBuinvtwWN77Ln 0otIQvbiEOb+b55nSNeNTIvf//VYZyZuC6efgom9qy799smVE4DdaFi6qQzesKgkVqBCdk 8o4+QH8w4dBF0ldcH3FrvQCdVWGYHzWde99sojWnH9u4jMuxnQDExTxgJ5w4oGHGEQg9QV JxDRAPF261DIEzEnkF1WrW8k3mpDXHGPnf5lAkzM8xurU+LRmgoiI4Q7eRfBeg== 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 4RH7Jq16pdzkSf; Fri, 4 Aug 2023 01:23:39 +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 3741Ndi3021283; Fri, 4 Aug 2023 01:23:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3741NdUv021282; Fri, 4 Aug 2023 01:23:39 GMT (envelope-from git) Date: Fri, 4 Aug 2023 01:23:39 GMT Message-Id: <202308040123.3741NdUv021282@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: 41e440c38147 - stable/13 - e1000: add missing parens in csum setup 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 41e440c38147dc37188b49cfdb051c33f056e6eb Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=41e440c38147dc37188b49cfdb051c33f056e6eb commit 41e440c38147dc37188b49cfdb051c33f056e6eb Author: Kevin Bowling AuthorDate: 2023-07-23 00:03:26 +0000 Commit: Kevin Bowling CommitDate: 2023-08-04 01:22:14 +0000 e1000: add missing parens in csum setup Reported by: rscheff Fixes: 4f9a44a215f8 e1000: Fix/enable IPv6 transmit checksum offload (cherry picked from commit 92fd2f39e5b1fd588fdc49a07d626273eb8f7539) --- 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 1192286d1c9c..8b1d2817490f 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -291,7 +291,7 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, *txd_upper |= E1000_TXD_POPTS_TXSM << 8; *txd_lower = E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D; - if (csum_flags & CSUM_TCP | CSUM_IP6_TCP) { + if (csum_flags & (CSUM_TCP | CSUM_IP6_TCP)) { tucso = hdr_len + offsetof(struct tcphdr, th_sum); cmd |= E1000_TXD_CMD_TCP; } else