From nobody Mon Sep 15 21:44:48 2025 X-Original-To: dev-commits-src-main@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 4cQdq44TBHz6865G; Mon, 15 Sep 2025 21:44:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cQdq43clnz3PhQ; Mon, 15 Sep 2025 21:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757972688; 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=rHY3VPB36PKzs6Pl9351UKgc7vgENOkU/h1inI1u9GQ=; b=aHBo3UaXLdD5Jf6ZeMsuKG2P+RkkMTQGDUWzLWyK8l4qpdmXGvzxkEJL2LDozo+lZ899KD +Ppmw8SXFzALUL18fd2JnQHUJ+mpk0t4dgcM4NWIINyX2pm8j6knCf/RKdTr31JpO4jMx6 3JgSiA9sxDAO1X5bJkOvADh69izBRPElBXovQg5TCKSvWxKP+EIAd2rxgSWK3F2VeE9M/y KFB7GLAScQH38MG9wIAAq2cZ321tqegZLMd9Pm9uyh8EGyrC7/WqUZQLugcRKi7GcA1nTh JdCiemo0Hb7IRsZpXVDceOBVM8ESBLcmRG1AEDg/j0IQahwVEkAcHwVSyh5tig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757972688; 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=rHY3VPB36PKzs6Pl9351UKgc7vgENOkU/h1inI1u9GQ=; b=Sqv6Zqwofn1TFsfa+fOQTzFAORCxMJQXvuGFQTJRi3/QpIeSZlKXL4U0eEg7fP50/t6EPi UP8dvQC/iQEk62iREMusRA+kdxYxVy2aA6X3ML9pUJXxR3iNq7C9Wpl9dbwYZKw8i0ONq3 M7TH+oqVl4/2XA1FtdNt/+PTuMv5ZBhGVUWDPZNfvqZaUykDt0ABoRebZbGL2fpfhoZi9U O73Vm11M8qRAj/1dQgYXFts8BQixyYafh2xR8fU9yJPT8hQAXKiDT2yHVd92U+F5CKt7iG TQpVMVx0PyBuXqn2uWsfAW2fIS8u4xSIBvUWllvDpuLdV3vdHs1iRQkS6Ihvfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757972688; a=rsa-sha256; cv=none; b=t/kcKHwPtmZYaChRUKMhCegeWdJsBDEC3kLCAH1kDvUyKu2nA23hFmPKvscwCcu1eHbQrI qcSFqkFO6ksBZeVvnwFPXf033y/OP0luitf1aAfTA0JvuswHNh6zB3T/Z/dIRljMtukJqO jAM8KItetQIZHmc7egeblhGP0WkZV4qd6EX5HSEOAzwOXAy+BO/ga5hOBRNIHHoLXXbih7 g7dyJShCELaXpyZtB3bZIu62gnju/ELYXpji7ub2gVEtXgXN3K3sBC3ERYscvrerI5jdUa 9tLJWDGnYLbQ9XX/EDa/CC7pqt6brOOKE1j1Z1YXENa+Yy0RBRaKrY7TaQ7ufA== 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 4cQdq42h0Tz1Bkn; Mon, 15 Sep 2025 21:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58FLim3B037532; Mon, 15 Sep 2025 21:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58FLimB4037529; Mon, 15 Sep 2025 21:44:48 GMT (envelope-from git) Date: Mon, 15 Sep 2025 21:44:48 GMT Message-Id: <202509152144.58FLimB4037529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John-Mark Gurney Subject: git: e1bc42cb1551 - main - e1000: fix/complete merge of previous two commits List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jmg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1bc42cb1551ca2a18ef60c38247fb5dc2509ea2 Auto-Submitted: auto-generated The branch main has been updated by jmg: URL: https://cgit.FreeBSD.org/src/commit/?id=e1bc42cb1551ca2a18ef60c38247fb5dc2509ea2 commit e1bc42cb1551ca2a18ef60c38247fb5dc2509ea2 Author: John-Mark Gurney AuthorDate: 2025-09-15 21:29:11 +0000 Commit: John-Mark Gurney CommitDate: 2025-09-15 21:43:54 +0000 e1000: fix/complete merge of previous two commits When fixing the conflicts caused by gallatin's commit and the reviewed patch, I missed this location because it didn't exist when gallatin did their change. Obtained from: Juniper Networks, Inc. --- sys/dev/e1000/if_em.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 20df466b4e76..247cf9d7fed3 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -4815,7 +4815,8 @@ em_if_get_vf_counter(if_ctx_t ctx, ift_counter cnt) case IFCOUNTER_IERRORS: return sc->dropped_pkts; case IFCOUNTER_OERRORS: - return sc->watchdog_events; + return (if_get_counter_default(ifp, cnt) + + sc->watchdog_events); default: return (if_get_counter_default(ifp, cnt)); }