From patchwork Mon Jan 4 09:42:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 562288 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 C15E31402EC for ; Mon, 4 Jan 2016 20:42:45 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b=Lm0cO8Wv; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753311AbcADJml (ORCPT ); Mon, 4 Jan 2016 04:42:41 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:32957 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751505AbcADJmc (ORCPT ); Mon, 4 Jan 2016 04:42:32 -0500 Received: by mail-wm0-f42.google.com with SMTP id f206so166021692wmf.0 for ; Mon, 04 Jan 2016 01:42:32 -0800 (PST) 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=rsvoLwQdFfvxZpBJ5QZeXjkD3AH0bjLluRq/J5R+D1Q=; b=Lm0cO8WvyC/RbWXFiaQuJrAn/anoI0MFRSN15ttn+SmMbPQutbzcE8pIU9zX8Ond4d wXB3o15GIMZA7SvS8iXV/seeyphhRQOjcbXO6EWxAn+rMBsczh3lJGW2rnGGItKu1Owm JfUIoaU2/nTren2fj0ZpLno2WN/fQBsqcBXiICfOyw3CHYzSgnggPCOA+MNS+IJLeog8 4ThaPzL1ndFJ9iFUpDAJ9/KhM/UhfEnlGBE61mdgBLEuBAqD9SaxmnadLVHwit61avXM Epdi/S0JJ/kxhQKBBIh6fqXUB0BvmEBzN5n6h09Ady9SdvNxFCb20RBluNYmhiVhgysW EdoQ== 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=rsvoLwQdFfvxZpBJ5QZeXjkD3AH0bjLluRq/J5R+D1Q=; b=gERdtXJxiDuy3Yj42Kf6IuabLDAlatJiC7WqeqlxaSzE8w3Uh/Y3mUQG0Kp0+QvxVf tqFYdvAII4KTRWnVYIa6+opTuXZZavahNjemyEXV/oYZxvyoxls9XbKvNTlvSGa3RyKC hsjnWCgXBIboClLCDpwHO5bAy/CEDcAuv9eCBsupmXbG6isaSATII2yGeSTlKsVRbK99 2Fo36iXhZcE8LYqejTxhlAo0tyFNVwZRRVMMIPHB4ruH7yxYe+F6EFd+mzwOp/36DLJ7 NiEcT0qdqQzyvvS4wnBnLczva3UvNbnL3Fj2QkaEoFuqCGNNciQfCfPF41JpVHeYeqlb kr/w== X-Gm-Message-State: ALoCoQn/7X3o1E8M6PArxvX7mMmCCr1igJxSpM6XW3CvkyaN1yG9tHwgMotjdP+SAO8WscD7Xap8bM14NLc/CIcmLxXSiGJmRQ== X-Received: by 10.28.229.20 with SMTP id c20mr55394341wmh.79.1451900551820; Mon, 04 Jan 2016 01:42:31 -0800 (PST) Received: from localhost (ip-94-113-120-24.net.upcbroadband.cz. [94.113.120.24]) by smtp.gmail.com with ESMTPSA id 79sm39016279wmo.7.2016.01.04.01.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2016 01:42:31 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@mellanox.com, eladr@mellanox.com, yotamg@mellanox.com, ogerlitz@mellanox.com Subject: [patch net-next 3/4] mlxsw: spectrum: Set bridge status in appropriate functions Date: Mon, 4 Jan 2016 10:42:25 +0100 Message-Id: <1451900546-2006-4-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1451900546-2006-1-git-send-email-jiri@resnulli.us> References: <1451900546-2006-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 Set the bridge status of physical ports in the appropriate functions, to be consistent with LAG join/leave and vPorts joining/leaving bridge. Also, remove the error messages in these two functions, as we already emit errors in both the single functions they call. Signed-off-by: Ido Schimmel Signed-off-by: Jiri Pirko --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c index eb719f3..ed2eb7b 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -1989,8 +1989,8 @@ static int mlxsw_sp_port_bridge_join(struct mlxsw_sp_port *mlxsw_sp_port) * own VLANs. */ err = mlxsw_sp_port_kill_vid(dev, 0, 1); - if (err) - netdev_err(dev, "Failed to remove VID 1\n"); + if (!err) + mlxsw_sp_port->bridged = 1; return err; } @@ -1998,16 +1998,13 @@ static int mlxsw_sp_port_bridge_join(struct mlxsw_sp_port *mlxsw_sp_port) static int mlxsw_sp_port_bridge_leave(struct mlxsw_sp_port *mlxsw_sp_port) { struct net_device *dev = mlxsw_sp_port->dev; - int err; + + mlxsw_sp_port->bridged = 0; /* Add implicit VLAN interface in the device, so that untagged * packets will be classified to the default vFID. */ - err = mlxsw_sp_port_add_vid(dev, 0, 1); - if (err) - netdev_err(dev, "Failed to add VID 1\n"); - - return err; + return mlxsw_sp_port_add_vid(dev, 0, 1); } static bool mlxsw_sp_master_bridge_check(struct mlxsw_sp *mlxsw_sp, @@ -2362,10 +2359,8 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev, return NOTIFY_BAD; } mlxsw_sp_master_bridge_inc(mlxsw_sp, upper_dev); - mlxsw_sp_port->bridged = 1; } else { err = mlxsw_sp_port_bridge_leave(mlxsw_sp_port); - mlxsw_sp_port->bridged = 0; mlxsw_sp_master_bridge_dec(mlxsw_sp, upper_dev); if (err) { netdev_err(dev, "Failed to leave bridge\n");