From patchwork Wed May 23 01:40:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 10420017 X-Patchwork-Delegate: idosch@idosch.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C9B32600CC for ; Wed, 23 May 2018 01:41:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B834B28DA6 for ; Wed, 23 May 2018 01:41:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AD53A28DA9; Wed, 23 May 2018 01:41:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, MAILING_LIST_MULTI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8C5A428DA6 for ; Wed, 23 May 2018 01:41:42 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40rFc447hzzDrbk for ; Wed, 23 May 2018 11:41:40 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="x7QZaJZq"; dkim-atps=neutral X-Original-To: linux-mlxsw@lists.ozlabs.org Delivered-To: linux-mlxsw@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=mellanox.com (client-ip=104.47.2.62; helo=eur01-db5-obe.outbound.protection.outlook.com; envelope-from=petrm@mellanox.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="x7QZaJZq"; dkim-atps=neutral Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0062.outbound.protection.outlook.com [104.47.2.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40rFby2DbnzDrTs for ; Wed, 23 May 2018 11:41:34 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Am3aI+LrTQgwvBhTUaWI+cD6VXZLFQtojmOQ5HtfPvU=; b=x7QZaJZqqFy0K9KBjaOUi/myOGx/Z71uM47BV7HwJU90PZS6Pzpz7kheR5F4jHeDNdZjI0JR90hGFaZ2q5Qq4kGf988KKTIXxGrV1H14RImOolgqpRcxoPRixM4i3Ch5gmCLckh2l/xszrWKsa78KmSjyciDpT/9Hslc5IS1lq8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (89.176.83.59) by AM6PR05MB4183.eurprd05.prod.outlook.com (2603:10a6:209:40::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Wed, 23 May 2018 01:41:29 +0000 From: Petr Machata To: Subject: [PATCH net-next mlxsw 4/7] dsa: port: Ignore bridge VLAN events In-Reply-To: References: Message-Id: <2a8ec6f5075ddf7408c9c891cf145dfc945d940b.1527039181.git.petrm@mellanox.com> Date: Wed, 23 May 2018 03:40:40 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 X-Originating-IP: [89.176.83.59] X-ClientProxiedBy: LO2P265CA0105.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::21) To AM6PR05MB4183.eurprd05.prod.outlook.com (2603:10a6:209:40::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM6PR05MB4183; X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 3:AlN8QPi7qEoKE4Hei3igKq41seAkJAFL8NI/n6vN/YAw3zNWr54rpCqw/CfSDWixbhWULAGv8EVj8NopBxBMUscbLcEQYUr6KZKmam1/T4IVPSvPuOaiDHEZVeb69w7AhdLtH5rHglv2pV3opfHNBHIRyFYzb1FAodGnhYZEum1elL0Zu/5UFoIqGqst5iShFJ0uoP4F/e2SpZg29NNpsq6vLQQN5Yx6NyF0U45MKnD3TBdWX+Byb5f2XLIaavu9; 25:lWIAwQMzAT3Qkhhg+DHPsMbN3fbASZ4TRJzG53qEic5Q8n6tIMq7Pz/QKZJ5iMsahgR8KdagLzJSosFMArXCoqB7QrAfCK1OZdripKA37AOem8jHnyMGpyf5Wd/rYyk2CGLgXVkmgWR1jGiZxsH95yAo6cJY+AGAQroos5qQupBwaOWQ8+CRVrhz9LdQ4/0RtrbUW3QQfam+jMnFicKS1k6yzWFfHHO7arbjYnvTEVQnnr5V9FcHTp5CSXaTrMEQ2rddCTEY55gRa8G+2l3shP/By/TbtgS2xS4ojuiUpRku0pV0MvztnyCtRvkC7DhefcptvTXhSqEvXfKrik8ORg==; 31:xQaSC7fECNhqBgVUFoIlbBKjai5Msu1H1YUCDjd08t1VQkP4YcsRVSsnWTmr1gTP1IOCf2Ey1mE9YAMTyczYJQMUGqXXpigwitu2xpTHEh93vijY3LgdHltphukyQwOxwcUkoVFGRquD8JipYsMMo/0EIty4/vWyyM/G7X0cfTH9wYwRYCfaCBkJk6Q2xN5lmvM8+vaKwupJSfmEV0ZiZqchSEXQEPXgp317yc4oBOA= X-MS-TrafficTypeDiagnostic: AM6PR05MB4183: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 20:OXX8244wm8R7RBuep1+Svsvlxk8BesYou7olA/FTYhfQ/nHzV49ZaxFXt3sxbYevPduepsS9Tf06M37xe0fPz4IAjy+aDtenq6N6SxvA0eMlXBJh3zjqsM5z5H6KgvZfkOKbLQDQRxP4Do9qzVOvJct4IKwJRO0vwL/L5YDErLHzg9bmrWt4cTWhgUK5s46ibvXFmvMQct7biohUI0MPlrwwO6YRXa9kGcT5FPURpHQyG1I8qp/1pEM/faN5ulqDRi4YSypNnhOWdJIW3Eg55T+9Q3QP3lLLTxqISadnq1fwDETH1QVsSKiBuOyqlVaH15xV2paGe8eKrpDxtE0wYnudHHT4J/Y0dt7jIn5lEIonWqoa2/BwADE+BbxC/bxQtKh0aByDgNtV4zYRs5nL8pPXIvcUhG6wHmOjiw50UJAMy103wjzDhjP8dFVI+IbcgPf8dEeLULYxeJ/GjMYoBCF3f1WKw9iDoJzpE+c2c7cqA/5WjPTYNk4656DiTxL7; 4:HTmgVGx00eBbuhRn2r/dWUqSyMmHwxJu2L/bir9y3o8C8Aa1kI/LYWtQt6gayBqscVymlHgdqfq8jeY0zoV2bken2KPcEYfuBW5suIWTJm/+dYozJvvRW0FQh3TY9i+e76gbpg2cOsjzLc1stxfhWcM4hxJbJO4q8GZQQTfj8MK+65W994d8Cn5XqcbLSzrG+DCv0ohRGPhK3wK6YQK8cBRPBmIE6DcgObn4hEoMuARcjK9sqBVrQ3VsqFNQqPf31SmuOlWa2OhyeOsY27trmQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:AM6PR05MB4183; BCL:0; PCL:0; RULEID:; SRVR:AM6PR05MB4183; X-Forefront-PRVS: 06818431B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39860400002)(376002)(346002)(396003)(199004)(189003)(52116002)(186003)(53936002)(76176011)(51416003)(6486002)(6862004)(2351001)(86362001)(26005)(58126008)(37006003)(316002)(386003)(16586007)(478600001)(6116002)(3846002)(5660300001)(97736004)(118296001)(81166006)(81156014)(8676002)(7736002)(305945005)(68736007)(8936002)(66066001)(6636002)(6666003)(6496006)(36756003)(47776003)(105586002)(106356001)(2906002)(476003)(48376002)(956004)(2616005)(486006)(11346002)(50466002)(25786009)(446003)(16526019); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR05MB4183; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR05MB4183; 23:Udl7zgQ4S5k7DwItCmpOb3ro+fgruR3H+uwnNwvur?= =?us-ascii?Q?NvXkECFgCjA/EXl8vzEtn4w7vJGo62KUI0W03jeUdTc38I8e4BJoeTigU8hs?= =?us-ascii?Q?HqGbGSLuX5w/U346L5ChWBMeD7N33oGWI+eGQtTwW0V0tA8kk3a6RmJyD9J9?= =?us-ascii?Q?REzgVjqbcWohDX/h3DARVCpdR0hxrIx+F6jOXoR//RUnMWjhRGJhLNsB4GtU?= =?us-ascii?Q?QrwkEg8Kun9TNSrSjU6zMqN3tAg2+dxDfOTczPgwJYafMH+/CObUObNryfha?= =?us-ascii?Q?ACu9tmFK1QmEMq8EsWwyTkM8xc6unDJ5DgAHONRVe7YM6IIqrjZnCWcMa2xE?= =?us-ascii?Q?JFN6sHEoPiNghS5e6R94PAr3yWcyyjwvPE1qTOYnbuvgqsWEn9wurWZ02yAh?= =?us-ascii?Q?Qj5cs/aue7PAlBi0Oavr9AI1PEAGZCYE3PrfRJbdCmexjgTMr+bhICKHlxpO?= =?us-ascii?Q?7qhWBo2PjzJublt6+aH/X59j4Dkjwku7GYLkEWu5DgVSXzMFD5X5MKWU7v/f?= =?us-ascii?Q?Vs5PFd4pkcSgFeuZP+86OXYWVUYn4DTf4GVJ3H3zR6SUe3e2s92AQ6XJqs4e?= =?us-ascii?Q?khhFh6vdl4Az3xhwtr5JsCWpKrXxqOEzQPfc0L85JFDtKxV4w9e/c3vpf/H/?= =?us-ascii?Q?f6h23OjoszC+ogEUzlHXMC8FHMPImtDqVkquKnNQU3nwbzFZq595L5uhnzXu?= =?us-ascii?Q?auRb+oKwt2YUUiAMhuoHVYefAf0diK/4D1AJ/0D8KFMoZLWfi2c0aSoK2GqU?= =?us-ascii?Q?Dbj7NDAvYEvtD3CmNsGnCbWHewL0A6dqFp0ps6bI5akUghSq2cN3E7FZ8lM1?= =?us-ascii?Q?GQh7aqX+JJeS/mVf/gpBvOf2xqbn5Bj4PFRm7IBDM5VYLsEfb5JDtZXCeALZ?= =?us-ascii?Q?HqqfP+HHdVxjIxfU0CZGa+mg0qH6XvvAAsXsTcnkBmw76u44IMovpXNgEi90?= =?us-ascii?Q?Sbob61ne1KTWJsDa5qIpd88dNjn7d/kpBsiz5ghaHKVEKX3p4jkEdYbMW1fJ?= =?us-ascii?Q?D0sww5y2tXIQ9Tq48t6jRDW6zhYLEPfk7roZhH6BL3N+JipbvHA5d87jwnLK?= =?us-ascii?Q?55hzlgE0JsARxQETf9MyG5pqkjqVlApCNpXbmjD0MIEQeo3ZH5Z/+d2QU03p?= =?us-ascii?Q?6lCDvpRK3HmgPEWU2QVatJ8RlTOgIk1qUEsJseqt+zZU8Q5mtzQKF4Y+ZWiv?= =?us-ascii?Q?WANvMGOM0GM3M/QnK1iR7+YB66y8P51ZqcudD8p+i06H9x/jDokeOzN0A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Antispam-Message-Info: r/OFYuWVO2nP1+bWNwoO1A/83XnDJ71jAW6tRE6v5VG1t5eUmIXsWVAoA8JpWTvflgXobG3I9rMylWTTDO2vSfFVDZBUlW7PxDDrna2msxYJGNWt29tOjDloPfFcwpOrt8Hkr5OwF9kZB7+koJdkeITe7jJASonpD+XJCe3oWeH8MZwdwooCHJ//Gcr6wOwP X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 6:3e0DLayqhoggLmhymDNo/0AG68/+ETRWDyL7a6932kwZOu0ya0knPgpb8DcaghCf4oBN5ayGDcR5o9sjPoapcBbx1L3xHTpcOdAV9AXl7OqgJEsK+JifJ+/h34b9YMKyQrjetDuZSceobxYXQZSEE42rV+4YEPphxKFcO8gEB2sczahPqZT9Xdj99dVTs6qk7AF+Qn2vFGNlHCAZMrsbZJIskX+yKEuA9Rkw9PtVq30UzyF/Vo3g9+nik6pkIcllWaQ+8ayCf1513+zqLmfYcYOHMxT3js7fnyt4/TUVzL1jU3MvalTDvRNmcb7RFQXZsGyU2qqdaqlJBhVE7lCBf1k0D9mvgLC2195Efre7Hel3MlB3nL4NKpNH5PH8esXHAoudQoHy7+tayIxi6XvE3no7dauD8a36I+j0nOAz65rx2ZezioTreuMH/KdMIQFW3+Z1pogcAAIhoNu/dXiSTw==; 5:nDY5bQkGsHf/Sh6OhKLeb2M2ybROH+QLzvROPTlaq3c8z+JVIY3lNycxLoJmhonC0/PoM1hFq6oxtsq1AeTbDCHtPJzorhQpAuzTdSdgndf0IzoqyMY97sHWh6Hjxv0SkikIdVvGNFQkTOOa331f870CC/QXG45zPRwuKJlfjz4=; 24:9Bqte40qSlW/Ybz6af8YotTcFanl4M5Neq+UAiSUgsRuvBx9G8Tl2osCJuWenM7HqPqhkZ3NXxDwoypp+1GPY0b0lMdwgQ80GNnWve7XcIc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 7:V3ldnuY6iflul7RglA9e4rYAJpPjJVispQrc0Zk4h6RsQbecJRfJ0XyfzhUZ6+W3eWA4bJB92k1Sm8NPjSYcBjvFMnzreyGxfXcoa2L60r/cDEOik3EoKND58FFw4rbH+Onf+1izhAjGELDWVfLgShsXU2bbeq+mfa5Mlh3kFWnydOO4vhQnp5Huypj5o+lR8w5DsZxUEagHPL0DOO7pvC/POP4MiDN83nnbaLjQc63+OjfLjg95bu1ObJAandqt X-MS-Office365-Filtering-Correlation-Id: 327385f6-f885-4576-a9af-08d5c04e4e39 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2018 01:41:29.2833 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 327385f6-f885-4576-a9af-08d5c04e4e39 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB4183 X-BeenThere: linux-mlxsw@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: mlxsw driver development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-mlxsw-bounces+patchwork-linux-mlxsw=patchwork.kernel.org@lists.ozlabs.org X-Virus-Scanned: ClamAV using ClamSMTP Ignore VLAN events where the orig_dev is the bridge device itself. Signed-off-by: Petr Machata --- net/dsa/port.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/dsa/port.c b/net/dsa/port.c index 2413beb..ed05954 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -252,6 +252,9 @@ int dsa_port_vlan_add(struct dsa_port *dp, .vlan = vlan, }; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info); @@ -267,6 +270,9 @@ int dsa_port_vlan_del(struct dsa_port *dp, .vlan = vlan, }; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (br_vlan_enabled(dp->bridge_dev)) return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);