From patchwork Wed May 23 01:40:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Machata X-Patchwork-Id: 10420013 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 3C9936053B for ; Wed, 23 May 2018 01:40:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A7BE28DE1 for ; Wed, 23 May 2018 01:40:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 287C528ED1; Wed, 23 May 2018 01:40:55 +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 7B46B28DE1 for ; Wed, 23 May 2018 01:40:54 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 40rFb866t5zDrbj for ; Wed, 23 May 2018 11:40:52 +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="aIj2sjSw"; 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.50; 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="aIj2sjSw"; dkim-atps=neutral Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0050.outbound.protection.outlook.com [104.47.2.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 40rFb249YmzDrTs for ; Wed, 23 May 2018 11:40:45 +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=yxblHswXhGYM2IcT5AhHrpXNdhvcCirzTJWyhXOYUaQ=; b=aIj2sjSwLpGRk0+x32/wdgTeHjxjTZr7bPFq2rk9ksMud1yiyGb04ZWULFHBLZd5uiARvBMnke+meCcss2OAIhV+1Z/1etz1UuHse+WsgA6RQttdRKtvI8pE5+T4tyT2GGx6JMvsT/spHEzrRj/sK+xsUSPb1mNUCgtC5m14sU4= 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:40:39 +0000 From: Petr Machata To: Subject: [PATCH net-next mlxsw 3/7] rocker: rocker_main: Ignore bridge VLAN events In-Reply-To: References: Message-Id: Date: Wed, 23 May 2018 03:40:37 +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: LO2P265CA0156.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::24) 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:J8EthIRA5l1Y3Wn5jslQC3pRa2u1ZE+LkosyFBFBSiMZ5gHpez/66/iFQ9+71hFimmR0RAfLuEwzyiwmO+XxF5i4uhPK4/YHUpmW2+DfwJhPQYzxARqMi3IP5llRDSOcrtkPnGI4YMUY6QGBMUH3y9K9LRryP59+sDXwBY5aMQqlDRIk6Y51PfQMwz8sLTylIDaXSwUHRZ9cvWZ8XySkhJf9RvWk35DgQH0lp7NHlHqhQ9A959XAAz0XZr0qARkN; 25:ciR4L5g0UlWeq6P0hxZV4Lhl/gFPnyG7CJwhh4NL5Y1l3cUwUC9In7rR3SVKX746/7S82pSxRNvIkFyKiSL2RqnNP+gvEW2zOOzL+RR/bRfRQ2XZ/VgmUOyErwO87P+PyUEmrWjU6Ro//oC0u0WCOVHjFERBEWOkGvIre0UMzX/x7ZL2MWBauLZ1WOeJbdwUA4JXDloNTGknr9xGupKx2D4KUujV6RNMlcoO+dfAloypGOsKnYrj+KhmRT4hFQsS7hskRLmTJUG8g5kaz3r2EM5IAJyeXhmAWy334GLhRQ0xsFPiVyPXTI13ufW+u4beCt6/kVWuPT7oNub3rEkPpw==; 31:X7VnYeLIGT2kHH3ZhPu+1ZReSBHgE9Eiyu5VWt9zBPl0ujpYT8u/0mynK32ENwUyLMxvc97sTWvLzyVXk3xCp5SqbvaVvGGF8e6awkTYkioODOgejeUbs7ovxAlLirSiXsyIvSOxQ37OhmLXSpFTrnKIPy1j0IeRpSGWjcmxr9tlFSoYSYwtrtDTVLtV90mYjfMMIkgOw7U/KORCT769nDm3/jbluGzCjk4x//ArZ9I= X-MS-TrafficTypeDiagnostic: AM6PR05MB4183: X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 20:yIFTjKS0RPpf/KOCphcsy06OCCJi2EXoP3PDgZvoDVaa8su85vo5Nr7ZQTgSZrHZy6BoliLoG+afNYFAdo2y3/fsucRxF1WCJOVkvL7nvTBGMrNWLj5hKIDYvKM3Nzb1bMhFB+1EbgSyHXT9wodH+HnynSTdNePgJav8ENXVG1n1wmlocNe9IL4EhVJwPCWgDl2CapRvgrcSjhm1j/GynKsC4ba16XPDUcZAwnh8Bnw2j+/V6UQBNp5WQ1UStVJ2uPJDVpwfGwsqSdSbrsG5+uXrCzRWbxOrx1egL+bKtahkzIvBgsI9o8Gs7RiH1UwoGsNh9qXNqEZhCglG7rMcuLQFq9vhK34RyR0eEknvVstDQyyaItGKWZq/EZ4rYauvUC0MbjQK+whMI8b02ydtqG3AB2/1ZOsXKN4Ng3ZBPGdOWYqEzwqqAN/MJ9IvFGee52JR8CwnJWFwR2+RVDl94r9r2ABP6Lyj7mJgL0XTGQBbd4u7T8slQ+hKcX3qzaQd; 4:d3H5+utFAopMQqM6jY10PjL/a6x3sGcyXvxrQohVylW0lbynZruWMY8FCGLjSoZ67wNwD/Q3Rv/CPDsFqNB7WVx84i3J19PrpzrNCrl/cjabahmk8oQud7y2WPs7Iu/E1gd4X433wDp3IP8pBU2Wk06pDrIS0Yjjwp9BFslsFRozuReVLAYUwCC1qx4aW5Uf4FvCaujBNzYSt8QfhgD0WHygXf87810nz3lCDuCmNma88znaHq9mNkm790S4RDGN9jQYmhzEKnvi29Fq7h0qWw== 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)(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:pqr4wsECpwCdWiMcJS3wOnLj/hzP6kYZExV3Ledkw?= =?us-ascii?Q?hdM9fAHtzTWW8XjXA8CIlGBrJ6aip+tZYp8/PFUqI4O4hHbppBv4dM4ZpSoH?= =?us-ascii?Q?DjRu0vf2cji9LxH/lFMiizU5PgO4stRTlLpeNA9JaPKwZPTG98Ay/XBCh+6w?= =?us-ascii?Q?ntk4A0pd5CSjDKcc37J1qlAcWKJSeK6OGuQ86U6esl4nS1ZHdLFGvYxxVL46?= =?us-ascii?Q?j7A+yWUvABsXZ2Na/jb221QHRhDllxdZOXDgqLtjkxOss6trMrbN3+7cdQ9r?= =?us-ascii?Q?VU+03eDmB1mJ0hyITX/3SQyRFcW583RMG3QD7GTfS2MmNoqcqBVnjsYEwqVi?= =?us-ascii?Q?8aTC1YFCbWxjDjW44qsiw+qAsZ3mwIjWeetsbYXWFDnILO3zDyThudImVhqM?= =?us-ascii?Q?gF06i7ojyChYY88vwfMvXOem+hT/yKCpjSEOZC4F5phhDPp8THNpP2wvLenb?= =?us-ascii?Q?7Y9fnLh6oVTER2KTF/holaBvBnEKKL5dPuMjco3Z5m3voX8QrvJbTI8Swvrk?= =?us-ascii?Q?0sBkeOXr4wURDUzS5KDotJTa9y+s24bsN/koT013Qo5/3N2cUXnwvcDvG0QC?= =?us-ascii?Q?+si85KhQqb3xlG79sQnOkje0yUOJkLt3tcjfAXl5lDWzntgMkMJ7TIXuxckR?= =?us-ascii?Q?7qjzGGlkihdVb9vQPh9mUPmApR56DYuZzL/x8JGQ6/IFyQzqA3wZxHLdTQrp?= =?us-ascii?Q?u6xsWUHYmMdq9mC4xV6O2gw5MHsRGvkT3BEb8bDzT0vK2l646fDPLQRAQEyM?= =?us-ascii?Q?0I1fR3u9qkRhmhZDGzoWqiuAq7V/eVBWs7blpCC6EwdHgkwlX82fS47I/p6b?= =?us-ascii?Q?MxIJjKNWaofckIWBE0DTfzjODaTF8Px3ptvvYqlF8FR2JVVx08DikQ7VISJ3?= =?us-ascii?Q?DU9hIOz13R9WgCyDDbUSzfMqJIZrqSnc8V6oq5B5l5ID59RWLBAxwXqLQpho?= =?us-ascii?Q?X+djJHWn0J8sd7A36QqQqJ0oGQ2Qcwe9ysFPAdhidtfQ/AuPzp1xHqiYr+kw?= =?us-ascii?Q?Vw8wEVhLGZyy7wqtF1aciOpmePeU/rABtl+Wd8UwMxilC0emUfHFojRVSGwV?= =?us-ascii?Q?ZeZ0U258Qf3aBVcnZZ7WO2VhmOQ8L8XP6EJKG1p5om/pAw79RnOweIdhyU+Z?= =?us-ascii?Q?2vzCFIxm7AyP6ojirk+7yojyNC+wKXNwBwjetKZb1vZoXrA98cB6RtJBCAyC?= =?us-ascii?Q?eEQkp02jdF4ZQWPLp0xmp7rHiGiL7VDCVNj?= X-Microsoft-Antispam-Message-Info: zYaOSyd1filjysh5HBDrLhkatcHhkCLShOt0dYxXobxi/GvfgJ7R0EnrrypQw37LXiHacIo8Mfkfm8jByfpH/GZxmckbowTszNROLQ14C3yrcxY5++n+aIBaaKTtJow6YhsDaskpcdMQEK9B0ENwglojQA3E6dqJ9h8W3V4pG7UGHEhkvDnnzeSW8TIWC2Qf X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 6:qpvq6HUJrlM1wlG+hcMjKWEJR6ijplJzXOc9bnBlJdNnSx5MLlNmZNI622NAYyoeW/tHwzA9RweiFr0MuBL2fXOYtUDcuussVfEyZ8dQwDrz4gfn9b0kKtQ1l9EknKJvwm9AsXSjB3H5cgLjwQVjGnsxWHvMczyfb0ZuRyse/b7yy3aUn9I6esH1ylJGx/bIKXA4XArNJga+tqZnb/5ZCXr4z9v366lrsxXFvjxn7nzwfV+xFACSwg79/huIsjkV7xiepf5hPZncUweXpWA8Osv+4PE4Hhiu7EIY2FRGpMe0noKEAgxGQNr8W2poiYR/4AOeXazdHbgZ8QmTsN42pNiOym141sqozDIYCrO5T/Yo3deAZqGZ4Pbwm0eZuXEb5/kQrR8vC0vzoWN9hXHUN9hN0w/rMKXasXtlpVRmTKjL4sZi4iXmaj6Wi9lOd1XYrRhJbpRC1laBR0Zy/ZlyDQ==; 5:zwZvbTnNYY/ak5tQJshSjypH5z89/JSdFOEiHlls8JykLd/Pgvbkd94UFKZKtECEkMyXO7Ymbilhads+33uyjcfGGe1RZgMKzo/1aNn9bc4rit9Jh/lOPfuOoALwEAG4cbMizREiPrDjUQXvvKbPDqR6jbiRN5zW4xmcX9FYo9Y=; 24:lk5lhBYSY9GKhi+oY6vyNku4hN/zbrwyu+pGZHBDV2FibgmKaKaL92XoUQl/zIXRRy9L+Q+Ooxir8Fr4LtJK8/rk/XE4XCpNrUl1z2oC4xg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR05MB4183; 7:yZaQJk7GLelxbQ6XqYB5vlKXpwo3Gtmjf38vytQvLVarpK+FifwWB40F1F2BGYg9OcD4EAVe1009cibvWSw+YLiDlaV5mUr6UrOnc4A97ECW+BHcDo1APg4HNnV6GcJ3Y1AcHctuzJjrAULkunx07cnu82SjDsksvyZFXKedfNXvOidpaJLV0H8sFrnQBXXwoDTucO14CYaekRsEj11NPdVPtT01nleQxFOH9e19XaPcYuQPnKqEsJysN1Kzt/cU X-MS-Office365-Filtering-Correlation-Id: 7d2f5c70-9a72-4173-6c33-08d5c04e30c4 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2018 01:40:39.9079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d2f5c70-9a72-4173-6c33-08d5c04e30c4 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 --- drivers/net/ethernet/rocker/rocker_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index e73e4fe..aeafdb9 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -1632,6 +1632,9 @@ rocker_world_port_obj_vlan_add(struct rocker_port *rocker_port, { struct rocker_world_ops *wops = rocker_port->rocker->wops; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (!wops->port_obj_vlan_add) return -EOPNOTSUPP; @@ -1647,6 +1650,9 @@ rocker_world_port_obj_vlan_del(struct rocker_port *rocker_port, { struct rocker_world_ops *wops = rocker_port->rocker->wops; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (!wops->port_obj_vlan_del) return -EOPNOTSUPP; return wops->port_obj_vlan_del(rocker_port, vlan);