Skip to contentSkip to conversation

nfp: use correct define to return NONE fec

PATCH In review Jakub Kicinski 4 participants 4 messages Sep 17, 2020 – Sep 18, 2020

Subsystems (3)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 nfp: use correct define to return NONE fec

struct ethtool_fecparam carries bitmasks not bit numbers. We want to return 1 (NONE), not 0.

Fixes 0d0870938337 ("nfp: implement ethtool FEC mode settings")
---
 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +2 -2
index 6eb9fb9a1814..9c9ae33d84ce 100644
@@ -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);
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 14 lines · Jakub Kicinski

struct ethtool_fecparam carries bitmasks not bit numbers. We want to return 1 (NONE), not 0.

Fixes 0d0870938337 ("nfp: implement ethtool FEC mode settings")
---
 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +0 -0
index 6eb9fb9a1814..9c9ae33d84ce 100644

drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c nfp_port_get_fecparam(struct net_device *netdev, · line 836

Quoted 10 lines
drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +2 -2
@@ -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);