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=-6.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=unavailable 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 A0BE6C04AA6 for ; Tue, 30 Apr 2019 11:53:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 723B12075E for ; Tue, 30 Apr 2019 11:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625197; bh=+hxI/lc1cEpTCn33QWVaFVZZhoC2rI/bwjC1DYDwVwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=b1wAAQmjqutq5RyLvZSxOnDCx3hQQBgBZ/U+xL/YuG0ogABfYjY8LUzdwvqWIV7Lr vmyyRM17VsaC7CbW72NJbhRq3upjo3A9NWo3c4s3dlRV7pr3Ba1byt+XQ1kFnWSKSV vTZwiV2gdmqOuPj4nc//GnnA8Kp8cO8LWr1Rl91k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731292AbfD3Lu5 (ORCPT ); Tue, 30 Apr 2019 07:50:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:38336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731285AbfD3Lu5 (ORCPT ); Tue, 30 Apr 2019 07:50:57 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 A70C6217D4; Tue, 30 Apr 2019 11:50:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556625056; bh=+hxI/lc1cEpTCn33QWVaFVZZhoC2rI/bwjC1DYDwVwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zzE2Jg2iSCjlC55MCjps0qMndpOt1Xs71WtbuQ3DrwWv0FlnotXYceqemlHuWh0dB ndqLsoCYyai5S1mQYBBzkFdeoPZlvLnQ2KyZs98anFZFz17ForxJB8WxB9oa/s80Pk WPJXrlils7qCMuNSe9sYs+exf8JSZXjj4gExBcrc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Amit Cohen , Ido Schimmel , Jiri Pirko , "David S. Miller" Subject: [PATCH 5.0 74/89] mlxsw: spectrum: Fix autoneg status in ethtool Date: Tue, 30 Apr 2019 13:39:05 +0200 Message-Id: <20190430113613.225152501@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430113609.741196396@linuxfoundation.org> References: <20190430113609.741196396@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amit Cohen [ Upstream commit 151f0dddbbfe4c35c9c5b64873115aafd436af9d ] If link is down and autoneg is set to on/off, the status in ethtool does not change. The reason is when the link is down the function returns with zero before changing autoneg value. Move the checking of link state (up/down) to be performed after setting autoneg value, in order to be sure that autoneg will change in any case. Fixes: 56ade8fe3fe1 ("mlxsw: spectrum: Add initial support for Spectrum ASIC") Signed-off-by: Amit Cohen Signed-off-by: Ido Schimmel Acked-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c @@ -2667,11 +2667,11 @@ mlxsw_sp_port_set_link_ksettings(struct if (err) return err; + mlxsw_sp_port->link.autoneg = autoneg; + if (!netif_running(dev)) return 0; - mlxsw_sp_port->link.autoneg = autoneg; - mlxsw_sp_port_admin_status_set(mlxsw_sp_port, false); mlxsw_sp_port_admin_status_set(mlxsw_sp_port, true);