From patchwork Wed Feb 16 16:47:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 543584 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E46FC433FE for ; Wed, 16 Feb 2022 16:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236580AbiBPQs0 (ORCPT ); Wed, 16 Feb 2022 11:48:26 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:43850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236598AbiBPQsY (ORCPT ); Wed, 16 Feb 2022 11:48:24 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A21222804C1; Wed, 16 Feb 2022 08:48:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekIyrTVlKcmf06QokmZW311jzc5O8MXmUsupZ5utH1hiIsnCMdqkRmoJIY/DJA4Zw0wcXSk1HKRcCOrhKsSRO4PZprL6MQjkH8BLKWdme9LJn2pVCyHci+pA5NH9gV6J3YWUNE8wUhNvQL3YWy39bfbEorY4uulrZFcRtCktXFK+K1muhRN8eoLn/gyVaNINYUrjDII1Bq2C0UFjEIisKunprvP5b7KXx5XC3EeNyGRdCpDWUpDi+31oZ9Aa2a8VVa2ld/dboszxC0V4+K+6f7oikW9My1SOHbJv0i2Y4+rMOizwi45xhDDcYXnMNV1zQ05TiwNl09Jk2UAX6qyc3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yFKE769psFV51b2noPHabpFVlRF4vyKlifQCkErRcfQ=; b=PnCulho7Z51nLlYg7i/a0ssxrWzeB3yhWVOjYe+RIyCuFvgodbQ/wOC7X5uHfLk13XKhxhodvPnn5fx6UVI6UMqfzlushuostIQ2OjU235QXBzV29/VhSTHCmEDOQESl6Drv9rHLN++o2mFE6VpFTNEBPP7rrui/Rz2i5vbb0zevm/JqgIEJqxP6yhYvzNmxqWVK6RvP9oPWZ9c2rx7bMg96XD7qWTPTHGaduIiMQZSuvfxQYo76RHEYIKWBY1ma4AW1xX7UEh9D4ATK/TpIy7b9KLnOK7jwgiGdpXb6BFeGNmzxIBNec3sJMyIppAZVal59Dt5v5/GHlOMMlSRK8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yFKE769psFV51b2noPHabpFVlRF4vyKlifQCkErRcfQ=; b=cCqjIN43zwfWx1cvBbug4iyCpmsWKsk+zMxCQxr/Q4MITOkKgIiOX+CkOWM0mNfHbNaODLI05YyYqPDd+Wht5zvwV5a+1A3qIJa6LlCZ7nR3fk7kwVcfvK2dLRtw0Kf7B+MZD6Q3fHWWTpQZJvBw9DaNrBC9zklpR9R5TuVIFYI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14; Wed, 16 Feb 2022 16:48:09 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9%4]) with mapi id 15.20.4951.019; Wed, 16 Feb 2022 16:48:08 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Lars Povlsen , Steen Hegelund , Grygorii Strashko , Karsten Graul , linux-omap@vger.kernel.org Subject: [PATCH net-next 1/5] mlxsw: spectrum: remove guards against !BRIDGE_VLAN_INFO_BRENTRY Date: Wed, 16 Feb 2022 18:47:48 +0200 Message-Id: <20220216164752.2794456-2-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220216164752.2794456-1-vladimir.oltean@nxp.com> References: <20220216164752.2794456-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0302CA0009.eurprd03.prod.outlook.com (2603:10a6:205:2::22) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33a27278-8aa1-4091-feca-08d9f16c1c8d X-MS-TrafficTypeDiagnostic: DB7PR04MB4091:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:923; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DT3RnbGVy2S7BVUw98wYkBayFDcFov51jsHw3oFSxZXJDHw7914c1qtsT6SBbQcAL2eHHCYTgc0Zq/RPHOeQvh+S2eE8FErOMhHXq1Ab07josIodVG2INTTaTo6wqI2mLNhqisW0xxC730QFr2soOSMu1LzNvGPdlqP/J+bPW/eHX07RX95eRy7UXUsQ0TN8tM2XizYSAY6n6O4MkPZ9L8Cc/RgwFZqXZ4mAT8ZJThHqMmNoQv4Ss0YguNt1TLiPditS1fVJVV9bLu+FDPNZG7piM9ZFYHzjG0Qo2Uisvwx5YHq8lPJR0Vi2D+PrSd4hcgxW+mHD3YE5BVCUG0eS9LeurcIoeg/OJvMFsYt8KSQ3V8nn6K0Y8ffAM4ZF0N+qOzBlD2DanRJzDDkghNqd83wv7aqgorjpI0tDmcpne5Fo5oDyELJTcNn1ILZNiXO8sDbRI5b9Je/eBon1m33H801Relv0B/AsmZZkOt4hT5TzaYAiTiPVr7WzGHxiYKYUCMOfaPgv6BWcUgIEGOCcoXxIfFBU8yR1O5Fn0tG1Sh/Z5PxB5kiZlwTm+rRT8dgyQWkwCF5HpIKdCtVWQJwiy8INLkg1Fx4OSMO84mjihuzKQBUzSl82KGt8yS3MRf1nJy9a1HNvixCoTUbaxQyZ3pEjXfQKrjE9OYuQjzLA8HIWfrdCInsZDvl2+wwHykKiMU9fVV3pvYIUoYuIzNmXig== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(44832011)(6916009)(5660300002)(8676002)(52116002)(186003)(7416002)(36756003)(26005)(66476007)(6512007)(1076003)(86362001)(2616005)(8936002)(38350700002)(6666004)(83380400001)(316002)(38100700002)(2906002)(6486002)(66946007)(66556008)(508600001)(6506007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FQC8XdVYIg4drrxoGzy0gHZQktdUeevUQPccw3S0VnfLL4S5+yKQirCFFFUIlIqu7icg07ULNdEuxncWS95iKr4599w2RKb5M4nLbEDolpgHGHwhesLEF7j4re1uIquesdqVyY/bAj2QkwJ1oVSSylB4Hzll6WJgpUbk/VTt3JbhC+pEX+uU5a/UoynZLea83achQdIzpldxrK7xv646WXPl+NbWL7/TTWH38BN+duAPaHYu1oRko2t0wugHfzjbyVMiUxppDzqQoxuaSoFt9TbyQ6BiEu84tahfGlPrNeGNOex7IuoqmB1ns5Sbkk9JJgrv4VslFcHlKN2dFALN2WcYTmJIOxEo5pY1uzEmgbKEsEDkLuIe4LPV7p2glMutOTY2Rt1ALKsIIQOvqCi0bISIoxnxEtvyJ+uptIVTYVtefcJ6xf16Nyu/7aMuPiXgDzWuOLYBWl1XZi+l6zKGCAQkKsASnSCjuXJukO3GH1hDoyRypTmlKTacK6qBh7Wg+mZ/vWNKdNqK0QOn35KOpDFWIAg3haUfHeiHitxuVsftCgIpGaOEg7QbUhRfnfGg4t0Ge1OvGSlfesulGDm7SIKx5XmdDBDwFcUwKuvB6kTTF1IR8z2B7WbffegfHsE1z6v6khkc941bmRbir2dBERfxx5hzAiEd13O5N9Cn/MBw7KeHtemv3bwY4eYIXuW/BIRYGszKgq9jqTqQ/2JsJMMfcKo6+3PAmUI2tCa19MLsBxPmhtafSOL25eO4PuG/ANIxOK0+OUC+JWnFxxwYmc4DIWtWsxXM+JPf+vWX3umXLnzqGXNb569AyP8MP0DKWuMPHUyGjSHGPwGzOXvzSJDglphC7PphqhBQQqYYKZkBs8nnrkYixQpd0cLzxs8vYAtj11cmqeOyz9tKHEiHJOGPs1bZVV9/TcjdIgRbGkeIm55xZh+2bR+J22psC2VplsH7/W1w9axWGqnPuA+DEJuEWEfVm1JOWgOABjrGgQIgrStSNrjRDIgdoDeFkUC1pkkbXMcxe9PMXwQaErEBgf1vI647qH4kyBgVElx9SHJZ88Z/OcrHdhz+e1wq5UKVXWoHnb7alcVLc7glNK2W0Z2YKqSYJmcOfqeuBfRLuBvudvMwKsv606noA0AJkNLaTsGd4LaRU8uy6GcZnL6F0K6bVi/Mtyc2NBInCAWzTgOSQiGpIsgr1oTSvJkln83J9XPZnXEgbRAPVQB3C85XUzUYg50KdYIpciaLlrSdo6GJNmrWlJ12w89yuIMne2MjxDciIBiup2E8FbUE639n+FjNmZYQxYDAE/RaeQennnesgn6gc/OXGKeNz6PAgPJ84HlM4p7ZQKDPX7plkgTASlLTS8nQrkxZs/A7uiqLMHlJMC4KfOdNyNnwMEfrMD0xdxq09pjOp/7k90CSd0kQf6OV1UMMx8yPOldY5EchLXaMFqr/aw6cwLKwEHQ6Wdk1RSbAeJYYLinKu8lp3lrExSRA4483aPHTAosFxms4TW0sMplERl7j8XoY87wOxN6VPVUlcg7lV+SbpPNtFlxHKos1IFzpxXvQs00Y7ZHlTLQz7G8pZgeXtBVlhDlTnyB1IikVKzJdDxfh5CMC5rOH6hc5PtmPizisJkDKr7JuBc4= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33a27278-8aa1-4091-feca-08d9f16c1c8d X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 16:48:08.9340 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6f4mbG5ATCNZDseneSW+fnujMiHDtOvw0xBZGERBuAHAVGyF6Dv7CXrsh5e19z7QHttI1piTCIX15JsEMdLlgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4091 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Since commit 3116ad0696dd ("net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag"), the bridge no longer emits switchdev notifiers for VLANs that don't have the BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code. Remove them. Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c | 4 +--- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c index f9671cc53002..5459490c7790 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c @@ -269,9 +269,7 @@ mlxsw_sp_span_entry_bridge_8021q(const struct net_device *br_dev, if (!vid && WARN_ON(br_vlan_get_pvid(br_dev, &vid))) return NULL; - if (!vid || - br_vlan_get_info(br_dev, vid, &vinfo) || - !(vinfo.flags & BRIDGE_VLAN_INFO_BRENTRY)) + if (!vid || br_vlan_get_info(br_dev, vid, &vinfo)) return NULL; edev = br_fdb_find_port(br_dev, dmac, vid); diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index bffdb41fc4ed..3bf12092a8a2 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1234,8 +1234,7 @@ static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, if (netif_is_bridge_master(orig_dev)) { int err = 0; - if ((vlan->flags & BRIDGE_VLAN_INFO_BRENTRY) && - br_vlan_enabled(orig_dev)) + if (br_vlan_enabled(orig_dev)) err = mlxsw_sp_br_ban_rif_pvid_change(mlxsw_sp, orig_dev, vlan); if (!err) From patchwork Wed Feb 16 16:47:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 543190 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EF35C4332F for ; Wed, 16 Feb 2022 16:48:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236617AbiBPQs0 (ORCPT ); Wed, 16 Feb 2022 11:48:26 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:43932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236606AbiBPQsZ (ORCPT ); Wed, 16 Feb 2022 11:48:25 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9904B2804EA; Wed, 16 Feb 2022 08:48:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ru8EbBzu4KI7/SP4YT8ISuDSry00VWxfci+4jcBIasIB+QdyhjUw2fYJ20UAzKGw0Abw0FYs+kcoRigABwPgMRFNByLubtKtSgYsiazFqxOqk332OMZrIEOPMyC3cY8YB9MFe6YXWNqZQdj6XQql5QEsLbjiXuew8XB6PcOD1OCbhzHxETB/erEhKUsM9YRQPmnxHYP5nZfAfTiFR5nzL8leu+Sud98m96B+IlO3V9OJg2rSA0dV+5s98BO4fKNdIb1fM9l7oJr5pPbD/2iYfTQDtDbhHHBzk7gnO95qeFIP5dr5rsIau6Kh4G2CK4f+eT+SFxPNHgM1upGoXLHhYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mw/xwcK+PIeX/L6GS2jX6vmTbQ6FFPUpNSGkC3cidhM=; b=hjwUiKsepAKNx2g/GhRARD3kJGyni0w/rC4SVXC0cf+O0vxuaHmUACslUdZwz/pnxk1N9TnbD/sfwLNCPBZ0fF0EqnmPfMavchLgFXVb8sFi0h2Z+tx3UkKpzdxM8xXFKC9C8RJaZor9jx4q60WqeaASiK9Fx6eGBJbqHBoWm/ItXk6nXqAszklZTNWLlPKzJIg9cT7UbkOXsUtV0ldEhGgGSUw9ENd0/gMvPDgs0zS0wpQeca8C5qX15SST7xSXPDpMF2S7uG2OCQ7ZuJgj7+cJDRjI32WAunWrxa3APl3XJ+p8o0karM/CVzcqMqTV5F4VFL4vuXzpQ8uBZi9unA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mw/xwcK+PIeX/L6GS2jX6vmTbQ6FFPUpNSGkC3cidhM=; b=IikLXSgj47Q4hRlCEkRdXiOojC+0UV7ODRwi9N9UYk0VS9DXh+FVjEGEJgyptN5IPzdP/Qx/llcxP5kXGmRHY474e3u+sqdtv2nsZt+H8KjS+s5kNhaoF9izqef5CLOjug8jJVbEwmoCqHHlQIZBrHg64qaRCaN6XP4gyUvlfsY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14; Wed, 16 Feb 2022 16:48:10 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9%4]) with mapi id 15.20.4951.019; Wed, 16 Feb 2022 16:48:10 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Lars Povlsen , Steen Hegelund , Grygorii Strashko , Karsten Graul , linux-omap@vger.kernel.org Subject: [PATCH net-next 2/5] net: lan966x: remove guards against !BRIDGE_VLAN_INFO_BRENTRY Date: Wed, 16 Feb 2022 18:47:49 +0200 Message-Id: <20220216164752.2794456-3-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220216164752.2794456-1-vladimir.oltean@nxp.com> References: <20220216164752.2794456-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0302CA0009.eurprd03.prod.outlook.com (2603:10a6:205:2::22) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ad16fe0-0b54-49fe-de76-08d9f16c1d53 X-MS-TrafficTypeDiagnostic: DB7PR04MB4091:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 57uyoMvYvjdHy6BO6vlaODJI5I5WXQK3UwuHDRRQTpPzvvrcs1QjJu68LFnd4+U3BDWxWoltfZJrSjPJmuOdkCVcveiSO1db5GMFf1Enx4fljbniL01WZ+UXnCh+Dl5Y+XjDswjPGfMzlZd0uPPNeQ3e+iKNPGcHsmOQT+Vzvjal2xeKbmBwsyuqP3Qww53kqqQkLMySw4ManEC4faXZIdqVzdR1jdJ5YMdrDtyekcKJG5B0DWir79g3r4MKvkcyoKP0KkJ8HV1w1J8BkxH/Wd9BaAtl+N0h5Nlhquq3BCkgxq+x1YbF/Sy+Z7el3paPCdbDXl7WIxY1cb5gdswZUZhP5I/5zxa+9Kaexiu/XktwygXTt6DkA/d/ihvAVAms3n6ROLAn9doQfEXr/5vAqYo6R9L4KgHsD7iJoeWj08OtPz4zyXMo4/6N+tUDEa/jxjTo8tj7Qa73PIoQjKSIvKwWAdHJppfjv2IHQFJ/9luqbl6LWVK9bjpb9rTgic8pad+SvItsX1s4FoQHgjg13bNyLOzWUlYCPKdBVFunZkGtI9bXvMQX0/Pds1NYdcms/05Ren8zAZT+lOKk/19SgNa7xok4sMSSBNtk2CV65CoVVomcHvvFdsrKwdd+v0xjoLaQHa5hiLLJLrRm3mrrD1cmjiUWYIshyIYEfyq5ZbEcNP0idkdsvpjxIHyj2ZC3OvxhgriJOIO1xyKrNO4WAA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(44832011)(6916009)(5660300002)(8676002)(52116002)(186003)(7416002)(36756003)(26005)(66476007)(6512007)(1076003)(86362001)(2616005)(8936002)(38350700002)(6666004)(83380400001)(316002)(38100700002)(2906002)(6486002)(66946007)(66556008)(508600001)(6506007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6us5G9Qt7cgqc8jjE2O1QbxZdavZ6C82sClSJLoYujd6ISv465jzSMX4SMOJYdnDXfFHjMsHiZ2ioGVODOAHz6mU2gOO4Z2fsKCohU45+drhfdCI5JtqpkeyS/B1dWPooOXtQ26p4I/JRv23fkftg9axHKtGASi3lnTD2BeSPWjE0bC7xH5ysUZDc2d+hHDROS68He6F9Zk/WPCQ5hTJJRofjI2bjElq7Wdutd3+7VG9FNhNe1BQwXEB2pJ/m5JiykEvHtmeEipTyXED784LOHevlvKbRPphWR8+5rY/hv0z0WGto7wdowEtid0Ewbg2wTtvEm9iK8r7K+eQdVeO04UQt3oZtJGJRdZdPDPlekVEnnbVtCaneGLgN6r0pL3cO2oguJFgLRVLQwlcr/iyAsnCCJBrxpxBt+9ijb50wLAu+miBnFiXvNzwOeJuA4SsFLV41BzKXcdUhIFNMsg5u3BQlSqTvf5DzJ5deNyrFfaz+RYwaBPLj61S13YukubhVoNvHRNrqULBf7P/+1Gws3bp4Qu9pGnq4SEclGuTVyumye/GoDukJIX9SLRXlCfnXzFB8OKcZmF3GYQkTJIihGH1Kih1nDXMX2ohUQTFMp9ExxfDJauDH42iY7l5jZZoDROlao7c2igLauqoevytiy4qDqRGNjpZM3vNoFjJCacQY7Kp2qswVxNPNF869JVYVQEO27QhJEUHiLUo/tG9Cg4Beo4hESEdnFwrDiX62+LoQNmDahwCQrfsnq2cz5Aql6XX8MuVYlLZTumVupbqYzF1Yn8cqcfOlAnCSmJ3dwaaWp5q9jOe/4KTd0jv2AZlKgUAH6zx49G6qMXnFInYXyKbkDtGvVL76h4ynR3tul8E9m8Di6q0DDMjOvS6JSOb3PRpdmhhSvyV2+oQWHI2os+V8KTubLlGMsERhgnDQrnYmQuw/9Zzpn593S/L42WzXmPSAutsvvIzvZO+bCQhrgmlhyWV3NyTVxYCMdEfvo6uTSsOLUAPos1XK+tUKIkqEwzMjKeqehs3MadPze6a9Xp9gBaDHvoxai6BJkpmVE3LMjo3kJIsVtHwGXxZhnkMdJZ7ajoNqChJqa65F+92mGAEZqJedynOlQxbz/15T70a/ggMUw4Ap4lg93g64wUc8PcZPaO9Cgiylb+4MID2wnDBAjTt1jtitpuv0MTy6A90Uzr3f+GOmhiVbJDjj+Bec3lQvRqYd4NhxtRDoCGR9L3hozW1/sfUzWtO6C8SrTmu1Tgf+TKjhpv+GcrFZmPKaryD/AiOz+xkobP7zHdZNoQZubCbEYcPZ69EUOJ1PREWgNrnOZjo51BVF4Z2VDnkOQ+DFUgZVN5VZATbdUlgYZYI1z+awyeLTuFTgb+Ny1Qk52tSkfKcRusZy8+dC/ZpPwxvKpR4uRLBZXueIz8RdPPb2eSOte7tvMnU7EQ8pPUkT3tIM3QHvKP3G/zUTqYx/w95yOBUJTeQo104YQMuOUQm8NWfVbIrAzgfe5hWs2NFVazEQyj1bzcBlZwreknmqnNjfzM/Bx41DGpwoCs221w1YNA8wfr+13QkipGd+PGo1PXWTI3Lv8IQ+yMK51IHGNc3ji7BMAkz3z0fitKhWsBI3QT9HAXoPulqp02CM38= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ad16fe0-0b54-49fe-de76-08d9f16c1d53 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 16:48:10.2152 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: o1IiKyDDQcxbW1NBpfSTf1jEk8BmBwxFOAMuBmGKw/qK7YlksbTIqLiippcXwFOSbBr/VZ0xQzQ4FHWcC/MqsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4091 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Since commit 3116ad0696dd ("net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag"), the bridge no longer emits switchdev notifiers for VLANs that don't have the BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code. Remove them. Signed-off-by: Vladimir Oltean Reviewed-by: Horatiu Vultur --- .../ethernet/microchip/lan966x/lan966x_switchdev.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c index 9fce865287e7..85099a51d4c7 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_switchdev.c @@ -463,18 +463,6 @@ static int lan966x_handle_port_vlan_add(struct lan966x_port *port, const struct switchdev_obj_port_vlan *v = SWITCHDEV_OBJ_PORT_VLAN(obj); struct lan966x *lan966x = port->lan966x; - /* When adding a port to a vlan, we get a callback for the port but - * also for the bridge. When get the callback for the bridge just bail - * out. Then when the bridge is added to the vlan, then we get a - * callback here but in this case the flags has set: - * BRIDGE_VLAN_INFO_BRENTRY. In this case it means that the CPU - * port is added to the vlan, so the broadcast frames and unicast frames - * with dmac of the bridge should be foward to CPU. - */ - if (netif_is_bridge_master(obj->orig_dev) && - !(v->flags & BRIDGE_VLAN_INFO_BRENTRY)) - return 0; - if (!netif_is_bridge_master(obj->orig_dev)) lan966x_vlan_port_add_vlan(port, v->vid, v->flags & BRIDGE_VLAN_INFO_PVID, From patchwork Wed Feb 16 16:47:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 543583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B91EC433EF for ; Wed, 16 Feb 2022 16:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236606AbiBPQsf (ORCPT ); Wed, 16 Feb 2022 11:48:35 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236616AbiBPQs0 (ORCPT ); Wed, 16 Feb 2022 11:48:26 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AC68280EDB; Wed, 16 Feb 2022 08:48:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NP42f1bzbYtHGKSMJl+3aUh4jGe3f2fLO9TNjob8rivNNRQqQvNN3swWI8b9TbDnHrPdG1Ff9x3qNyOaMcVMbWzFHzmW+tVhYnzJ4BpEB2CZSNZeFL5oKgw7cdenWlErokbzPUQNoO/p8w0GTtdRSDqTnWmuwJkVAVBO8kOtXCBjNVcS/TVJyR/Qwf7ifpn/CCqb4Mk6Ormn1t3FA/wAjfX/88hquxaYsA7BDCUAufDEMGfzeJKyEwXwyoQmT8TYay487YU10VZgO6QXZnJe/C+P6r5Tzxr3OKlbqcsyJkfHLVLVCcXpH07b3EL+X7XjG2QLWIxxSXyTZqkusn0WZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j1iCwwhYTW1FZIg5b+BwBVsYSv1fwvjw+4eL8QeQtjI=; b=kbEapjJTTkQOyrPv0NkQNZDzoGuN/3ch2Tsdk3qSbJzm168jRbtM4yO7ykdcpCas+fxRLYr68iMitimPtpKMhdL8mgA2kcHVdBH3I0AN8OwiFd5k983ZJYgh/fSt3YFEy3OzQmlEByaN0oqaYaCSx+I83plDwMC+t7hnJHRWDJ34GYC9imw6gJ2tHGsP7pcrBAqdElhI7JB/afeIIUKy9vMxIWniSQ7b5R8Sp+U+hofH71+69ri6/mcRWwYiIoVlwgPtXrt8K7Xi2Q+gZtt7bb8NX6nGB07FqImEVv3b8L9BRoPx1brMGI67q5KRoqE1MZkV6NfCwmAKkh/ipYqHGg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=j1iCwwhYTW1FZIg5b+BwBVsYSv1fwvjw+4eL8QeQtjI=; b=B5guQx0n6zQiRO3wjz9cnFD2LrQIt0iIrMPRgPkTwszuLMPd0hyb6jPcX/tY6v83g/A2n+O67esulkp/oJJfmcmoZoggjt5jghmLdRKlDiKceHVXSaHGsKHjeXe/hItaOGrVnwN9gsQvkU87S4KVOPq6R415E0PDeYrh+oqoA4Y= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14; Wed, 16 Feb 2022 16:48:11 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9%4]) with mapi id 15.20.4951.019; Wed, 16 Feb 2022 16:48:11 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Lars Povlsen , Steen Hegelund , Grygorii Strashko , Karsten Graul , linux-omap@vger.kernel.org Subject: [PATCH net-next 3/5] net: sparx5: remove guards against !BRIDGE_VLAN_INFO_BRENTRY Date: Wed, 16 Feb 2022 18:47:50 +0200 Message-Id: <20220216164752.2794456-4-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220216164752.2794456-1-vladimir.oltean@nxp.com> References: <20220216164752.2794456-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0302CA0009.eurprd03.prod.outlook.com (2603:10a6:205:2::22) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 392f5bb2-52db-4a51-204e-08d9f16c1e1c X-MS-TrafficTypeDiagnostic: DB7PR04MB4091:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hACYuG9GGNlDF9CxY+ez1lH8Jit4XVxCw4txthN3EDdBsT7VcvBJxZSV1ODPdYKLI5H2gzf+rj5otk3TxW1V7xyswOlribFiO2gu+qM+tqc739tDtxqp+0e0NysvMU/Ne3SNpVQ1CG87I0nlJABfdQzmyxZ5cjCEeZHIH5hb+byHeu17g1i31vEhIB+rvvYtSGFLZTEIUV3twgFVBxvzFR0d4NAMye52v9xVrB2f93nj4SoZrWp3LgUCuYj6uJcJpx06fvTKE3PLvSMuoXEOe5U91emMW5fMnaoGRspP8+uyXed/D0Ys4Ikrr2UY/1RAklQyj3CD679rScgdVPBNnR/uRy/MqZ0z51dYi+1YHQWDeJfXikX9PHr1U0XOAGx+bsrKJwJ2At95qgp6o2TWNce813SSXcc+ffER9R5hJ9bg5NrHst9l7/c97Hxi7o7tBeI4Kjw6LtwSq9NrC9pqfx4MxPe2LmXHlgiUZNnaez3XLy+O6uIBkJ/OGF8bYc9CQE4Z7l5bnP5ri0etQAO6t2Bg/CUMs70cwiMNZuBvgoqUoTonMwMjPO3paQ7N8jX1lsdXwPBBzWpH2krwf5ALCMgvXAurGkpWkcfDPt1gf0qJmHjRBBtg8GZySFk9kEJ1vKWSNrtBHgp7Wz7629p4ZOLyAfVfYrJxX78S4dUpDkCaE1D/iN2nmGgCYteeT+f2J+AFcns+5XeSKOqCHurlpw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(44832011)(6916009)(5660300002)(8676002)(52116002)(186003)(7416002)(36756003)(26005)(66476007)(6512007)(1076003)(86362001)(2616005)(8936002)(38350700002)(6666004)(83380400001)(316002)(38100700002)(2906002)(6486002)(66946007)(66556008)(508600001)(6506007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +FgJ6BP3auvtospjjTkZ4z+sOWlSBNsO12jCaV7MDWUpWvtRSmDZ5h//jcnRM1290SNV3hWsKtxTw1PUrF3UgtwiYITacXgf93M7nuMHHmFxiI+k/OcqZmEVPPSLPvvPPE894fRqblCugiORU9rGoGIgjl0YDkFWdWVrwCkF3xpD5/ORjP/EHH7A74HKtPfIdVVH4fqYSo4PfvyDY/ojXbqMNTQaXZsJgVaiXgmh1GfRwrMr3wpy/BgCdi7P1btc63i/vLt8MAwYLOf2jhUy4nNm6hAs+4W9IP+J5wACxmRH+qxSNAjfX7gba5sodjYBK7ESF61smJ4ePSt7TRA3h9PRu4q9xjNPhTLtxdnNY2LabHL7oFolaNKaJctWHMeuv2bmikJpGQZXmcvVMDbYqQ288FOXq/Zh7k0pcFi3KenX2rEA5l46rKsE5PxVza1RB7fzThIy3iOpNILRvSaEt/RbOUMhjHoMZVB0MpwyVq8zMo23f7vcA73ySCto2DO4OPW/Lq/FkBua7mrnu513ZJGt8DwZo6aQQhydq62p5SSWJbjAlQUwGQMy/wySJc97ixfqi30hb5v0PdzBNnXu1WP8/oXV6muzA7Wmr5qi50FcoAIJuUCZDW2N4Di2ktY4ixqeqKncRQV1xvfPySlKapIWBUKcabKQgjvfjI6nOTCLM77DOAfNnzA3tYhdj616UYomP510hiEaSauKjkAs4I7SxwdOhMcqaUka9ee9LQT/7OK004gZOx6gP9rmUSYwP4URGTXHuALYhzEFrh5OOxBFB41aeLC4/awzeZkJ0xczQQEml/KmAK3XhGn1IGYTwPY5Ee1uxo3SebOxU95qxl1tqbKn/HQd1NPJ4Hm+k27fLcQTQJ704YW0ePQG2bt5dHeTskHRHYhfRWLuW2FnBGJ7DDHqdkzr0qwZ5Ovfo6jy2S3vGAGpfb6ztGfxVE1V1reSTIL/nC0v+IdKeE3ZPfI3ratccOT6wkpYNFJeSAEZXffmE0dz4nam/avS/aesoZ3K6J9dZ5urUeg13xo7mTa/asOkDrlbD0HocVHMudVRmH4lfIAVxd2tS2M58pYp2mc/XOX1J5tBTLpmyZ0ool2+ZrjdM3MgIjnKLC4rHgp82HiE9gtM+3Rah2ez2EuAS9WMQ2xhHOW7gSXz6L3uHkKwhi0WXKVk7X0xCXotNgNmY+TbO/CLNFFEHZNZmu34h+9+WuCNHAyAyWjg7TXcl1Pk/ByhbUTrEJZbpvkRx5+KcwezMODVT2kbMw1K7gvZN2jTWGSjErq4fwXURxiDl6Ar4T7ULQlXmEIWLDUm9+Le7jN8HRJxYmgblwWfnRaJWa9/GEw+qCqjtWqNIKuRBlZKJmZN0d4wmmY4mujpm6HFwWCWjk0y9Hw4bt+dBrH2biA0GupTvjKlsXrlxXzkC20mDV0wbeMDYPoMaYimuqiGSZyWrnxnzzxkFd2ORcPoYe09yYa19HYZX+Ibt3VaWnAaj6+Bv1F4lowNA9OLvzyI9pN+wOgRrCxiA1whKh1xMJrFIZqdTwO0f6Py4+d2kCuA861MJuhRHsNQ4F7aFjMp5FtxTSLECWc/bhV58vpJE4DaoxUB5HKqY6+qrKoXRkWgyxMyMccFr/WLk8SP9jY= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 392f5bb2-52db-4a51-204e-08d9f16c1e1c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 16:48:11.5432 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Qnp1YWsiyp0wtUCzb4ioDKq4ibGHBag348muvRXBtrwrA8Wx0T7Mp3SdyCQ4vFc+du/Rai+/nR/1tHMHAvCpCA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4091 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Since commit 3116ad0696dd ("net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag"), the bridge no longer emits switchdev notifiers for VLANs that don't have the BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code. Remove them. Signed-off-by: Vladimir Oltean --- .../net/ethernet/microchip/sparx5/sparx5_switchdev.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c index 649ca609884a..f5271c3ec133 100644 --- a/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c @@ -369,13 +369,11 @@ static int sparx5_handle_port_vlan_add(struct net_device *dev, struct sparx5_port *port = netdev_priv(dev); if (netif_is_bridge_master(dev)) { - if (v->flags & BRIDGE_VLAN_INFO_BRENTRY) { - struct sparx5 *sparx5 = - container_of(nb, struct sparx5, - switchdev_blocking_nb); + struct sparx5 *sparx5 = + container_of(nb, struct sparx5, + switchdev_blocking_nb); - sparx5_sync_bridge_dev_addr(dev, sparx5, v->vid, true); - } + sparx5_sync_bridge_dev_addr(dev, sparx5, v->vid, true); return 0; } From patchwork Wed Feb 16 16:47:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 543189 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9FD8C433F5 for ; Wed, 16 Feb 2022 16:48:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236616AbiBPQsf (ORCPT ); Wed, 16 Feb 2022 11:48:35 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236618AbiBPQs1 (ORCPT ); Wed, 16 Feb 2022 11:48:27 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49D0D280EFD; Wed, 16 Feb 2022 08:48:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c0OGrj7ZOaFruPZrdjuQtikxn9eI3IaJryBs4HLV0NVQ3B7W82BVy2xizIaaDj7Yq6pY8jjZ0KV7FkRNQjq8Ba3MV56cR3Gzc3efTQ+V2hZXUtu2+vtDgHmnU85PTYMsCN0yzGNVglbkUcI+Nfqf0HXJJWUOHHVR7VguDoxI9UbnP32BMKEUlzUxhrw+oa08Q+WukbAloMcN6yY+YkOLnnOJAZ2bw/k5G0ttBxkj1qfr9XxTFGGjPu9ZD52lCSLWVI0A0/uIVRPX1pO7yqxvgoMfO0Ts7rrMPw06nQSLfniyN8XizOi3u2zjXdsHnTQtpVuiFQrZzkPBHVUN3sEDrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ns6bcDZIr9IavkjqofzyHNouaIV2fyNuGoHSukZvYsQ=; b=BwvUku+56KTt9s8X675otqSj4yniifRRreQoUpLjWOXUadC7ON0AwLNSRUcM+wrnrHGdOBS2dVh94krLh2OX2Mdh43hutqi0QaixwZa2XqP3N3bZFS2aRIuSM1d5gYp/D1NISCUSyOfTQWZplwPNcDhiO4Ln6lG08m9VSA47vNYC+VO2FDsnrdkpr4as3U39wo7m+VRf4PpxJxKUDazXK+vUC9HnWatH2gleWW+mZeZm6bAiHFdjXAMUVhYy3LZlo13Lr0oSNAP68rO/yF/uZHd3K4w5K8Qrd1MVuOfQLzX+v14kodOzO/9aEvg0W8NfRgNhzOUmEJSwezp7HQieeQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ns6bcDZIr9IavkjqofzyHNouaIV2fyNuGoHSukZvYsQ=; b=g1qqi1UsHKBABc3zmrEC1oNSJlgVArglSa10AteNwpAXDcsysjknczbB0N1mcHGEelDuMm7BHgVOEG3jhunGH0Pz57BEtxVFKex2OChw6nCZftKwIksFcD28cg26QIWty+WkBP4yht/T2k7vlrLR/96fJWyeJoZHC+6QN1QDs1A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14; Wed, 16 Feb 2022 16:48:12 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9%4]) with mapi id 15.20.4951.019; Wed, 16 Feb 2022 16:48:12 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Lars Povlsen , Steen Hegelund , Grygorii Strashko , Karsten Graul , linux-omap@vger.kernel.org Subject: [PATCH net-next 4/5] net: ti: am65-cpsw-nuss: remove guards against !BRIDGE_VLAN_INFO_BRENTRY Date: Wed, 16 Feb 2022 18:47:51 +0200 Message-Id: <20220216164752.2794456-5-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220216164752.2794456-1-vladimir.oltean@nxp.com> References: <20220216164752.2794456-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0302CA0009.eurprd03.prod.outlook.com (2603:10a6:205:2::22) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3caf21eb-f347-4f9a-622a-08d9f16c1ee4 X-MS-TrafficTypeDiagnostic: DB7PR04MB4091:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XY0E1jdhi9RVbCyQkL8kagEC6CKpTPd2oIHDEkmP5DyGcaTEAuc8mH90TVjgVSdi9J12ldNokAwj9DGFD0hqu14HibqVxnSHLTo9oLA5pw2kF/APgX8raVEl/v1uW9FgkxY3K3LJiXjRsikPf+g8uWgGL//Ehc4ePu3x8HJflqcjbGkw02mO5a/Hl2yE/b2GfzFdpxZ2jGUAYFJmJiPuqz7+XCykUtm6B04F+GSF88CC0eGonLWfMYohJKsRFijyYF+6re0NiaAMzFWKlZqveSlu7B5Ue57/BPeaMauGeazwcrd0bcmgFJrOuKPkOd01Ful5SCUTrrfr/zGInugafZfvjAiRpfXLqsFeTZFigAYbN48+WN7qdWWfkyQBNqWux9rIaIwxJHCC7EeL175eI1+Ep65K+ZyjCX5+Z/w6TueUlJiGeQ1z9WhoPY61Jf/Yno4DdAR1mPI9P8O2DVCh1Nq4rqnC8AfuaQchUZcd1gBFlMeSy5vDj417dFzOnXUbCvAf98DTPoPRJH0YIWFrTelZ7ll0LxwlGXxT6cgsHRDVvtQmcs9yDZ8WwvKE2EOkHfoagyq/M8VRSgjIbYYwg6A7XjD70ipPHQrldTcR75vAC9WCbwyPqf7dsbLqFB07w2M+KXX+pXBQURXdtrpNRhkBx1HztQC//l+xRAM4z7X4T7Gr5WLdC0TjmkRVSjklJqiGivDqsaxiNpbhjlEXfw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(44832011)(6916009)(5660300002)(8676002)(52116002)(186003)(7416002)(36756003)(26005)(66476007)(6512007)(1076003)(86362001)(2616005)(8936002)(38350700002)(6666004)(83380400001)(316002)(38100700002)(2906002)(6486002)(66946007)(66556008)(508600001)(6506007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JDtEwQtM5l1ANbwE5zKxOGKtSQMDn9Km216O4DQq8+a94pOgjwPaO9JznMEAnsFcv0eK1TTY5XGWW/7R8VxA9xFPON1BuTygpPGHC9xechuiTYYKuenpzRsvRJ4p896YMa7u12zSrZ48KAnl0GUDIFVwAldPjZbS6Q2Ksvc7JNcAT2bMvh25VGZ6wsfrf3IAO0tjSYmuur9cSK+14MMx/QpNC2+gu+sEaX2zI91wpOYybwYtp3xiRcpitjQdluVJGIlZ9KEZMhcVP3wTRu2+X3jpUsWfosCr3lzNOzhoyUCqItrRyAg4tT7FTj/E5/RAIpwgdkEsKwkuaxY7A1Ocb3liXfjeFefmoo4Ns4pZ1zNXTyNgS6aqK4nHtTZy6OylOtDPoHGV042VKK9kexLzN416m4+9Q8KO8Awaq5u4/lxx9FhZe5EEUldpg7GDyU1o+OdmTkvL6JGyXzCkrX8P1nnDEi4k0TfxMuAABDWxNZKwuSHN3FlXYzd8nutQqpanaP+kalQmArCwlwEh2NACQDLTFFa2JzFLw9II/WwcojJ0JFJfcWmT65fbm3+sbZaMFx8cVpt/al0356Dw2EQmafR5JaIauJxtOtNGjDkyFkybxAoaxfRQtgTGcMzCUXDCTmitQRJTLa+2Uah9YawrcrW0KpTJ639JY3dl1ZYsLkLaG5R8uqgeSNu8h/IoOyn9KNUQNDHzLtjX6RQmRVdO/vL9fHFl6Fp9Qj1id7gsE/qY+9AVpRWRWMD3CFLHZDQgnJd4F/HDGA65cvrm5LndM/mA6mpThsI4BFYqS1mGZTxShyoSvQfVZvtV3T4nwiWj3YElWqDXqwxg9DyRXfuUt0E9TjwzLLN5MAGYJZhIzBrXpc5u5xplOiggxF5ZanKSJc6PGLIIoZc4fLLySQKPIbFMRS9sm+sbeH6WXB0/RmnR2QeCAiXIHw6YwhbnxADyEkdk3aDaetK2al/ZVHZ2BN5vMfSoscnr2jmGjcFNnRo2oOWkm+7Pder91JjKpAJXWteVlzZoTKx1xVpet6yjjIHUb/99/xia8Dl3+rmQK7bWvZOyjPWkfD/hApp3GIDrDLR65Zzx8LX/uiPvI0SV9E0u9Z5eqmRq8jzwJb8U+Kv/AuCoih44Py6xehDYJLW4zj8vn38exGnPzlFfRCX0e0aq8S4nTYat+D5fsNy1efoBxDsZPV9IVQ9Hwck2xWWV/3mlBF8LF27xxxtBbtfeU7YdFy1Il05MEY+LcvsDyP8QHe3AV7AgXksfCgTLSLzjF2J2xkBCQUvLwm5a10p4IEc5pjGUXBkLtRl+hTd1BslCx8ZjdCNl7dpsXPfjwyWCxEf6nfNDDQtE0BjCf0KkVCWeDUPRa+54ker6HbBP9XsoFo+rIv5M5EpN6k5y01i9QgPJjncphY/Ux9aCNN+Uey6PeLov1D8+qUjJqC/EEcdacjxI/FdyKFS+fcB42CragohSiWnOVWT72C0sPIhAnjsOfj71FN0/r8HYdZ1gjOSltvfNV5jgFYs/fcqGeeltVK2S7LlRvgunNSCISGeHISC5G7ia74dvSYGGapaNM/vYLLVHgn4FwmXjU4GHicFnVtHvPP8dS71vQcHyfiqHLb9lKXhPniKd6UQ2XUKGJX8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3caf21eb-f347-4f9a-622a-08d9f16c1ee4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 16:48:12.9027 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4y++ulviH55uPMPhmqj8NhDwhiGsPgwoxAEH2KOhuHSlqO6OCS0K1a5nEeNYWrzLpC3NrlMQr4s3EtAI5qJZ9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4091 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Since commit 3116ad0696dd ("net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag"), the bridge no longer emits switchdev notifiers for VLANs that don't have the BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code. Remove them. Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/ti/am65-cpsw-switchdev.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c index 599708a3e81d..d4c56da98a6a 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-switchdev.c +++ b/drivers/net/ethernet/ti/am65-cpsw-switchdev.c @@ -237,15 +237,11 @@ static int am65_cpsw_port_vlans_add(struct am65_cpsw_port *port, { bool untag = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED; struct net_device *orig_dev = vlan->obj.orig_dev; - bool cpu_port = netif_is_bridge_master(orig_dev); bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID; netdev_dbg(port->ndev, "VID add: %s: vid:%u flags:%X\n", port->ndev->name, vlan->vid, vlan->flags); - if (cpu_port && !(vlan->flags & BRIDGE_VLAN_INFO_BRENTRY)) - return 0; - return am65_cpsw_port_vlan_add(port, untag, pvid, vlan->vid, orig_dev); } From patchwork Wed Feb 16 16:47:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 543582 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3612DC43217 for ; Wed, 16 Feb 2022 16:48:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236646AbiBPQsg (ORCPT ); Wed, 16 Feb 2022 11:48:36 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236631AbiBPQs2 (ORCPT ); Wed, 16 Feb 2022 11:48:28 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80072.outbound.protection.outlook.com [40.107.8.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4781F2819A2; Wed, 16 Feb 2022 08:48:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYMkMCJW0Ov2946nJ6vmk30OA1n9KtlkbVs2LMHOmT3709rdBT8aMgk07YeuN6s6aMlOVsCK4UBtN/BTAPSQ55sBJtxDQXrrd/zBcqoxD9LtWOvYcFlyoP7xpyvgY8VAb2HsvXpAhJ5lnKHCMoUNIKjhsEUctRRBkc8c8MB/8Rfos/glFhOIbGtjUDw6uPlYG5utyM78BLmJpzEsL913yJ7n0zKIIYKC9iAasg90287F6vRaxgCsFlCfgEQQDNb9IiYjwAlsJBotz08T+HJBb73Rxfdxpu0Obzr5z34kbyZ4WRra1WLu7LFVRtqIaz2g1XMfMYhRykgJtHRioXPB1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=a28wi/5xh2Zt5W6xwbI/RdUMu6XiQwt9JfhXmzFxOO4=; b=lCTTaHCzVJcQ0AokPmx3p28Dd/0Ah7z/MSpTudA7m7YdGkw7c7nWx52Y/4NDB4swlNPYban/HG2O1pjB+vnq7E+fSkCMBmLKkzOl1oCylY/VZjkU3x1v9Nw1RZGWBy5rct6SVziCMXzAgw9NT7/UYxHCc2Lsos6q/E68uYlAd02I4FsvBVV2ZxLRlOYum0vdbXWgH00NlaPw0U29ht0FLB1OPmaS+TAXp1xYR5K5IYE//Iq+6Y2RLk3438fg7n0apIK7eh8756/LXxixTpe+fOItDfCV5Uzs6nTKHeKb5uVEhwkLIP5mT9I4wv4EUfDtyoj0rhtS79pZg1wR/Nntow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=a28wi/5xh2Zt5W6xwbI/RdUMu6XiQwt9JfhXmzFxOO4=; b=iQwTBuYfRY7DgeUlRfNQgfRQz/jYgyOWcq7+C9oskhxEMSzy6FklQQZiiK/f59/0S8ar1YR/Gk5IiClrqhA3r1NBDXpjHUhRhkBBKVQ1dTF+Sj0dbWfL0Zdc5CimN0fRBEec1y982ZvNhZ7kZ78THpyGjqbuG7DUL7/imz2yd4I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) by DB7PR04MB4091.eurprd04.prod.outlook.com (2603:10a6:5:1e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14; Wed, 16 Feb 2022 16:48:14 +0000 Received: from VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9]) by VI1PR04MB5136.eurprd04.prod.outlook.com ([fe80::95cf:8c40:b887:a7b9%4]) with mapi id 15.20.4951.019; Wed, 16 Feb 2022 16:48:14 +0000 From: Vladimir Oltean To: netdev@vger.kernel.org Cc: "David S. Miller" , Jakub Kicinski , Ido Schimmel , Petr Machata , Horatiu Vultur , UNGLinuxDriver@microchip.com, Lars Povlsen , Steen Hegelund , Grygorii Strashko , Karsten Graul , linux-omap@vger.kernel.org Subject: [PATCH net-next 5/5] net: ti: cpsw: remove guards against !BRIDGE_VLAN_INFO_BRENTRY Date: Wed, 16 Feb 2022 18:47:52 +0200 Message-Id: <20220216164752.2794456-6-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220216164752.2794456-1-vladimir.oltean@nxp.com> References: <20220216164752.2794456-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: AM4PR0302CA0009.eurprd03.prod.outlook.com (2603:10a6:205:2::22) To VI1PR04MB5136.eurprd04.prod.outlook.com (2603:10a6:803:55::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ea36323a-c241-42c0-065b-08d9f16c1faf X-MS-TrafficTypeDiagnostic: DB7PR04MB4091:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:765; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qjE6LJhDKqVw6P+FzFWECufTnXidcuRVa5pL3sErEjOVeemVy2ucfQxpvD/AAL9AuNsim6Be9bhS0vMDSUSj+WAmbUOYz59WQrcuEukLpEfCd4aVF/lDxGVoNU2TbXVkZKfeLgQIvtikg8R4ysaGtouwoIZc/8SLCGqnH3BHKZm45xJAslwCdIBbAD6mHEpTKND/d0wiZA3+A4RMT8KMhQtMbnPSID4D5kIpXeDQAFhPe/z4a0Q+R9RrzpoCQSxnRG0CWZm/AUHR7J9whqxi+24RnmfFA9DUxwVr5kM+2qlomXqCx+EoxYBkBVxgylXRjnTys075y5nJD/bYlxMYuVYMeGwGDGOVGIado6AkO1Ey9UxRXFY4LR6MN3J5zyXdFWtgF383yjW6u/U+opmszwCxKA1rmC1P6DHEa6UUA7MFw+kdMXjcuhxtPw78zsVsclHwOZLxePZXyCgS/gNBWg0hEZpF2op9FBSUOKNznc0E/qFskWjGSVBFepvri7bLA7FRZvVXjxSWl4KnmBxxy++clSkGzFxkEqPjuj4FEZssLGbkq/u5q6H9JX0mWQSXUvomTELVPZ3sXIOkMNijn0UiPqOLg11dXwQiX+e0qxxty9smtzUGOG3CFkCKiPJrX8nINXZ2s20dO4rlUSx3XsQxjdSW6s5Y9Rf5e1mI7TmQ5m2xn07cSefPDvh+pluglmAW0zXRpTrQtdgNMtACow== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5136.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(4326008)(44832011)(6916009)(5660300002)(8676002)(52116002)(186003)(7416002)(36756003)(26005)(66476007)(6512007)(1076003)(86362001)(2616005)(8936002)(38350700002)(6666004)(83380400001)(316002)(38100700002)(2906002)(6486002)(66946007)(66556008)(508600001)(6506007)(54906003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PsDT4RTqOUjiWBxD1qjpgkua2BStFtGsYvsape1Bo7qhoL5QqJJy3W4FR5JMNm6jpEzlLYZd+hrLUYCdoOtj615UeNIT9rcdlV5Qpie2M69uEfYkIsEjUSMFKOmhX79AyZF5A9VFmwnDNFT9W5vkPfYolFWyeKZqPSP0iX114UAiHQa/9YtO1KkApeovQ+HTxenXP1KDODX+U2axg6fAuVx/l6WEuKbIfNj0sVHMVAQh9yRCunaLbO77VPAUZxJwuyOuxcJ2ZZdRa/FsWEAVVBgKRxpVRVNB9haAn95FzKORHNsq46n6ZVpQ17lYBnmgX1BwTI4mPcXBLmFbENPzI4/6BznL6bi3fQr++zgDVUV2Xp6QkDdpFXZmbYT+wPYmYG1PaEbMoKo8omZKrl72X1qjWIKyNFx4rrlBfGqDZDqmGtMzh/XQWCz33rg9739iv3QiOQiMddzJ+7t9VbL2RXgxCLL5T6Qc6lQlFUCzLY/G5waXgEnOHY46jTyuWJ7T06fxoMvFXXIYNKYhoh8yDqZ2LFHrPNGia9ekgk/qbwfFolLCMoZ7nlwX0Wo9Kq6CzLD23bsih1Fqd2/uXzBvY0lFsT15rATQZW+XmS3cY1XWytCQR/0LxTalDhaLyoK3cFX6ZW+1MzDqOI3mb+N/QyJTbvqytqhd5N1QKzhrW0AmBhKwUccFdgpKJsi2gxQ7BrolkpUHggGIA9FbSQz9NcbqUiHGl4vHfNwgk20mV2st4ejp0c6LXjEx70L30owNNfY1551MAkwPsccL8ejtihKGNl1MlC2xSXzE1uw/+07oSG2RTv4ROvqE3lR4XeoArdG/w1RwkmiJD8RoBGvej+1X6njzWPb3Z64iQYFyPM+e4ikLN0yaVMmnntz6JmwrrpGXnI5puBiQGfW08p4Hvcnr84HE6jCSVtloP+zsd9g0/vY3/GF1KRbWEnvNo+opj4V2RWpDgtx3jGrqynQCuX6YnglbY73Rv0NvKVzI9Ta7HsNMkBvA71zqeDI4GHm27Z43MVDtr/R5/IJTnAhv+VNngkWHzHuE0w8RrLuUk6oj7wrcFQE5W8/fm6z775k8dQKqjZNJ7OHtcTHbBDH1QnshFqGVhluhiD9v0gcGDD8KKa3x+OkK5BqA/6fIynimSrMr0bPTbBzPn8GSyI+0kPug/HCDGtRID76wZ+resaEAjwXUMIKUeBXYfOuosBtxqaaXuuJGzmK20dt9rLrAwBRBwIUYlYlMoBDIVyluy4IWm4sycb6tAIlQ9wMCdRhoHiP33nTzP4+84QoycQsebyDrY5qb2PzEtYHTm0TmJhlKGgwoEh9hCPDbUTU42H6xaEVB03R4ur66k8s9gN7WhHbFxQ3lxIR9AZMxxathcOLuFmtYAx9s8CLF8caaRBuKMkc6NEvERqNceAkCCpg0NOPBxAxw3JCkrT0sUjOySNKUCBXFLQ6S3Ae6QBSrahGRrZ0lXDLWtw6YtE/7IXjSDZpxRH5Gt8Rw9D2dbFxb1f07GTtd5gkUv7sMMroMSmyi97C1dfSW/GiWPNYbrqMa0yKeEpkeWbZdg/5vDgEq82ACd8QoOXh/OPmvBS5HKn1N8JiRrAzL57BLLUoj0XwyTA9mQp3eYDd0fvaER5owo7g= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ea36323a-c241-42c0-065b-08d9f16c1faf X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2022 16:48:14.1993 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: fkX5i/i7pjpZW9tslbqW2v8Y0sGFJggpNa6ZqJDsEAJjDWEiIV2qL8ehOqw0asroix9aoRvelbxB8GXOEmvDBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4091 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Since commit 3116ad0696dd ("net: bridge: vlan: don't notify to switchdev master VLANs without BRENTRY flag"), the bridge no longer emits switchdev notifiers for VLANs that don't have the BRIDGE_VLAN_INFO_BRENTRY flag, so these checks are dead code. Remove them. Signed-off-by: Vladimir Oltean --- drivers/net/ethernet/ti/cpsw_switchdev.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_switchdev.c b/drivers/net/ethernet/ti/cpsw_switchdev.c index a7d97d429e06..ce85f7610273 100644 --- a/drivers/net/ethernet/ti/cpsw_switchdev.c +++ b/drivers/net/ethernet/ti/cpsw_switchdev.c @@ -252,15 +252,11 @@ static int cpsw_port_vlans_add(struct cpsw_priv *priv, { bool untag = vlan->flags & BRIDGE_VLAN_INFO_UNTAGGED; struct net_device *orig_dev = vlan->obj.orig_dev; - bool cpu_port = netif_is_bridge_master(orig_dev); bool pvid = vlan->flags & BRIDGE_VLAN_INFO_PVID; dev_dbg(priv->dev, "VID add: %s: vid:%u flags:%X\n", priv->ndev->name, vlan->vid, vlan->flags); - if (cpu_port && !(vlan->flags & BRIDGE_VLAN_INFO_BRENTRY)) - return 0; - return cpsw_port_vlan_add(priv, untag, pvid, vlan->vid, orig_dev); }