From nobody Wed Nov 30 22:39:12 2022 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 4NMvJc334Wz4jDPf; Wed, 30 Nov 2022 22:39:12 +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 4NMvJc2Dxjz4Fgd; Wed, 30 Nov 2022 22:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847952; 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=7F5H8nRNlSIgy34/wGB6hWKxYifELTfYzXmc4ouO2a4=; b=NTUXSQMtTQGvn0FC6NVPwQe9tOQJzJnR6mwUrcxdFEfIFF3KnfdcnTSs/w6D+r5VsdppPl 4SydqvcMU73Nm46l49ot3N3gIw3WJRVrNjRkVQnrh46xYfB5/tWHfVDbJtrNtH0jNfDbni hzESp7cWU4Q8bOz4Eh+9ouXz3HDI80ZY7qzWHQaBzR5qdDOdEnx3sQUlNte9ClYnPDc30U sJ45DszhLor2xrwHD7uAGG2oOznQkngha/2pL9iM2G6W55x4W8QOs55dva2TWhX6UUuTRm PjhOsbaLNpaJs6URRwf8f8KAx0E6tYFTM5VzWUfdpTSGFrphJPvHM+Ns+XxgbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669847952; 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=7F5H8nRNlSIgy34/wGB6hWKxYifELTfYzXmc4ouO2a4=; b=xAqjGLV0cyaZwHLk/QbJtzdtlsWAvUz/5Okb3239c724mFaSb74eFXoKmWLQxwciyOseIP GhhhTc4c0+J2ZZTtbXJKgxWg8wGpGaQALQyQp+5MLnp0c1zZdszk2QmL+OWI0QqcwZtdhC N0motG4Hv0jQ30TJIOEeoIRaSTscAROqxQfVGRD+zUdzyIC3lcKRsGRAdfAfdIhUjDVLnx VWvgz7b6acEdBl+/maZcL7N8aRkgqQ45P81D/wUC4kP9zkwKsF6a8NR+59pqqVvEmZF1S8 BvhKmd+gBsYExdZrq9ifQJBKa+ZSg/STRTGf8soUI0sv+sBiLt27pFEzJKffqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669847952; a=rsa-sha256; cv=none; b=kCaa6fLkDeo6SqOhnjj5WA7i/NZQPWq702+Mc3/wKEbavQUFxWC6CSw4l0UGHa/ak6/i/A aCUzS+uzNAwMy71RqmLZYak6rYIRNEGGautqPSa7Q65SjgzrMsw6c1tw5/f0MrAO3Jc9kL vAUWqBGtglubQhHicICCpNApOxjw7CDBsKSgomCk98LUTHEvquweIXWPiODVkEXTqsg0zb iXicBMMntRr/IsFM7VmtAiPA0lJNYE+ECLseP+OBJfRyD6I2lt+p/2GPWpudbw7Hno0Us7 N+yQNiTgeBLgPZbiA98AiWHovueoiyx2IzVtJ3hvUeNclImrkLxL9+iG3JsjYA== 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 4NMvJc0yLXzF2B; Wed, 30 Nov 2022 22:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AUMdC9J029840; Wed, 30 Nov 2022 22:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AUMdCcG029839; Wed, 30 Nov 2022 22:39:12 GMT (envelope-from git) Date: Wed, 30 Nov 2022 22:39:12 GMT Message-Id: <202211302239.2AUMdCcG029839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 79b679942352 - main - ether_demux: Defer stripping the Ethernet header. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79b679942352a7f10d759fdee1892aa251e0f439 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=79b679942352a7f10d759fdee1892aa251e0f439 commit 79b679942352a7f10d759fdee1892aa251e0f439 Author: John Baldwin AuthorDate: 2022-11-30 22:38:51 +0000 Commit: John Baldwin CommitDate: 2022-11-30 22:38:51 +0000 ether_demux: Defer stripping the Ethernet header. This avoids having to undo it before invoking NetGraph's orphan input hook. Reviewed by: ae, melifaro Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D37510 --- sys/net/if_ethersubr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index d92c49b6f39c..a42e15dda97a 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -890,11 +890,9 @@ ether_demux(struct ifnet *ifp, struct mbuf *m) /* * Reset layer specific mbuf flags to avoid confusing upper layers. - * Strip off Ethernet header. */ m->m_flags &= ~M_VLANTAG; m_clrprotoflags(m); - m_adj(m, ETHER_HDR_LEN); /* * Dispatch frame to upper layer. @@ -922,6 +920,10 @@ ether_demux(struct ifnet *ifp, struct mbuf *m) default: goto discard; } + + /* Strip off Ethernet header. */ + m_adj(m, ETHER_HDR_LEN); + netisr_dispatch(isr, m); return; @@ -934,11 +936,6 @@ discard: if (ifp->if_l2com != NULL) { KASSERT(ng_ether_input_orphan_p != NULL, ("ng_ether_input_orphan_p is NULL")); - /* - * Put back the ethernet header so netgraph has a - * consistent view of inbound packets. - */ - M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT); (*ng_ether_input_orphan_p)(ifp, m); return; }