From nobody Thu May 28 11:21:26 2026 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 4gR3wC5Cl4z6fYk0 for ; Thu, 28 May 2026 11:21:31 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gR3wC4VD5z3Jwh for ; Thu, 28 May 2026 11:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779967291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W+zmnVu96IYy3q25eYAONzlACw/eOticwbiq08NKfa4=; b=umcCVS70cnCVtE6nCEkvNBoHPmjfsMTex9EyxqpXOCLMHXZegOuyT2iY1/XejO1wgBYC93 n6NHtiw8u1XW37FlF7Mzv/HHKTMjzIFr93zco/FjO0m1niPLqeG/3k/BTO7KFrfdwTCn8o e0a1oKQW2H3SabNT/uBN0hFO98/1InGJCpWmhWm0Op6qGXazWGdoVhORPs4CpTm8p6IBTn 9d09o6zl1fN6Kf/hXnNQ8D1NQ+R8JOyfHfhfh22crJLC8q/51lRHXg6llfCTY7dmLy904L 8SWjoSq2qgL2mbd05Z+VCs6sEUsKS0KpPyl786iceQ3GBLazbrOQOuvFEFqy9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779967291; a=rsa-sha256; cv=none; b=JUu2Dnjit5Ye/AzP+TtAR17W8DSpa6wbAdSW3fNz/n73P9dKe/HTURJ96UISspN8yGMXcP zrErf2CswVz/4kALiDYbIW/HWRWAAxdfmG0knEIbwJEtcELyTtnoDMXKSAOONSQECo07P+ 9oar6jvRM2jT4Sy/YhaAR6OGde5yHPZmLvZDy+6G/vRBe20OFHhz5g45rz0gHCvjufDIe7 hzkMO9GuQK6f9R6LtwNaV6RWL65jHfJHWnsNN3WOAD1f9VnFef/8DtErtZHQqVj51rwyO9 Scz6gOJD+8uxLSv/RFEH2D+1ojc0RV46s02ZmwpP0YFtiCKmJKAMayk0Bqv8Sw== 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=1779967291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W+zmnVu96IYy3q25eYAONzlACw/eOticwbiq08NKfa4=; b=T1QrZyfwDrYrNWK8seTVVTX1AvHBjtH2YTBqWY/GvBK/mQ472Y3Mmn0FI61y7TFFNMSnH7 To9MRpbk61itxKVArQFc/bBNg6WvIahF7ZFVaxlR7z1uLvr3+pmZElJI51Rx12OBeR+8Xj /MMQCl7Pi7uVB7X9nZHWuCwuSa56xR2A5FUtWZ1flJRLBY1QsoOz24znty86yu/I27KKu7 VvZUwVlQIa3xaet+0jveKzRhNOxil0fzJvXNGfCPDa/PLyDt7pDAnoh3lpAM15MubnDqQU E0TUEjE8gL7UqmJoPHAhpWqfmi+vpkbsm03tWNw8aa6vXgfeMugxcosF46q96w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gR3wC42ZGzkCS for ; Thu, 28 May 2026 11:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ed09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 28 May 2026 11:21:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Mike Belanger From: Michael Tuexen Subject: git: b29842622dcb - main - if_ffec: correctly trim 2 bytes from the beginning 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 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b29842622dcb9c9c9515fc04dc5826a8717537b1 Auto-Submitted: auto-generated Date: Thu, 28 May 2026 11:21:26 +0000 Message-Id: <6a182536.3ed09.2c4ed400@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b29842622dcb9c9c9515fc04dc5826a8717537b1 commit b29842622dcb9c9c9515fc04dc5826a8717537b1 Author: Mike Belanger AuthorDate: 2026-05-28 11:09:52 +0000 Commit: Michael Tuexen CommitDate: 2026-05-28 11:09:52 +0000 if_ffec: correctly trim 2 bytes from the beginning PR: 283315 Tested by: tuexen MFC after: 3 days --- sys/dev/ffec/if_ffec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c index 17fab283fc81..cf171a854406 100644 --- a/sys/dev/ffec/if_ffec.c +++ b/sys/dev/ffec/if_ffec.c @@ -850,7 +850,7 @@ ffec_rxfinish_onebuf(struct ffec_softc *sc, int len) * biggest header is, instead of the whole 1530ish-byte frame. */ if (sc->fecflags & FECFLAG_RACC) { - m->m_data = mtod(m, uint8_t *) + 2; + m_adj(m, 2); } else { src = mtod(m, uint8_t*); dst = src - ETHER_ALIGN;