From patchwork Fri Sep 25 12:48:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 309260 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=-10.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 74592C4727C for ; Fri, 25 Sep 2020 12:49:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4082E21D91 for ; Fri, 25 Sep 2020 12:49:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038166; bh=lIO0Mcz5MIqV5BOBXfNOSH6Uy1nkd5ps7eA43h01YIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yc71EmI1dJi1aJ6wnR18oL6ieGL9p2eDqbQO6taOdPFSzwlptrkMLsA+5uaTrZdTH KCc/lb/E83UpiyjY5wjA+Q+Y0LmflJ0unytrZLGiU+FeEQJx2QNzyld5Dxwn+nk3d2 32owXteDzsdCCVgeqOyoOmCiFhmVQzB4eGogmGkA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728866AbgIYMtY (ORCPT ); Fri, 25 Sep 2020 08:49:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:52898 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728874AbgIYMtW (ORCPT ); Fri, 25 Sep 2020 08:49:22 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 3A14A221EC; Fri, 25 Sep 2020 12:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601038162; bh=lIO0Mcz5MIqV5BOBXfNOSH6Uy1nkd5ps7eA43h01YIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J+zCgnzwqUAWuoNQNOGY5X5yTc1pm7+68xJ72WbE++mDxi0oRirK2DdcUUoPa5XbV rCCDBJZ8YdR/7r4wmOFE3TRdmZJ7BCLl7xXePPU8tI9d539Li3b622dJs52w0Hx5Nw 8+OVc2yT5RFkwwqUVBTBm1GdxtIL3SKCbyWgKEbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , Simon Horman , Jesse Brandeburg , "David S. Miller" Subject: [PATCH 5.8 25/56] nfp: use correct define to return NONE fec Date: Fri, 25 Sep 2020 14:48:15 +0200 Message-Id: <20200925124731.615595000@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200925124727.878494124@linuxfoundation.org> References: <20200925124727.878494124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jakub Kicinski [ Upstream commit 5f6857e808a8bd078296575b417c4b9d160b9779 ] struct ethtool_fecparam carries bitmasks not bit numbers. We want to return 1 (NONE), not 0. Fixes: 0d0870938337 ("nfp: implement ethtool FEC mode settings") Signed-off-by: Jakub Kicinski Reviewed-by: Simon Horman Reviewed-by: Jesse Brandeburg Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -829,8 +829,8 @@ nfp_port_get_fecparam(struct net_device struct nfp_eth_table_port *eth_port; struct nfp_port *port; - param->active_fec = ETHTOOL_FEC_NONE_BIT; - param->fec = ETHTOOL_FEC_NONE_BIT; + param->active_fec = ETHTOOL_FEC_NONE; + param->fec = ETHTOOL_FEC_NONE; port = nfp_port_from_netdev(netdev); eth_port = nfp_port_get_eth_port(port);