From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225zoIUsWPYPCEheN2eh44xxvhZx2WcymOOrlzIO9+18NuZIQ4ZR+6QMYE26TZ0j8tON5y8R ARC-Seal: i=1; a=rsa-sha256; t=1517256517; cv=none; d=google.com; s=arc-20160816; b=OCdWGWdwGut6kZRImNLdMJR0cGUf0uYIEZff/OfmVzFQpn0WQkwwuK9/r1JKA7K5Pk pS2P02NR7ecSHL/KFV2pwEtljtMF7UvlH6vOvoWmWErBCZFIFMFOGA+CjqJg0gxjbH3v x0Z/VFisGEAcQOKjSy/l1rNRqHvtEvqVoXU8Yf63PO8oRfFYjczoeqc1XaHENZ1Ag6WT 0viJIz7R0qfhotLBjV11eGjJB4b+Xsh6PctQ5emZZJJ0vbH8PD+7SMtrgf8uZRVBafPw /YQD5slnyHDuGlK2PbHdtP1Ibzb5Y83D+pAz4vvITbRb2KCDSEFgF4zIZLfsC2S/fhBJ /BCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=YHM10l+H4+t/UzzVYDr4fmhmuyZIkbm6q0ixEZE+FZ4=; b=XUlOxh/LGzcGBOkIrKzHABDtQWYlc2rciKwZzs4TFnkS3AL9lDhtsEgvjv+KhGSAec shApDbOmD2h/uvlt2jRxNEcG5SSSS+SK96JzOcgHFcm2trcoAsz8eaQ1CR/+I9TZc1YW f+jXWuhD742KvurgKoMPxyJwLUVOnnKAXO6tOpkOi9EqGqeqsZgVkIniAE0MKMLKmDK7 3ClZMPBVn03Uvra6juWDe+O70btyM32d5KnJexdmVQ9a3PJl1xa3TsOxB7rxB0DhrEHA 1Ku3KbDNODm+FpgpqnuVE0UqtOcA7/em2EM7i0gBH9dGsX6M7+Fl2TN1JzQ/luzQ7Dkw FmWg== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , "David S. Miller" Subject: [PATCH 4.14 52/71] nfp: use the correct index for link speed table Date: Mon, 29 Jan 2018 13:57:20 +0100 Message-Id: <20180129123830.911198033@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123827.271171825@linuxfoundation.org> References: <20180129123827.271171825@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958769978631346?= X-GMAIL-MSGID: =?utf-8?q?1590958769978631346?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit 0d9c9f0f40ca262b67fc06a702b85f3976f5e1a1 ] sts variable is holding link speed as well as state. We should be using ls to index into ls_to_ethtool. Fixes: 265aeb511bd5 ("nfp: add support for .get_link_ksettings()") Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -306,7 +306,7 @@ nfp_net_get_link_ksettings(struct net_de ls >= ARRAY_SIZE(ls_to_ethtool)) return 0; - cmd->base.speed = ls_to_ethtool[sts]; + cmd->base.speed = ls_to_ethtool[ls]; cmd->base.duplex = DUPLEX_FULL; return 0;