From nobody Sun Jul 23 00:06:10 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 4R7k8y3DKtz4pQQt; Sun, 23 Jul 2023 00:06:10 +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 4R7k8y2pHqz3DkX; Sun, 23 Jul 2023 00:06:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690070770; 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=Mh3qULIsmls09J10ubV2I9502brOyiN4HfsQiZkD1/A=; b=WdmNI2oM6FirHrVOjG+AgvvoNlBxUx3PWxGGaXktqasWrlZZQEYALdkXlvzAGwv6/s37uG 03KDTfy8CumGU8MAAvK8BQRxqAdjb4f2pq1UvPMmKEEBBY5QA+9sd0aGs5zzoCJbPpxSbL Jccij8h5CKDHpJE9zyDHQ114aEndojBblM7ihZfratVPUpz7HtbGy3NaZ+yoN7Bxg8X7us +QPuNRWesut+8S2fhMlSLvDnugwDHX1pnfybQ16AwrcPj97hFoEgnBqhrY0cC7FjMY2xO3 KaCeu9ITltEIZ4AmnVxjv/4o8CH+N2JV3ogeb7Q/mKWAqewJCFoVkYoP6fAdXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690070770; 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=Mh3qULIsmls09J10ubV2I9502brOyiN4HfsQiZkD1/A=; b=Z0NGFDGqnVbDPNoUHjOUIWCEDZTa/5wsyxgFFBgjc5avs9Zi7UloOFguHWgc9VonPu9wq0 +4qbpMF2Cyt0d6Q8Mkz6fqSNI0fdxPIo5jbfx/X1z2y01Pg4IhRsKNQpbAPIYja5lHOaOz A7nKT92QqzTsM61kh0hHlOqovtc2SWZdax71k7bAd/gtDbbAuQ6/JYgAwPq0Qsrv1ZUPAu jrJfueFyGNWWQodqMZaIYB6kBTcDsaFqs3NnXYhbGwGSBPaMrhPL0yQ4NfW/n3gKZVKM96 G8+Vud8J7wTvR8w9LT4zDfzTbKsGRlE6C7BkSKyxs6O/qbG5I0cX2ZX4nCVsiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690070770; a=rsa-sha256; cv=none; b=PVK3jo3TYB756X+Zrdhk49NIlWrZ7RlDyFQBGo0V7pUxEIoWZ2Lg6iz1ujTirsDqNmo2n+ CeF5mfNU+kRfj+003kHHyFBQtDqMDOvZgPrXyrpp9emyFT8eZ1ZUUHvb16PpVK0g5Roq++ zt19hWO9eaLwhOAqs7OKw+nk273Aw9GTT/WCl/KM34k70/J9LAFrf0Q79GUAzUhPZAdNNQ 0+FzFrej5YQvVrBFu0NnHCKFBpzdW3F14ViwwaRNyb/zbJCEGhpRZF7PQc0ceu/gBL9Imn SlnTOX0iKNkFBh/uSa6AZgrvdz1f/mRrAw7np7Nr0njfa9hawi+yBNn3vytC3Q== 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 4R7k8y1s9zzF4K; Sun, 23 Jul 2023 00:06:10 +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 36N06AiI038077; Sun, 23 Jul 2023 00:06:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36N06Aug038076; Sun, 23 Jul 2023 00:06:10 GMT (envelope-from git) Date: Sun, 23 Jul 2023 00:06:10 GMT Message-Id: <202307230006.36N06Aug038076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 92fd2f39e5b1 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 92fd2f39e5b1fd588fdc49a07d626273eb8f7539 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=92fd2f39e5b1fd588fdc49a07d626273eb8f7539 commit 92fd2f39e5b1fd588fdc49a07d626273eb8f7539 Author: Kevin Bowling AuthorDate: 2023-07-23 00:03:26 +0000 Commit: Kevin Bowling CommitDate: 2023-07-23 00:05:55 +0000 e1000: add missing parens in csum setup Reported by: rscheff Fixes: 4f9a44a215f8 e1000: Fix/enable IPv6 transmit checksum offload MFC after: 2 weeks --- 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