> -----Original Message-----
> From: Intel-wired-lan <[email protected]> On Behalf
> Of Jakub Kicinski
> Sent: Friday, June 13, 2025 3:01 AM
> To: [email protected]
> Cc: [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; intel-wired-
> [email protected]; Nguyen, Anthony L <[email protected]>;
> Kitszel, Przemyslaw <[email protected]>; Keller, Jacob E
> <[email protected]>; [email protected]; Jakub
> Kicinski <[email protected]>
> Subject: [Intel-wired-lan] [PATCH net-next 3/7] eth: ixgbe: migrate to
> new RXFH callbacks
>
> Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool:
> add dedicated callbacks for getting and setting rxfh fields").
>
> Signed-off-by: Jakub Kicinski <[email protected]>
Reviewed-by: Aleksandr Loktionov <[email protected]>
> ---
> .../net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 20 +++++++++---------
> -
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
> b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
> index 1dc1c6e611a4..8aac6b1ae1c7 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
> @@ -2753,9 +2753,11 @@ static int ixgbe_get_ethtool_fdir_all(struct
> ixgbe_adapter *adapter,
> return 0;
> }
>
> -static int ixgbe_get_rss_hash_opts(struct ixgbe_adapter *adapter,
> - struct ethtool_rxnfc *cmd)
> +static int ixgbe_get_rxfh_fields(struct net_device *dev,
> + struct ethtool_rxfh_fields *cmd)
> {
> + struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
> +
> cmd->data = 0;
>
> /* Report default options for RSS on ixgbe */ @@ -2825,9
> +2827,6 @@ static int ixgbe_get_rxnfc(struct net_device *dev, struct
> ethtool_rxnfc *cmd,
> case ETHTOOL_GRXCLSRLALL:
> ret = ixgbe_get_ethtool_fdir_all(adapter, cmd,
> rule_locs);
> break;
> - case ETHTOOL_GRXFH:
> - ret = ixgbe_get_rss_hash_opts(adapter, cmd);
> - break;
> default:
> break;
> }
> @@ -3079,9 +3078,11 @@ static int ixgbe_del_ethtool_fdir_entry(struct
> ixgbe_adapter *adapter,
>
> #define UDP_RSS_FLAGS (IXGBE_FLAG2_RSS_FIELD_IPV4_UDP | \
> IXGBE_FLAG2_RSS_FIELD_IPV6_UDP) -static int
> ixgbe_set_rss_hash_opt(struct ixgbe_adapter *adapter,
> - struct ethtool_rxnfc *nfc)
> +static int ixgbe_set_rxfh_fields(struct net_device *dev,
> + const struct ethtool_rxfh_fields *nfc,
> + struct netlink_ext_ack *extack)
> {
> + struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
> u32 flags2 = adapter->flags2;
>
> /*
> @@ -3204,9 +3205,6 @@ static int ixgbe_set_rxnfc(struct net_device
> *dev, struct ethtool_rxnfc *cmd)
> case ETHTOOL_SRXCLSRLDEL:
> ret = ixgbe_del_ethtool_fdir_entry(adapter, cmd);
> break;
> - case ETHTOOL_SRXFH:
> - ret = ixgbe_set_rss_hash_opt(adapter, cmd);
> - break;
> default:
> break;
> }
> @@ -3797,6 +3795,8 @@ static const struct ethtool_ops
> ixgbe_ethtool_ops_e610 = {
> .get_rxfh_key_size = ixgbe_get_rxfh_key_size,
> .get_rxfh = ixgbe_get_rxfh,
> .set_rxfh = ixgbe_set_rxfh,
> + .get_rxfh_fields = ixgbe_get_rxfh_fields,
> + .set_rxfh_fields = ixgbe_set_rxfh_fields,
> .get_eee = ixgbe_get_eee,
> .set_eee = ixgbe_set_eee,
> .get_channels = ixgbe_get_channels,
> --
> 2.49.0
