From patchwork Wed Aug 24 10:00:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 662180 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sK2rm3Sw2z9t0p for ; Wed, 24 Aug 2016 20:01:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b=d5W3LQ4E; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932519AbcHXKBY (ORCPT ); Wed, 24 Aug 2016 06:01:24 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32880 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932424AbcHXKBV (ORCPT ); Wed, 24 Aug 2016 06:01:21 -0400 Received: by mail-wm0-f66.google.com with SMTP id o80so1870260wme.0 for ; Wed, 24 Aug 2016 03:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MSlzhUz1i6QZDaT0mvbeMo0JYdraKJvrW60xAro8TlY=; b=d5W3LQ4ENHNTiXRqSwOp3M/350qnqS6qgvsiTj5cNMiecAxqir7NJBAMtqQWd95Nii wykjNEhdvtx5YOurov93CDM2KD34t1cYPR17kdtWo2i8rUycuuk19L+y/du3ON6885xN t1PClKpHVRjjO7yXoSCi6N7akvgLl7S6JzyG+SXYj+8fH6oVA/3dqD0VJ8RgvxLnO63o JwEBEKmlQfbMx4tN+ExiyPff31R4MQlKcFmB7ASXpD8xz6YMDUDj6tBm3aoRl1IMhMoS Cr0vkEigBRFEBNYTLq5nJkCqCL/qdSrHziPx4DIpOgDn74+UTQCkXYnlWemhNZHBJ1sz oCjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MSlzhUz1i6QZDaT0mvbeMo0JYdraKJvrW60xAro8TlY=; b=B0uE7a4bJ7bBESAFY3PC1Y8Si6cDvmqqI/rSAUloRnHHlCrg1YCYBfzUrm4ag8G/at Hs4WMbolI3Ak8wfJeAcIEwUhvxutf9FSTKRTHFVQY/BdqORfj2Or2LeM4i+l6HUvLB9G M2BBM+6VHW5b7qR6PVM6SGrlMl7T72K/41J/aamaHHg8HBo6JptXy6enf/VrzZbfxmPj x3STBatGokRJ+JPhoTAo7er+OTOfclLnNLqZwyPq5P85VtKan69dVAQrsKgXNdUYkCsi AS8cP5i/2BezK6HGD0qkSEexiZYsG2bpQ8rxekwmBQeOxR/owINpDYNCEu4myqdo8lye 4EEQ== X-Gm-Message-State: AEkoouux6fw3DeKsUL7Vmh+mKrJ2jGB0HY7F4t1czRKyokKXJ1taubItu6i1Esem7VyLVg== X-Received: by 10.28.157.148 with SMTP id g142mr2420386wme.2.1472032834420; Wed, 24 Aug 2016 03:00:34 -0700 (PDT) Received: from localhost (ip-78-45-162-30.net.upcbroadband.cz. [78.45.162.30]) by smtp.gmail.com with ESMTPSA id jv9sm9105926wjb.45.2016.08.24.03.00.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Aug 2016 03:00:34 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com, yotamg@mellanox.com, nogahf@mellanox.com, ogerlitz@mellanox.com Subject: [patch net-next 2/7] mlxsw: spectrum: Make VLAN deletion function symmetric Date: Wed, 24 Aug 2016 12:00:24 +0200 Message-Id: <1472032829-6322-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1472032829-6322-1-git-send-email-jiri@resnulli.us> References: <1472032829-6322-1-git-send-email-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ido Schimmel Commit 05978481e77e ("mlxsw: spectrum: Create PVID vPort before registering netdevice") removed __mlxsw_sp_port_vlans_del() from the init sequence of the driver, which forced it to be non-symmetric with regards to __mlxsw_sp_port_vlans_add(). Make both functions symmetric as the constraint no longer exists. Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c index 02de240..2f38310 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c @@ -1008,14 +1008,6 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, if (!mlxsw_sp_port->bridged) return -EINVAL; - err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end, - false, false); - if (err) { - netdev_err(dev, "Unable to del VIDs %d-%d\n", vid_begin, - vid_end); - return err; - } - pvid = mlxsw_sp_port->pvid; if (pvid >= vid_begin && pvid <= vid_end) { err = mlxsw_sp_port_pvid_set(mlxsw_sp_port, 0); @@ -1025,6 +1017,14 @@ static int __mlxsw_sp_port_vlans_del(struct mlxsw_sp_port *mlxsw_sp_port, } } + err = __mlxsw_sp_port_vlans_set(mlxsw_sp_port, vid_begin, vid_end, + false, false); + if (err) { + netdev_err(dev, "Unable to del VIDs %d-%d\n", vid_begin, + vid_end); + return err; + } + mlxsw_sp_port_fid_leave(mlxsw_sp_port, vid_begin, vid_end); /* Changing activity bits only if HW operation succeded */