| Message ID | 0b536aa33534b3c6deeb5c965665190c01f2e585.1527519997.git.petrm@mellanox.com |
|---|---|
| State | Changes Requested, 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="uOeXDnST"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40vgL96cSCz9s0y for <patchwork-incoming-netdev@ozlabs.org>; Tue, 29 May 2018 01:11:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033846AbeE1PL0 (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Mon, 28 May 2018 11:11:26 -0400 Received: from mail-db5eur01on0088.outbound.protection.outlook.com ([104.47.2.88]:61408 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1166028AbeE1PLH (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 28 May 2018 11:11:07 -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=MI5rLrltG6qcpnCztg5EZ1K3nVSvKYVEA3cqkLXVhFU=; b=uOeXDnSTxXJit6YYk1W4uofk+tJxyKLVPpNG3d7v4Mi6QoC2JxOjkmnavVTVHcJO9YqqGMQj5o33Luxjny77tuqH3AG1J2ZPGGPoQU/Dteg1AgENQwkeChq2Qczxhd3YZ83whlX/BimCRMgaYVX6RHCFFePCGAH/AmMkwpbYXIg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=petrm@mellanox.com; Received: from t540p (78.45.160.211) by VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Mon, 28 May 2018 15:11:03 +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 Subject: [PATCH net-next v3 5/7] staging: fsl-dpaa2: ethsw: Ignore bridge VLAN events In-Reply-To: <cover.1527519997.git.petrm@mellanox.com> References: <cover.1527519997.git.petrm@mellanox.com> Message-Id: <0b536aa33534b3c6deeb5c965665190c01f2e585.1527519997.git.petrm@mellanox.com> Date: Mon, 28 May 2018 17:10:57 +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: [78.45.160.211] X-ClientProxiedBy: LO2P265CA0152.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::20) To VI1PR05MB4190.eurprd05.prod.outlook.com (2603:10a6:803:4e::16) 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:VI1PR05MB4190; X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 3:p/sRonDilYh35Lm1F9ptnPfkHqMDkGLbg+XNvF6W+Z3wNwkjSZQay4wePNZF3kAVXMGtQ5gUR8ZNU0mnP9UtPCfqZNpsRvso+kh1zOdOaZv0I8zEUOW7GvHClR1rgsUhJRaWP/MPA8z9UfYbV6hLVDrL5t8JtwwoG+AkleFrX79mtpkxrZdSlM2Jdigbh9i1N9/qGVS5lxNbrv2AQntpVwNcOM7jI+61TzGTt3L5qF528GplSW8HHGdSckGezFfd; 25:8XxbOxuSrE3DggMM+wgNkkBatMpezP02iShZGfPp/77fL1m1ZOFgHxuWc1d/nVMVpF9nisUYXGqU944TpNKpqqoTFfwBJrrMi0ShL78FtaVpQHFTy3lf3QoKHYEv/LXIacvpzD95NtS0wcWGuqQmKj3JWI7s8sNAxnRQGLlXlxDQjtdfhJXtMUY1dpQn9dD8vFhkE3FZuXxs8vNCbqPe/WhzFlL2y514mmjFi2YunX7ZhqsR1W5jgWoyXMaruDYw/5xec1YoU1Ez02hRfl5Sk5Ve+W5XZ3MyJ2yOK/JfkuzJg63Xyvp/9sl4ony6ZcurYOoc2PmZep2wxiybFdlP7Q==; 31:Zq1PWMpNGkSB/I0y2WNXHfytRZMe8jeQy41p9F68W/t18svGxzAaYPiIzXE6wQYfriWQh3u68r9wl5E01KMXofYNdje8PNJc1f04NRXwQoMYwMVJi78L0ICkULdFIDX3z0vas266ZgY+nrhfXlEHLLL9VBencU9lwhyly44sNYPjxoJKtW4KRZfnspRbU8W33YdYmTzAQnwas/uMMZQktp1CojRhYVjor0+4Z8KKMHw= X-MS-TrafficTypeDiagnostic: VI1PR05MB4190: X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 20:6KMJIMvjaRtzEWf4ip5QVO7HsVkbJt2GXS/B3PnNM/v2PP+5PwUJSrSUMg8TWH8bkShK1TvhiNabzbzy4m/6V93KAagtjxSUZxLW0eswJJ/ozj9oQn/3+pwkYfK4aLmg3xMPaSpRwjp4bA8PMEW0Oz1TR5p/lafvYi/rzu/Cyag4768IuTU2tsemT6DOgWDNmne4ps5K5jSWaZKizIJ0blF+miq8mNgBWTviNIiZERAcgY+azjbD9xcgEvuCOzfbOKXntUnz7difK6OCNi0LWXuPFcwd3LEHSkRJ9aACdbsJ8qreQh/goCz+jolPsJwHgksfkTne4A/NBQXLFqLFUGUrJcqN3dSY7EO1234CMQSidhI9u8KkzFWK7rTsRTx2q8/2HkHgO3WaxyPbE5ILFQdn7jxWpxAIPjg0l1Od7hlj77YIBVTd5JuK1tymsORDPBYmJ28wi85DpqoOeR188RnjtPV7fYbP07eUXTXRMvSUxlyup/7cie8H5yggSRLP; 4:wtuElgIj/OxrpwLeYFMcfWfLnfmHuMO642nTn2aR2ucmp2p5iToSlfFSo5hIVG326iKc/pabzSqoSZHJoLUlK2XfObWD4T6udzOI3iihti2GbUrCCYf2Gd8vubC0RjqBaedugQue5G3KiK7j0xej4k8YhG0W4JaMC49ECJumY2enFFPhepTJflzs4SyIEQqysS0pSbhPoWohTFpl97fpAb7q/KLaI8KkOUP5qjMSNhw8cHJv16A3kJXz2bX+g49NnUGPRYeXXeeKZrKR/jmVnQ== X-Microsoft-Antispam-PRVS: <VI1PR05MB41904BB323918514D917E244DB6E0@VI1PR05MB4190.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)(8121501046)(5005006)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR05MB4190; BCL:0; PCL:0; RULEID:; SRVR:VI1PR05MB4190; X-Forefront-PRVS: 06860EDC7B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(376002)(366004)(396003)(39380400002)(39860400002)(199004)(189003)(86362001)(68736007)(3846002)(6116002)(2616005)(956004)(446003)(486006)(476003)(26005)(305945005)(186003)(47776003)(16526019)(8936002)(6496006)(386003)(81156014)(52116002)(51416003)(8676002)(53936002)(7736002)(478600001)(6666003)(36756003)(5660300001)(48376002)(81166006)(66066001)(76176011)(105586002)(106356001)(50466002)(8656006)(25786009)(118296001)(39060400002)(97736004)(58126008)(6486002)(11346002)(4326008)(16586007)(7416002)(316002)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR05MB4190; 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: 1; VI1PR05MB4190; 23:P2G4bXzkXS/FKLENcQJfwUB3BktwmqxVeALBXs7/V8A06xQnPDjgsBvky6ZeNWKimgPF9XnJN7N2B6DchJRHPraNT+nSZZGk2Z9U8kSI9PfWXR1S85Sw0yWOy5I8HRKVmvDNMMdnPHmfOYcI03kJaqc5omqZyuz1jNrvR+L8B0hUznq1lhchCQS9SV5KoCbtvNPPH3rmdlTMHbj08G++B/2pBjmUDt3v+aoVnh6T2w0Q97OvWkFAu02nAU6WdsCLwTYgF+MAUaPhGY4QF9NgPj4RHL7NyMKFTGbXBpMCxL2y3e30C2iv1VC7WLz6JIplQ2aEyPyqYcL2wfkI30V6iZuZFpV9V3VagievcXYqISd44OH9/zhDVXGXSb9bzJg3oFnMAagmHcHsbNBebxvaJBReRh88YP74FeiY8py1B6po4E+K+9KARFlboCpWP4CpAV7SfNgNE03R2EXYTGnK9eJ6tW7xDK0SO5u00Cn1bi9Yut8o7dEsTp4BzUA3+pL6XbWrkQ/5wy18ntoB3clYnCXr3NWY1dB5dZd6ldWp5H3iBqqf/XMRaXFXXZLPNKmuYOljMguAFgU8z0f1M+J7dQZMNcgOnPPF/0NPtWb0HtpjGU764rDvqY/QHxwBfoNSOS4cUtzYdF3fnIWZtArfhTfSBRmnpBuSTFYMQH5BRCdVTAOzAn/PTcDHJesNu/M7Hm6XNVTDkztb66hb4BZYiWKWc5gI/vNQdyoXBhdTHurFSsbKt9+b3QpU1Mn+p9fDiSCfcE83DBsPF6DHqB+dGxPAftDARRrfi2Ths0matloKq4EkyHDdR1DdfZvs+16sfwgQeXjUUbbTtLWb6LkeA1NtrKzIdI5vu0N+VuxG66D3yKwAngD458egbKWDP/rLvsrxS/jTuLfGnxd+TghqblHVGCwAe0tO25BdCslktfYYmpZbFikGJJLAew/faGhWCvkNZ2Jh63jsHoDlfHneRNcMrubQrw/hUNKT3lcnHpfAU+O+o9qp0/q4np+kQrxY5BXBShyo7Gwk/iezSLrIqcBjo4D5RM+YdOJzJB2CDj/guOlM7/WMTTGdXP5tSA4pdWvaCqZpXpOQrY3HJ34UtyOdm1EaqvNvMoMS2SFk/Uipe+z8IXrDxE8yg1UEEUI6Tcis8dppZ+QvLFhqkdMCBVjElWdDO5eFTjVLXhhOwiASsWWxCppz4TnZO6PYtzQBQrypNbD8K5Fq2WtneI/uew== X-Microsoft-Antispam-Message-Info: QtlKgsEIwLoOxLyP84k0IbXP+zCYMsyi3mRLzQ5+NW/k5CfZ7j4Se0uPC+9jC75RmiUIbDRtEJPCFjHRWIwQgendmjtD3WLwmKIGXsskIoiW2lEyjz+aEqSyaotyDQYt3PGZQRJOfGiQt2WhHC5JmzuBRimpI0pDjDuDPzQjYQHOZ/ZVGOONR3FHyezVGNqc X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 6:sKLIbBzPXvogHFJF+CuVaulXInMX6RWP1ik1h6QABnKVhLtoY/F2XUN5Q763n6NfBvCZB8AhZCeqt7scZY+Ym92Bf+vHgGh9RGU+Gn7skm4WR3/+84kbgPuraM+5JGyBAbCTaZWQFBOA6HIfC2nOlj+macmJtmRjCFfgqWtXgX9i5HBN+FrIKMm8K3pV0wfQBAqCVJFEM15ZHAibwHHsKUYLja5W6gB+llMmPx5KDGO+tZZ3lPhlQg47pRg5DQ849wXOjHXEn0RdSHgnugdak6lzYUX+ibaAvZHGQrU0zYhHCF1EKugSsH5uO6nwJ/RNC64sYsGYIPGPNH/wcm315VEPu2o2e4NpsrMv010Z2ZqXuL8yqw7Z6VmUNizKRaN0o9zDa6A2nmkU704S2mWsgKFmu8WOTV3uTn9tTRktVfZKosaMNlZBb1sx4nnqw87ApkNcilDHrkaNAZq2bir8mg==; 5:kJDUE9w9zI3U8FlR/PoASbXRFf2+I/gYX6D5+cwK6MYIcBZgjhrCgHhmzo25vIMe4afKVQ6fiSvRmFizh85Ff0vR00mR8xYlAO3bHBZxNoZOaYwVEFA9LnDLnc7YfSppn6cfIbUQMK57jinf+0J2xOgzU42RrUGRol+SqNZByLQ=; 24:9+EugUeWEDGK6Oin9q0wC6geZkl9jX3peWg4k9HINliukvHUgwa/b2IeUUIjNInStxKF4Av7a6cblwxGcfjJ7OCWGnCS7tbXS9Blbj2NL/Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR05MB4190; 7:MD6gitLx407XR79olBergMlmQZOEeuMDBmK29Uk9mxjKL7w8GuC6R1fmMrGU4CrNqP32ShiXfGqV52svA+Rc8e3d82Z20WUj9NzNm8H0btUnqi0n0HIiM41MVswp5uBfxJ0faVvn15EeevL2ytIuU/R1aFn1t490YMzpbFpC6uAf92VHAz8XBBZOjVPnwx/evIHja/RhEnpiKy4BMU72haRCZrGJxRWp4mWIWv4tZPPRQeHfumuwdGSk5fMe9DHp X-MS-Office365-Filtering-Correlation-Id: d34d0ba8-37fa-4d3f-cc6b-08d5c4ad3b2a X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2018 15:11:03.3371 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d34d0ba8-37fa-4d3f-cc6b-08d5c4ad3b2a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR05MB4190 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/staging/fsl-dpaa2/ethsw/ethsw.c b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c index c723a04..a17dd29 100644 --- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c +++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c @@ -719,6 +719,9 @@ static int port_vlans_add(struct net_device *netdev, struct ethsw_port_priv *port_priv = netdev_priv(netdev); int vid, err; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + if (switchdev_trans_ph_prepare(trans)) return 0; @@ -873,6 +876,9 @@ static int port_vlans_del(struct net_device *netdev, struct ethsw_port_priv *port_priv = netdev_priv(netdev); int vid, err; + if (netif_is_bridge_master(vlan->obj.orig_dev)) + return -EOPNOTSUPP; + for (vid = vlan->vid_begin; vid <= vlan->vid_end; vid++) { err = ethsw_port_del_vlan(port_priv, vid); if (err)
Ignore VLAN events where the orig_dev is the bridge device itself. Signed-off-by: Petr Machata <petrm@mellanox.com> --- drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 ++++++ 1 file changed, 6 insertions(+)