From nobody Mon Nov 11 14:09:10 2024 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 4XnBHV3Rwgz5bd4v; Mon, 11 Nov 2024 14:09:10 +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 4XnBHV2nzgz4001; Mon, 11 Nov 2024 14:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334150; 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=4UhAUiEeAY4GO2Zx52Mnq0Tlm8Tp2I/C8k3LdBW07EY=; b=HzsX9TZP1a7PQs9g2jWQWQK5dHDM9KggRd8wb4bTl65KLLw8DmUq1OP6PO7tcXgXXIcKEZ 7jl0jw2GntdUn509UqSwZ2yXGUVwRALCksHzuTglPPng4ylZgich4BMKD/FS5Pw6DFpLZ2 Dvmue9TWOq8prI7Y3Me6Bxno/vvYglQWhlxI5MFOmdTSFirqqnNqke+z65BceOSdU08fP4 LBeA+i7QUTBsLSYpxEFCPxHug+eg+PQcFCMtTRCFE6TBgAS/pmuuLnd+wp9d9ttmMRNbrA dwM8ixaGpMoytO1uzxf1E46yVmtIG3ydFnakWS9/h244b/h9bxBpM21dIlohig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731334150; 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=4UhAUiEeAY4GO2Zx52Mnq0Tlm8Tp2I/C8k3LdBW07EY=; b=TQPBUGYZQGGr0n49GNI5XQmuZPtVDZ5s0El+rYYCYBKBZIxwkttXKULzgEGXBC0ThvNruu z7SX2It3y4ly2qBY57489mKPKp4DcXqG90pr2KpRHx5/m4qEH+D8nFC/3+FirUEfnwpFoq gbwhsCXsRu4cjDDOgiHph2iLRRB2ZYnmEqYDifC50kLDOsK7H8YYCrwUaJB2fe8ajBo+Fe 1G09OnA4lCl+JrHTiW1FbHEXLeU5FkhnkseQTP3x/fTR/Yav3QV5aTVKJWPklL9V37Oyzh Uo3G+NwHnrYEHKJJ223bTBMXy/KwtQfDYDYj0RYMmgA/Awv5xiQbTqGeBmRzEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731334150; a=rsa-sha256; cv=none; b=Kbw86As2WFmQ66/lmyx0OriAtzGWPFCCbJ47FGPdBICfI/NEhJMjjBtoVNNWdztNSvHJXU gZYMwK6bHbb72YNttGFcRVEo4DobX++eANPzqsTMhyALHxtcgqNRG8cfHnOCXFFVPm2X8E R2pncVN6t2Os64N74QN2SEGYqwE0UI8DmhYHJdplVdXhjXUCUG0dUtZVQl4a36QLdArHso j/mNnkRYC9yl6UktNQFr7pGB80stI75g+U6A0fGBMiEeQ5RNBuf+cKep3cmPwTDqCpxunx aXN9IWGPxPhNEdOCzGhzxicnuC12sAjh7bPctiy8JCoieDkAJKhIhvXcq3+vgA== 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 4XnBHV1kkTzSsf; Mon, 11 Nov 2024 14:09:10 +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 4ABE9AEx092136; Mon, 11 Nov 2024 14:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ABE9AYT092133; Mon, 11 Nov 2024 14:09:10 GMT (envelope-from git) Date: Mon, 11 Nov 2024 14:09:10 GMT Message-Id: <202411111409.4ABE9AYT092133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 01a3c17d18ba - stable/14 - if_bridge: Mask MEXTPG if some members don't support it 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 01a3c17d18bafbf4e76e9d77e8862525b50602e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=01a3c17d18bafbf4e76e9d77e8862525b50602e9 commit 01a3c17d18bafbf4e76e9d77e8862525b50602e9 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:07 +0000 Commit: Mark Johnston CommitDate: 2024-11-11 14:02:17 +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 723b92d3dcd5..299b6d80dcde 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -193,7 +193,7 @@ * 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