Message ID | 20181004154728.8054-3-idosch@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="V6iyQWSI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42Qy2z6X5lz9s4s for <patchwork-incoming-netdev@ozlabs.org>; Fri, 5 Oct 2018 01:48:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727947AbeJDWmB (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Thu, 4 Oct 2018 18:42:01 -0400 Received: from mail-eopbgr20066.outbound.protection.outlook.com ([40.107.2.66]:12320 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728071AbeJDWl7 (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 4 Oct 2018 18:41:59 -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=gwtFBZkXLPBhm9Q5FGyfe63UgxhBkBe/9eIxDS5zh/s=; b=V6iyQWSIEyMo8GQeVn/tQG51ZbDvuJs8H7rGm4m27vPPwMfHcD3owuIMD/yVj5iTtwtypTcpvqCL/Eq4z+ltWUxX3vNYs2aGlRNGNN719x03xmdxTrv5JLocqwioeisd6+WdGh2BP2kC+8MDgSCZht0k+omSnscZqj1mcSIupd8= Received: from AM0PR05MB4978.eurprd05.prod.outlook.com (20.177.42.95) by AM0PR05MB4753.eurprd05.prod.outlook.com (52.133.56.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.23; Thu, 4 Oct 2018 15:48:03 +0000 Received: from AM0PR05MB4978.eurprd05.prod.outlook.com ([fe80::9dd8:b478:b70e:e7a3]) by AM0PR05MB4978.eurprd05.prod.outlook.com ([fe80::9dd8:b478:b70e:e7a3%2]) with mapi id 15.20.1185.024; Thu, 4 Oct 2018 15:48:03 +0000 From: Ido Schimmel <idosch@mellanox.com> To: "netdev@vger.kernel.org" <netdev@vger.kernel.org> CC: "davem@davemloft.net" <davem@davemloft.net>, Jiri Pirko <jiri@mellanox.com>, mlxsw <mlxsw@mellanox.com>, Ido Schimmel <idosch@mellanox.com> Subject: [PATCH net 2/2] mlxsw: spectrum: Delete RIF when VLAN device is removed Thread-Topic: [PATCH net 2/2] mlxsw: spectrum: Delete RIF when VLAN device is removed Thread-Index: AQHUW/miymHPdxYXy06hn+1bLaKEcQ== Date: Thu, 4 Oct 2018 15:48:03 +0000 Message-ID: <20181004154728.8054-3-idosch@mellanox.com> References: <20181004154728.8054-1-idosch@mellanox.com> In-Reply-To: <20181004154728.8054-1-idosch@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1P18901CA0009.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::19) To AM0PR05MB4978.eurprd05.prod.outlook.com (2603:10a6:208:d0::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [193.47.165.251] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR05MB4753; 6:K1Q6fdHC/6R8pTLLz6KoXzgTpMf2b3FZhF3bZROP4uPWzTYIv6wNCMUflio7HiPIIUa3ctd9hOwQDZTnLTlyplHIu0w0+E5TI5lA1S6ZGWEn6Ow27Qtb8YlMMKxYnSEEkjyAxM6D3w2YwraJiWfvLz2XOBZUAIjNIX8kjm3LhffEVOqWLAWsz1IqphSFivjNtkYm0Zj9tvniGcPQrEzXWnmID2mwKyNLepgD++krTL/UJqCvf5eKf1NbWze5bhFP9i861zncsqTGRgUE6tWILkXGOO4nKoE5+rCKj42d649W/RXdzpy1I5NI/f2RbmDdE2qj/1oXxlKLH1FRVr5yYa46yVido/9awX7I2O8y+8nMcaJfs0ekfczl9aLK3579C+ObWmKQyXj6H7G7GnadvitwMn9eHm7zVb7Kpu2XfoFi2+A5Bqy3fpOX+xduQhKY/+rsX4DB3HE4/wFgZFom9Q==; 5:1mchAtyaYHDSYIanKxk8iz0bOKDLeFcidSHrsdqTCbpY+4yjMUHz6CWuN/wGjJlvij4T7rM1bhoNMOi+ov17ynUjMeEphIrJDxc21IEAAfTCftIm2KE8ySzlxFPyF08Jj0IWpBNLOd7Xt1y02GLGYFPcHwVXeqreb9V5DMT8tto=; 7:9ZLgoimqMl4373sdDVj63aA0d/5yCRrQh13GaxIqns682kuIeY/sUTnpOmwUvjd+ZqbXXY2yKmGezbQcUeMggVKPfr/WVD2yoD27ZdhV+qOMIqW4HZt8B/XEL6OfTSqHuOAzf9Eel2q6ZYZ+mDuMYbt2JqunbvpEXWRQAzHZPvYoIE368XGm6tLFf3VUHdwBSNWqdWE9zAbdcq2AufcEJfjVXZ8iNtf8SHfa+4kWaJDPnLzBkz3v2hm48FgQKQoz x-ms-office365-filtering-correlation-id: 35c0b49e-a9c0-4996-b12a-08d62a10c4c5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM0PR05MB4753; x-ms-traffictypediagnostic: AM0PR05MB4753: x-microsoft-antispam-prvs: <AM0PR05MB4753454DF1EC0AC433A5C46EBFEA0@AM0PR05MB4753.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)(10201501046)(93006095)(93001095)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(201708071742011)(7699051); SRVR:AM0PR05MB4753; BCL:0; PCL:0; RULEID:; SRVR:AM0PR05MB4753; x-forefront-prvs: 0815F8251E x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(366004)(346002)(396003)(376002)(189003)(199004)(71200400001)(71190400001)(68736007)(5640700003)(53936002)(478600001)(97736004)(14454004)(6512007)(5660300001)(6916009)(105586002)(2351001)(106356001)(6436002)(2501003)(386003)(6506007)(76176011)(6486002)(5250100002)(2900100001)(316002)(2616005)(476003)(7736002)(66066001)(36756003)(305945005)(3846002)(102836004)(256004)(6116002)(486006)(107886003)(54906003)(4326008)(186003)(11346002)(8676002)(1730700003)(25786009)(2906002)(52116002)(8936002)(1076002)(81166006)(446003)(26005)(81156014)(99286004)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR05MB4753; H:AM0PR05MB4978.eurprd05.prod.outlook.com; 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-antispam-message-info: IVoyPRakbeftRfXB/Jf1B72ae9g6yKnKvkKBXh0o5ua7cZj8VPCGxEfAJHViVt/ooHL4kHz2FwfaZtlMeHb4j52Rf3zyywFetNBBRpvmO1FP72rB/INxVsP71aXJ9dF1JT7iyhM0/MAv8c6+FZ96tm8Wcq7cvZgeyZn6GBv16H5idcnJbb888SQk0k2P7Lnm3uNkiJb4g8rN2+yyImzuvKmhcK1EMRD8NPMi57Y0IYErgNEFywxDtvplsNZ1fPLsKwR3f63CNpC+d4ZRzbMmPv7dkYYKdTbuCIOZpRplUl+wBXFoBKDR1B6VBXzDl33u5G0PGlsGQT5fCmGVt1u+P5gUytM2uh3rEJjI964s+9w= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35c0b49e-a9c0-4996-b12a-08d62a10c4c5 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Oct 2018 15:48:03.2410 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB4753 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
mlxsw: Couple of fixes
|
expand
|
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index b492152c8881..30bb2c533cec 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -4845,6 +4845,8 @@ static int mlxsw_sp_netdevice_bridge_event(struct net_device *br_dev, upper_dev = info->upper_dev; if (info->linking) break; + if (is_vlan_dev(upper_dev)) + mlxsw_sp_rif_destroy_by_dev(mlxsw_sp, upper_dev); if (netif_is_macvlan(upper_dev)) mlxsw_sp_rif_macvlan_del(mlxsw_sp, upper_dev); break;