From nobody Mon Oct 28 15:14:45 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 4XccPd4p2wz5bS5Y; Mon, 28 Oct 2024 15:14:45 +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 4XccPd45MFz4tQg; Mon, 28 Oct 2024 15:14:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730128485; 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=MaUD7SdS1czCczHsCOpeF8eXoQhXAFA/eRtCJKyytXo=; b=VX1PdND9Oc91s1HRwoM7GkkQyr0fyXbKri7MCkUKe2Hsu6OnajnCezhTDXEm4iuS2Nhp9k kHqnGrQVhLaT6HqLUXncKNQndb+uCJeFiikZ7WcMZmscpCi0NQGwAnjd1d0eY/dXzHXtxu ulm84Nl5OSpKc8GREt+4F59sZBlqN7gtIBPE4HoNbt2TS9WOkw+rl6pYcNiKhxWqUbZM1q 0oJmC+IPqiT2PEz2GkB2lHqW89ib+OYnpzu8j3SpJBJY8PIgd8rhw2m4l3NCj/gi2u73QR /1b1zQt5Oj5CecM7Cq340b4j/KeRZ4HefQpHcEbuszvP0pMdviWeoS9GaHu/5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730128485; 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=MaUD7SdS1czCczHsCOpeF8eXoQhXAFA/eRtCJKyytXo=; b=bZi371ATGIbVJS2gxik2fHftWXOs8Gab1eFKi+XeSiHshDcBTCvmw/8McM0nHRHB7+SSIS b81WhzZeTBHyCO2e84G3TaH5pXJ3fru6h159PZZndd2Ugehd9ffBHxsaCnE8HZW/7XETbE 110+ZK4V8GLO9RiXXv3QQ4lZ0SJkTBpikdlaKpP1jpO3Qk4cpsRDoNjM3XJmZMr9Gsgv3K KMRKVS9QxfIjNIsYb8dXhgkP7LFGfCEQeWgO7CSQ72aewlticITZ8PiboXUuOCVhM7uUCE LqbCRHwSZp20OEh+AyA96HERSuYJ3ksmTnKO/cfG6V+QxxvhrAhIAUf79b4Urw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730128485; a=rsa-sha256; cv=none; b=UoPaMvG3cePpqb6jjM1jMX0CQqLyE/g9Fm50EI9gIVtM42tTUlpdZ/Cbs+iam9Wnn6HCpE 3HpGZpt6o2yLz1WtuTfJGLDm8oP6ueWf1LJgcgCUX4c61vPS3SIn9RTdf36AbIYnrXPSYH b34OKxM+cXlSCUtoJqu3pWIhkav4HEAtT2j130Q4nGnnUJgYQKfx+MMwDgJKJJpdPYADZ1 hcz5OIQmVh30NQ/suSGkiFaQLxZHxUGC4UMeQv/y9tAMj16sy4rpUE8EImf3URs0OOPIq6 EvW6cRptb205nZpeGOUSVcwdZsCCDaR4xD65vERyqIWn4FW5k/JurnkHC1vXug== 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 4XccPd3hWDzks8; Mon, 28 Oct 2024 15:14:45 +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 49SFEjwK053704; Mon, 28 Oct 2024 15:14:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SFEjVO053701; Mon, 28 Oct 2024 15:14:45 GMT (envelope-from git) Date: Mon, 28 Oct 2024 15:14:45 GMT Message-Id: <202410281514.49SFEjVO053701@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2bbfbf80d3bb - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2bbfbf80d3bb828ac782c2d990a1fba0eb51e45a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2bbfbf80d3bb828ac782c2d990a1fba0eb51e45a commit 2bbfbf80d3bb828ac782c2d990a1fba0eb51e45a Author: Mark Johnston AuthorDate: 2024-10-28 13:52:07 +0000 Commit: Mark Johnston CommitDate: 2024-10-28 15:14: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 --- 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