From nobody Mon Nov 11 14:10:42 2024
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 4XnBKG6pmLz5bdCR;
Mon, 11 Nov 2024 14:10:42 +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 "R10" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4XnBKG53r1z41Cb;
Mon, 11 Nov 2024 14:10:42 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1731334242;
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=n4CwiSpmeJENDIQaZccIIdLZQpxvbL4JQAXmjsvvSNQ=;
b=uTtr9ZMz85umSbirBbIny5/up8tFOKqa2s1euIt3LMmbn06UhfF7DhRu1On2gMQWqDIzW7
71D8gT2lNxDthFeDwhX0YLBkf3XyuWFvPPeCYfdLFoiujbJKz1UMVtCdFFjhx8YF/s6ovD
+H1QpRua/5uD7V7mIhBJ/oBPhpVGLXWfi1bar8cyWS2aDvUE9IFEHci7qf1sLwjbbH1UcT
bho/+6PUFMDIVqPvEacO2YYpiJyJDKbUT6g2GczD/WoTRzWUHZC2sBU1orYGmcdTNiYh1p
A+X0HHwzD36whYMYsqekK48GUmcfH1MtDyw+jcaYb1OCm04Bb7tx+HS9qXViTw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1731334242;
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=n4CwiSpmeJENDIQaZccIIdLZQpxvbL4JQAXmjsvvSNQ=;
b=t2sBdLQxPGMGUj1yt4VaDy9yIhYNqvbztnM+b1QOHEjbRQoTFHWLFex1Otl5UuV07mIeHr
qDvWq7qt/IHP9Tfe/rbjn3Zp++ogHMcFsFqOl2nv1US3AqVkf4SV2P0TEazC8mp7GCW47z
Rc7gH1VbvcYgnDI/WjIJCPn9TzKDw5mGSmvunt4KigKtambezmlZsm0cc1Ufc/ceZvv/Eh
80Xa6X77rMA74BZbOYYzCpUCabDMahx4y43T6u1SXaXOE6vU4eO3U1jnztKD/PxrYpzhbz
pLVdyhUjFpvsdkvPW8vwSQnHPXKjIafm+tQYsv9HSAWxVxljyMG1jdhnmwpYNQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731334242; a=rsa-sha256; cv=none;
b=Ofi/uYBwz9GboNpwVP8x+EBDGhwXXBcmuoQSwHh+7UgKyZZQOqeIao9cPhOotFurPyppZM
GQeyxFwvmYDybul+AUj+gUHuDOlgCl1XRjnUctdMYeeWLCfD+pkKtiPvulb04LIVDJtuRm
tT13EqYYLfEPHblKBonADVwrugpVP6EV4PDQRVbjz61dkK64HMgJ9s4nPohXdf9gtA+C4s
Ju914WiaGdGw7DQd2/WrKY8qsfdnHq/X23L6mRaGKFsOs5CrtDeVLlXrueQ9S6yiIKSFFf
j572XWEmefs7R7vnC8ZTrWe9l7c2BYOO7OkTgLvo01zN0A4oIb5Bqe9eovGAYA==
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 4XnBKG4PYrzT14;
Mon, 11 Nov 2024 14:10:42 +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 4ABEAg4g001451;
Mon, 11 Nov 2024 14:10:42 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ABEAgVm001448;
Mon, 11 Nov 2024 14:10:42 GMT
(envelope-from git)
Date: Mon, 11 Nov 2024 14:10:42 GMT
Message-Id: <202411111410.4ABEAgVm001448@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 3b7acf9a3b24 - stable/13 - if_bridge: Mask MEXTPG if
some members don't support it
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 3b7acf9a3b2428f86291e48298ee9bae8f1276c7
Auto-Submitted: auto-generated
The branch stable/13 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=3b7acf9a3b2428f86291e48298ee9bae8f1276c7
commit 3b7acf9a3b2428f86291e48298ee9bae8f1276c7
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-28 13:52:07 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-11-11 14:02:21 +0000
if_bridge: Mask MEXTPG if some members don't support it
Similar to how the network stack needs to use mb_unmapped_to_ext() to
convert mbufs before passing them to an unsupported driver, if_bridge
needs to avoid passing M_EXTPG mbufs to interfaces that don't support
them. Thus, clear IFCAP_MEXTPG on the bridge if any member interfaces
don't handle unmapped mbufs.
PR: 278245
Reviewed by: jhb, gallatin
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D47294
(cherry picked from commit 2bbfbf80d3bb828ac782c2d990a1fba0eb51e45a)
---
sys/net/if_bridge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index d94b1d59afbd..b392a9c69a7f 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -200,7 +200,7 @@ extern void nd6_setmtu(struct ifnet *);
* List of capabilities to possibly mask on the member interface.
*/
#define BRIDGE_IFCAPS_MASK (IFCAP_TOE|IFCAP_TSO|IFCAP_TXCSUM|\
- IFCAP_TXCSUM_IPV6)
+ IFCAP_TXCSUM_IPV6|IFCAP_MEXTPG)
/*
* List of capabilities to strip