Message ID | 146400cb6763f42d2b79377980a47a2924673c36.1527641426.git.petrm@mellanox.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="o23Dimy/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40wXKJ5s3Wz9s0q for <patchwork-incoming-netdev@ozlabs.org>; Wed, 30 May 2018 10:58:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968262AbeE3A6m (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Tue, 29 May 2018 20:58:42 -0400 Received: from mail-ve1eur01on0061.outbound.protection.outlook.com ([104.47.1.61]:16928 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966740AbeE3A6k (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 29 May 2018 20:58:40 -0400 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=DxPC5BReKiCR1QepGuxT5RaZfSJbVgTzDGxBviBCJbM=; b=o23Dimy/u9XPdn4pl/5glo1MstX8s27HnTnR09ajDBOWERv2oLpwOYFxXmx208E5pTlp4ZPkGXcDVmJIvRjlnFYU8b9fGvhDKYWK5BlMgMt90F2c88ouwe3Ac+mww6RF1wDKkAZwmPFhb43W3PbdclNURAK8+5LcYn7qXeD/9ZE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (89.176.83.59) by VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Wed, 30 May 2018 00:58:35 +0000 From: Petr Machata <petrm@mellanox.com> To: netdev@vger.kernel.org, devel@driverdev.osuosl.org, bridge@lists.linux-foundation.org Cc: jiri@mellanox.com, idosch@mellanox.com, davem@davemloft.net, razvan.stefanescu@nxp.com, gregkh@linuxfoundation.org, stephen@networkplumber.org, andrew@lunn.ch, vivien.didelot@savoirfairelinux.com, f.fainelli@gmail.com, nikolay@cumulusnetworks.com, dan.carpenter@oracle.com Subject: [PATCH net-next v4 3/8] mlxsw: spectrum_switchdev: Ignore bridge VLAN events In-Reply-To: <cover.1527641426.git.petrm@mellanox.com> References: <cover.1527641426.git.petrm@mellanox.com> Message-Id: <146400cb6763f42d2b79377980a47a2924673c36.1527641426.git.petrm@mellanox.com> Date: Wed, 30 May 2018 02:57:46 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [89.176.83.59] X-ClientProxiedBy: LO2P265CA0134.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9f::26) To VI1PR05MB4191.eurprd05.prod.outlook.com (2603:10a6:803:4e::17) 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:VI1PR05MB4191; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 3:+7IslmBhYJKALVRFcaaHCpkviyUYHaXVnMT5dhr8oQYaeH9yTq04Jy/A6hUIR4624IGeqxB/3+WXSZOD4rujSgNeFcbqKZ9Ymnh83s4Z7em7ORsKXEJpwqmKCB2J+PrJULxbbZtFsZnP1SMeK2DkbLApqQ6j/CTW88DE0D1l9EvHwKIovKVF0ehNx5duLK5V840ISqRxNloRhQ39ycyaDMSK1sYFGXgxg+RpMCrttvfM7JeKRIEoQet9IFsczGtd; 25:r7DVAixwUEbdQdCh2tsDfeY/FRc1mqMOZK8ecshLLT1gH0Ai+8304sDG4h2Oq8A6cJDiuIeK0SVsZ5M8kcDZ5cTH7djKKj8uGZlJG/PxEGtH1LdOVmpoJE4tCcosRzAinzeB3DfOCvfcDg3FBR3tNdec1zEKmLcIuuQeOvK1kTbawIrX/Zjg+uv2FnowaNRyjRy5WkQDLWORMAvUwIkEW/RxV7r8dWciJRZJYaCV92681bUaaEV5HKNe9hWMbSr85zpIe/NVOlb7+dnAA3oDyF82UNKqw7YzxOVsPC27y7kzejlnZkAMZEWpUEhSqXYD4yiTEc2K/jxSW4e4tGS75A==; 31:3ZmNRxVxuTxqPdO9DbG/qdZ82iIS3Bvuoq/j5nQPGLqciv8Jq2xytSkYGUlOfSH4PWa2PVC6nFg9qiSyjPWrlYXwyYUJs3VhEhg1u5yrry2d+w5R0AMQKmnsmZJ7EG2AYrYJ9WqGgH6vmllNct9K0I2KFvIEY+7DQYWj3s+3Wpd4xpst3Aj1lxu5SQ3CHMAkKGl9llFz8dIQd6hW73UD97/Eh0wVu4VhueGCyegUKHQ= X-MS-TrafficTypeDiagnostic: VI1PR05MB4191: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 20:7vZYT2xx6yjQBJdEujBrHCVT69G4FYWF9l2z+CNt5HzFRVLpGuFgkmz+9K7lm3vYC1t0LKMpV/9Ey/Mti4RTcnT/rm7v5D9O/JV+JkFVmRIUaWQMetBHUYi+mvVT9Rc2QwZsZc4+92Jw7m/JFHVjxfkQKHZama+8HUmNViRstvGDhZQ+MeIIrkzrr4frmF4mlA+FtDdKcYfH7kWhnqFqstwKERAGeGkML7Fng0RONngPzYNxAO0xz0bVgRtXhSKOZC5w5MYVz2LJ2cLs7+TfDmG6CjR8o7sNoSyC9WtjAFvCShGk7K5mr7dVMuxuL68vcxZWU6kui/3HQ0ENidofCe7FGV/zMezgd2xfNEXq5ouHQKI21XtW9Mq63Cr64/ajhsozZ0TBQVH84HY40hEJKDy3TykVjqooFfE+uc/jZ03fypuBlBfy9G679a0E/iI4gaqvvB4bx7hU3h7cwlPN8/xkep8UsiW1waytumZiE8MMC2KG/alElY1h7R0t/LRN; 4:FhnJTI+GrWDgeltdxmSGzVh5Sr3rILakRwVzhrQZBab6CQ4JjFjHLfHkwK7mivOeRHwlK2LsNeD+HHyhLC0eH07XkXKLCSTGN4AxN3l8k3+rYImeQmEiM4iEqfF1mGWBQvMQGpdXh/awPC1azKwD7bspnQZuB1odBfyUB5WqzPwTJm25+ykPqmO+4qvg7Sa2eP5QvYo3w7R1JXVr/Hm0QdWCT+EaDTs2A4dP9resojvL77y9IYWkMggaaW+3T9MSrDhGjoxaOrSwQD6k/XOQTg== X-Microsoft-Antispam-PRVS: <VI1PR05MB41915DDD96219286630ABF63DB6C0@VI1PR05MB4191.eurprd05.prod.outlook.com> 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)(5005006)(8121501046)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4191; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4191; X-Forefront-PRVS: 0688BF9B46 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(39860400002)(376002)(346002)(396003)(189003)(199004)(6486002)(52116002)(486006)(446003)(36756003)(478600001)(47776003)(50466002)(5660300001)(6666003)(476003)(25786009)(118296001)(4326008)(956004)(186003)(16526019)(53936002)(2616005)(86362001)(11346002)(305945005)(8656006)(8676002)(316002)(26005)(58126008)(7736002)(39060400002)(81156014)(8936002)(81166006)(2906002)(16586007)(7416002)(66066001)(68736007)(386003)(105586002)(6496006)(76176011)(106356001)(48376002)(51416003)(3846002)(6116002)(97736004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4191; H:t540p; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 23:IHJ/jSnyKGLH7coBzIkBUmYGFQPcT0pkwk/Ny/tJ2xHa1f8KdW4v9Br07ApuQi4oyW+htxVMzMf4p6N6rljKC6rFoePmEANYzKT4k6ir3mN/+Ns/3ehO6G8Frqskxjym3bk0R9A3iFELt9nCCQ/RKtrftJZiBN991GNN35UgRZ8HDEUzaZy7cuLs1THjif9fX0sbmJ07mBs6YBZ8+f6aC17xjB0/QBIru2UdM2Yp0JBawXS6QKvoolkTHb1nkGbzmRSeNLGNyFk3CWPA86XkhsjZFaCn+TXS9J9TQx8qFbUe7ZL5Bs7OF1L2n1odPXKABnIZPVaS0SArwY97RIbC5FUPbL/FKXceMXdd+fqxIYFeTDOtKPoIDZ6K3yymd+Ha5PuF0n0dtna5uncV+Qqs2OPG1aSawqM4LKNQhcviuLlTJYeT/b+q2yhXT/owF5szfPzQBwr75ulDjigv2a+JQi/EsSrtOZMdGGHHcSsB2oRVJLeAzXWyC5/ZKwppZiSqgdcB7MFAXb8MBY8qI/104ALkWV8YSNgXiPv4pfoJ6WnsQ4fo0CDUR4If5+Q4x151nVaJ9LkqgWhOiu99XR6tPJG7RW5JRQk1nnv1NnJPD+9oodwz31OmfIDioqgSutg35SMKQxb3L93yKM+eOXokFZWrCFRdAzQCgAv5jcl2sYg2YM4h5ot5mu+qLXf3Umei8EP773+GwRMKT2Y2EfbziOKH1p3XXtY8hJJQbMN1DeHzgUwYrdu6mQqzTog79/IFJxhfwml/L+w5U9W1pLoU5ORPJUKHZBNhrICgPJ90D2v55/iMimJs2KbEzjE9kbzTFPe5a5KDCoQP2Aqp+oLbggn7poDgE7nGXMRa98eJiT/2ZnKqDSNvQdcyNQf8oJC240jeX0xFhXCvnU/VqL5RuAE4SJMq+YCYOLhtlX7h7d9Jx5APzhpYKeDlEK1RrmhyNUYDwHbBsoTDBJ73Ps16Rt78t2Lv2y6SYagQfWigWmKHuNHo1y1Q++ONKLutlW+qg0TUVZG84gdP2nFdsOT+1BsGWzcp8vIgoz4LZiiommWUYTgyJCnamZ/a6OaygNFzzuFkxinyfYsWVg55fedlKCKWJMjPnyuGVg9zh3cvmdGT+KpP5JSrjP/ALNw8N91kKZMFm/7gCjUv33OExemQR72y8hPq0TE2zIfxkJlxyCzX00oc4395W6POXnimYqQ4CNDptukhQY22BBD2OCZBrw== X-Microsoft-Antispam-Message-Info: WiExX83ciNS+LY7vVNPo7/bI7iygVArLJ4DzEtyCSCGCrK7qKxhZw/oMifVm9d2dPhogLVCNNBvxyZpmcubmM9opcfZ5L4KBiLgIPZhJ2oq7zTtH6Fpb+4YMrX/RMgtShjHZ43S7lbNiPRS0fG/1j3WBIFIxtboSicFIIySqKwFmIFpWDbJ3L1haJtrv2klO X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 6:2YqeeslWT/qSutHgqw9ReXkC6ZwXOb1PbskZt3iRBrnedwZjC0XvFZGHyMQ/QHrXrJWXlitAMYgGdU1/Bov8bX4AVFW7oWdCEJ51QA0cYILfQ9awRPOU3XUQ2vw4H9YKjlOtfcsHe697gjc8WkdwLJcahYLHL87DBYdPSbspYL5mBMrbTuyyIaC9XK7zrwR6A7Cv77HaTYeaXqMXBtrPz3TIdB4RA2/2aYuGHLryHvWYtEFjMLJ0vKpI6n0zofSIsA2ZpHM0uId9k8bHeQ9bnyarM7YlmMnBNYpWpENOi/7ON5FmLQzW9a/9X6axYA2B93/UoOx97q4fcL9LpplXz/a0B2FWq56mB3klO9W6DCFtP0euYO3md1ANvP02o7FiTslhNJahw+uX4UOXa2/gQq3roAaYAgMBt/elXV1666WLe1xqHxMPL920mNQCmvY1YIFh6Xt3nm5499djP7JDtg==; 5:W7A/anJM3UovOMlWwMAeANROatHcqr0WC4SahvZqS/jZi7d4vqbGv16RfpErW0hDCX6zvkpXkvZalgOZ+LteoELhxQ9g25793uidDdv/BujuvfG3jl4d8NkmHb45tZk5rtf3Ilp6hj7XJjfifrMfKIMOWVCMoYQ5vtdscbxlvPc=; 24:OsAERun9jbmqVXn2zmKZDkn5re9utCmbMnIJwyzZecmqbdd/lbBXECtwerV7PJMwKdgyqQOLwOnVEmeWoEEtD7KOXA0jWxdUyliiRK00Pzs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4191; 7:js5MomzRTpljFCS/zgB/w3YwfOzDgYL2jdEf3WlNAUPcj/xfb/scGz8MfEKjJNVOVYnsBlmaolMRW3eSIpJjGVyFb2/M2judk0mzzNzFDae7ydsZLPBHBeTGOUXWRuTMTcWd2/4C3iPYMlOwqt2XGhriLL4oVgCQZyeMML52xd/o0z7f5TZDARBLEiqOYlA5ehR1gkSakzIZZ3ce08p2RMcYWnZQDWma4gIZrkQk0v7Xewu+pJQqdYpum7YWo2Vr X-MS-Office365-Filtering-Correlation-Id: 398caece-d941-464e-9272-08d5c5c8795d X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 00:58:35.1693 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 398caece-d941-464e-9272-08d5c5c8795d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4191 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
net: bridge: Notify about bridge VLANs
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 8c9cf8e..cbc8fab 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1144,6 +1144,9 @@ static int mlxsw_sp_port_vlans_add(struct mlxsw_sp_port *mlxsw_sp_port, struct mlxsw_sp_bridge_port *bridge_port; u16 vid; + if (netif_is_bridge_master(orig_dev)) + return -EOPNOTSUPP; + if (switchdev_trans_ph_prepare(trans)) return 0; @@ -1741,6 +1744,9 @@ static int mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, struct mlxsw_sp_bridge_port *bridge_port; u16 vid; + if (netif_is_bridge_master(orig_dev)) + return -EOPNOTSUPP; + bridge_port = mlxsw_sp_bridge_port_find(mlxsw_sp->bridge, orig_dev); if (WARN_ON(!bridge_port)) return -EINVAL;