From nobody Sun Aug 2 04:23:03 2026 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 4hCRVv5YpXz6n62S for ; Sun, 02 Aug 2026 04:23:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hCRVv1qg7z49KX for ; Sun, 02 Aug 2026 04:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785644583; 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=On7qq+fwIqo+WAKraJI6IhB47yra5wyRRk4LmDHrTSo=; b=nnqA1AL7KgexRE6YXV6PkibeBaiaUKwOQg0b2A3/bVaRncx+aisZsbU5ScGQ7GgJRtHVNT 0pRVaBajJfY0lpR4t60te2JHusrfiF57AYMP8jIa8dtrnh+K3HvTWtba6dZOvkaplCg4XZ CpTIrSSYbw3XyTrfm+pWp8DTnjZx72HVWwFm7YCbojELIyBkFtT2joMh9uiaEEDs9V2Qdq qiCSb5pkmYraNbdr1Psdf7wYbDUDvgKqFw0MVYa4P0n5ewR1Xhs7G8B6Lu4hTw0tBQlG+U 3mM/5WY46hNbnyW7SMFNmOsQVJVOQom527PVdGw7qilTy0lfMxSj6MF0dK90Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785644583; a=rsa-sha256; cv=none; b=R2JxT/ASgwFj5hnH6rw6vAVhLNiqfQMggE/NiJPZBFhiFadoYxFV91WCl//2EyvbjjnL86 0+M0f+CwS+QvD46Ae86IrHaNFK1EEX48MS33w9h2I3OaqEKgsuKdRnnT7ciahs7BeThAkP RZXRS7dvblmju1e4jp9heSTtjiNFTZ5AaHjcJD33qmjLwBzlJ9bOM29F+cH0S8h8Y3sZFN jhOwrnjmL1EXZ/NMNAGFLfDZXe6tlUIKLFB8Vk9kL6kYfL7WwJA3ljzmfwmObxXQyrePB3 ZbSAhEfQlSU6W5rRbqy/fsKoLrGU0TGKl6IyLg2zd0GMmubfmLkgpq5uSPDc0Q== 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=1785644583; 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=On7qq+fwIqo+WAKraJI6IhB47yra5wyRRk4LmDHrTSo=; b=WEQNIBUROwjKLbrRkrSK4shu/ava0WHd2DUEx+JzvfHkgSkB4Ywzow1kZKLPZU3NxG8DHa d2aiCPX/FDHPD1kNkXlQ0uHl7vkMe+2omzrzemzdk4wuhsPzZGCjBs/6heDceM4gQ9s1ew 0MQwOarWF6JsrhLHIsReahOobO4DS8uCLjf1ZChS1ZToiq8PuV2z7dvVQdIVHnRoLXaqyd bBe/fAnyWjWcJYf+YrYZ2px0K0R2aFqEsm/OlfkqfffDM3/rIJIC4MnUQAbPGjMuf92l45 EL15u32dsdeadp/FPIJuHY/cXF4RROX6LT15ooTuQHAVtC/DfCv0dyzBKJhsJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hCRVv0bGTz1DZ0 for ; Sun, 02 Aug 2026 04:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a5f3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 02 Aug 2026 04:23:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 37513bf193d9 - stable/15 - igc: fix RX accounting for multi-descriptor packets 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 37513bf193d9ab0fd768621256c0d0b3bcb1ba14 Auto-Submitted: auto-generated Date: Sun, 02 Aug 2026 04:23:03 +0000 Message-Id: <6a6ec627.3a5f3.2a54689c@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=37513bf193d9ab0fd768621256c0d0b3bcb1ba14 commit 37513bf193d9ab0fd768621256c0d0b3bcb1ba14 Author: Kevin Bowling AuthorDate: 2026-07-25 23:56:29 +0000 Commit: Kevin Bowling CommitDate: 2026-08-02 04:21:17 +0000 igc: fix RX accounting for multi-descriptor packets The receive path adds the running packet length to rx_bytes for every descriptor. A packet spanning descriptors of length l1, l2, and l3 is therefore counted as 3*l1 + 2*l2 + l3. Add each descriptor length once. Single-descriptor accounting remains unchanged. (cherry picked from commit bbf0372feeb321a5bfeff7b1e79576ab01240441) --- sys/dev/igc/igc_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/igc/igc_txrx.c b/sys/dev/igc/igc_txrx.c index 92ba81c79c58..d6d383b40127 100644 --- a/sys/dev/igc/igc_txrx.c +++ b/sys/dev/igc/igc_txrx.c @@ -488,7 +488,7 @@ igc_isc_rxd_pkt_get(void *arg, if_rxd_info_t ri) le32toh(rxd->wb.lower.lo_dword.data) & IGC_PKTTYPE_MASK; ri->iri_len += len; - rxr->rx_bytes += ri->iri_len; + rxr->rx_bytes += len; rxd->wb.upper.status_error = 0; eop = ((staterr & IGC_RXD_STAT_EOP) == IGC_RXD_STAT_EOP);