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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 E6FFAC47257 for ; Fri, 8 May 2020 13:22:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B8A0D2496D for ; Fri, 8 May 2020 13:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588944153; bh=ms3FREfyZi9NtI4y72lyzMZ3+AJnRMj4Cp5dTvwD+FY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YOajilgXc23CujNBKYDrbfl8mRRusXqF/0BYMSKTiePCxjXMZ4HN4j+9hmKcmkiE3 TK3bKWtsHe3FS0S/+hbl9lraC3V1w347fsqhl+8c0vvsHrh2blfZ7zExgvE8xHzhcn YL8z6w6RhtBVXGuCUelFEMbWPK51jXYQuG7A8PI0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728544AbgEHMjJ (ORCPT ); Fri, 8 May 2020 08:39:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:57380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728512AbgEHMjH (ORCPT ); Fri, 8 May 2020 08:39:07 -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 BD5812496A; Fri, 8 May 2020 12:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588941546; bh=ms3FREfyZi9NtI4y72lyzMZ3+AJnRMj4Cp5dTvwD+FY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=evkH0eOHrYJbID5CWpyNbgDzwn3WGn6hfieZnYbADtB8XkyAjTkYKwCahxceynCWj HBCh16DzzgHtkXeniFacQ0nmMpeHmFU9/tdCkkBjnbyZ00OKQG9KcXN1zVjhA1v21P wjLU5+TZE3SISS/rYVsu+ADYAwVWaHvfoTNk2A44= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rana Shahout , Saeed Mahameed , "David S. Miller" Subject: [PATCH 4.4 076/312] net/mlx5e: Fix MLX5E_100BASE_T define Date: Fri, 8 May 2020 14:31:07 +0200 Message-Id: <20200508123129.872051428@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123124.574959822@linuxfoundation.org> References: <20200508123124.574959822@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: Rana Shahout commit 6e4c21894673baabdbef03c3ac2458a28246128b upstream. Bit 25 of eth_proto_capability in PTYS register is 1000Base-TT and not 100Base-T. Fixes: f62b8bb8f2d3 ('net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality') Signed-off-by: Rana Shahout Signed-off-by: Saeed Mahameed Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h @@ -543,7 +543,7 @@ enum mlx5e_link_mode { MLX5E_100GBASE_KR4 = 22, MLX5E_100GBASE_LR4 = 23, MLX5E_100BASE_TX = 24, - MLX5E_100BASE_T = 25, + MLX5E_1000BASE_T = 25, MLX5E_10GBASE_T = 26, MLX5E_25GBASE_CR = 27, MLX5E_25GBASE_KR = 28, --- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c @@ -138,10 +138,10 @@ static const struct { [MLX5E_100BASE_TX] = { .speed = 100, }, - [MLX5E_100BASE_T] = { - .supported = SUPPORTED_100baseT_Full, - .advertised = ADVERTISED_100baseT_Full, - .speed = 100, + [MLX5E_1000BASE_T] = { + .supported = SUPPORTED_1000baseT_Full, + .advertised = ADVERTISED_1000baseT_Full, + .speed = 1000, }, [MLX5E_10GBASE_T] = { .supported = SUPPORTED_10000baseT_Full,