| Message ID | 20200917175257.592636-1-kuba@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] nfp: use correct define to return NONE fec | expand |
On Thu, Sep 17, 2020 at 10:52:57AM -0700, Jakub Kicinski wrote: > 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 <kuba@kernel.org> > --- > drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c > index 6eb9fb9a1814..9c9ae33d84ce 100644 > --- 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 *netdev, > 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); Reviewed-by: Simon Horman <simon.horman@netronome.com>
Jakub Kicinski wrote: > 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 <kuba@kernel.org> Good catch! Reviewed-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
From: Jakub Kicinski <kuba@kernel.org> Date: Thu, 17 Sep 2020 10:52:57 -0700 > 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 <kuba@kernel.org> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index 6eb9fb9a1814..9c9ae33d84ce 100644 --- 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 *netdev, 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);
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 <kuba@kernel.org> --- drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)