From nobody Mon Nov 11 18:46:24 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 4XnJRN2YDCz5cSNS; Mon, 11 Nov 2024 18:46:24 +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 4XnJRN22Bkz4Qq7; Mon, 11 Nov 2024 18:46:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731350784; 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=KK2UkIhRzjumYKedpHjwgFcSKSTJty9YlibBnwEaNso=; b=Cw/JQwqTX3wzrjRLlVioBLGdsNi8utyDj7TtpU+NIicofbj0wwLxiYjroTCFVoXBDJk5pj RLmY3eJglnUENMwTfhxUM4FbfLdhYC79LT/nbhhQbygvB9+UHU7xb1Hqojf4ZuJJ05EBi6 7D5hbLS4aWOQPu67J00kBgcm3DqcJL/gt+KxBCoINNPRhVPcbvnr5qJTAxtkIdK1Xsuvio En1GPa4Ox6gAAv42xnnoXtUdkaw8bocc2gJeXxK1Ae1qTaWGhhhQXu/98LdwvY22mla2uC IB4CWkaxWw2Krpe36k5az87eXMbcepECfKykYNQXePG5SXHYR/4gwS1h8iv59g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731350784; 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=KK2UkIhRzjumYKedpHjwgFcSKSTJty9YlibBnwEaNso=; b=Ajy6ADPjawRPw0FYwrthAXehuiAReJCKSCnz2HkgmKeajvVIGGnDoggPknNufgUU2YXWak hRMrWfdvnWWQ5Vl2FRXzVLbIEXzm3pwL3/cKSc2m6fLUyKzNatGTWRCACf8Q9Tai3gHxr6 N4YRslespg1RMQudh0WY62YEW+TIZKiqv4lTgXR25O2g7648V4Ggi5LMqBMUwpi+nWWCXj j4KVDtB7k/PnI/r41/qNv9GncVcqnQ41E8+qYTxucpxHS9juJeQem2lWqeWNtos84QQrMf WqImNHs/T6jn2lEavWSXlvPrfAsdSIJQmrgFGHYXNdES5GGgukai4EOfKmxPIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731350784; a=rsa-sha256; cv=none; b=YJXmuXtMnKSlZ30XuGoFOdi4ZS8DXJFpdo4EkesTJSX+qGz+ZVZUpZjSyE/ciuFQEBDsGo LmfkfB37Ku9Tp4LmG9gB4fhW2V74AueMpW4xxyf7kB9mvW4jQwzyoQkfOyRIDK0Se+l4+g IUpHC0BlGFfse97sD9d4DiG2jp/NQN5zwXwCJM3rqadMfKQzcpamtmZLzhMoNwEzEfznH3 ec2MSQ/XeXELw/t2KEETCRn58iqrMxr+TEjxWddliCp/NZ3qEEjQ9Oy2GAbLK4QXoQLWEG M0EZdzIPCpB7fvIph7UTD9pbYYYegHOhHPPh2W+AtGWJpPlIYR/nL80SETLE8w== 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 4XnJRN1VxgzdXk; Mon, 11 Nov 2024 18:46:24 +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 4ABIkOr6010458; Mon, 11 Nov 2024 18:46:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ABIkOum010455; Mon, 11 Nov 2024 18:46:24 GMT (envelope-from git) Date: Mon, 11 Nov 2024 18:46:24 GMT Message-Id: <202411111846.4ABIkOum010455@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: d86dcfc6486f - releng/14.2 - 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/releng/14.2 X-Git-Reftype: branch X-Git-Commit: d86dcfc6486f7b5b9fcbc5e5ad457b0d22e1c5f6 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d86dcfc6486f7b5b9fcbc5e5ad457b0d22e1c5f6 commit d86dcfc6486f7b5b9fcbc5e5ad457b0d22e1c5f6 Author: Mark Johnston AuthorDate: 2024-10-28 13:52:07 +0000 Commit: Mark Johnston CommitDate: 2024-11-11 18:46:06 +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. Approved by: re (kib) PR: 278245 Reviewed by: jhb, gallatin MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47294 (cherry picked from commit 2bbfbf80d3bb828ac782c2d990a1fba0eb51e45a) (cherry picked from commit 01a3c17d18bafbf4e76e9d77e8862525b50602e9) --- 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