From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3D95C282C3 for ; Thu, 24 Jan 2019 19:39:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3E22218D0 for ; Thu, 24 Jan 2019 19:39:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358772; bh=A2DGMTLKRQcmTFNSTKNFXJ3viaz+CTFv+mWKgIUQFHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BNtYEpGhDh5FH/+USJBvGuqmRntVWSRbgxg5nvAxj4HUYn/nE7uya79w5trdK+DOa emjvYJ+DOLXDS44xio3Q+PYA0BZrblT2dTKIqWxx3LK1QM1w6Hpz6HChStODpaWQQk nrdoEXKgR2a4ROd9ihFGFTKm41BChSg+ZvA0e9x8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733074AbfAXTja (ORCPT ); Thu, 24 Jan 2019 14:39:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:39636 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732423AbfAXTj3 (ORCPT ); Thu, 24 Jan 2019 14:39:29 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1F80C21907; Thu, 24 Jan 2019 19:39:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548358768; bh=A2DGMTLKRQcmTFNSTKNFXJ3viaz+CTFv+mWKgIUQFHc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZnBG4WfdfWT8g1L3gs3bu/Me6y9T7UvEZ8ndKW42qOl+9+RW+4il5F9WDfXZIS39I H8wlVER4AsPWSo6idjbw2RM+zHHZgptIj1WUhNRrxrEjk2oMGjdvvFjiEsGodFkUUk uDHeYhAoadbWhwOhtU2Zy1GwXeOQ7SSibB0dOUWw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Pirko , Ido Schimmel , "David S. Miller" Subject: [PATCH 4.20 002/127] mlxsw: spectrum: Disable lag port TX before removing it Date: Thu, 24 Jan 2019 20:19:08 +0100 Message-Id: <20190124190212.116596158@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190124190211.984305387@linuxfoundation.org> References: <20190124190211.984305387@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiri Pirko [ Upstream commit 8adbe212a159d9c78a90fca1d854f6e63452426b ] Make sure that lag port TX is disabled before mlxsw_sp_port_lag_leave() is called and prevent from possible EMAD error. Fixes: 0d65fc13042f ("mlxsw: spectrum: Implement LAG port join/leave") Signed-off-by: Jiri Pirko Signed-off-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -4738,12 +4738,15 @@ static int mlxsw_sp_netdevice_port_upper lower_dev, upper_dev); } else if (netif_is_lag_master(upper_dev)) { - if (info->linking) + if (info->linking) { err = mlxsw_sp_port_lag_join(mlxsw_sp_port, upper_dev); - else + } else { + mlxsw_sp_port_lag_tx_en_set(mlxsw_sp_port, + false); mlxsw_sp_port_lag_leave(mlxsw_sp_port, upper_dev); + } } else if (netif_is_ovs_master(upper_dev)) { if (info->linking) err = mlxsw_sp_port_ovs_join(mlxsw_sp_port);