eth: hinic: migrate to new RXFH callbacks

Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool:
add dedicated callbacks for getting and setting rxfh fields").

Zeroing data on SET is not necessary, the argument is not copied
back to user space. The driver has no other RXNFC functionality
so the SET callback can be now removed.

Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250618203823.1336156-9-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
index c559dd4291d306802a62a3b83a8d2b2805f4396e..e9f338e9dbe7ae35cf69a8d128a3aaae9206abfe 100644 (file)
--- a/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
+++ b/drivers/net/ethernet/huawei/hinic/hinic_ethtool.c
@@ -919,9 +919,10 @@ static int hinic_set_channels(struct net_device *netdev,
        return 0;
 }
 
-static int hinic_get_rss_hash_opts(struct hinic_dev *nic_dev,
-                                  struct ethtool_rxnfc *cmd)
+static int hinic_get_rxfh_fields(struct net_device *netdev,
+                                struct ethtool_rxfh_fields *cmd)
 {
+       struct hinic_dev *nic_dev = netdev_priv(netdev);
        struct hinic_rss_type rss_type = { 0 };
        int err;
 
@@ -964,7 +965,7 @@ static int hinic_get_rss_hash_opts(struct hinic_dev *nic_dev,
        return 0;
 }
 
-static int set_l4_rss_hash_ops(struct ethtool_rxnfc *cmd,
+static int set_l4_rss_hash_ops(const struct ethtool_rxfh_fields *cmd,
                               struct hinic_rss_type *rss_type)
 {
        u8 rss_l4_en = 0;
@@ -1000,16 +1001,18 @@ static int set_l4_rss_hash_ops(struct ethtool_rxnfc *cmd,
        return 0;
 }
 
-static int hinic_set_rss_hash_opts(struct hinic_dev *nic_dev,
-                                  struct ethtool_rxnfc *cmd)
+static int hinic_set_rxfh_fields(struct net_device *dev,
+                                const struct ethtool_rxfh_fields *cmd,
+                                struct netlink_ext_ack *extack)
 {
-       struct hinic_rss_type *rss_type = &nic_dev->rss_type;
+       struct hinic_dev *nic_dev = netdev_priv(dev);
+       struct hinic_rss_type *rss_type;
        int err;
 
-       if (!(nic_dev->flags & HINIC_RSS_ENABLE)) {
-               cmd->data = 0;
+       rss_type = &nic_dev->rss_type;
+
+       if (!(nic_dev->flags & HINIC_RSS_ENABLE))
                return -EOPNOTSUPP;
-       }
 
        /* RSS does not support anything other than hashing
         * to queues on src and dst IPs and ports
@@ -1108,26 +1111,6 @@ static int hinic_get_rxnfc(struct net_device *netdev,
        case ETHTOOL_GRXRINGS:
                cmd->data = nic_dev->num_qps;
                break;
-       case ETHTOOL_GRXFH:
-               err = hinic_get_rss_hash_opts(nic_dev, cmd);
-               break;
-       default:
-               err = -EOPNOTSUPP;
-               break;
-       }
-
-       return err;
-}
-
-static int hinic_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)
-{
-       struct hinic_dev *nic_dev = netdev_priv(netdev);
-       int err = 0;
-
-       switch (cmd->cmd) {
-       case ETHTOOL_SRXFH:
-               err = hinic_set_rss_hash_opts(nic_dev, cmd);
-               break;
        default:
                err = -EOPNOTSUPP;
                break;
@@ -1797,11 +1780,12 @@ static const struct ethtool_ops hinic_ethtool_ops = {
        .get_channels = hinic_get_channels,
        .set_channels = hinic_set_channels,
        .get_rxnfc = hinic_get_rxnfc,
-       .set_rxnfc = hinic_set_rxnfc,
        .get_rxfh_key_size = hinic_get_rxfh_key_size,
        .get_rxfh_indir_size = hinic_get_rxfh_indir_size,
        .get_rxfh = hinic_get_rxfh,
        .set_rxfh = hinic_set_rxfh,
+       .get_rxfh_fields = hinic_get_rxfh_fields,
+       .set_rxfh_fields = hinic_set_rxfh_fields,
        .get_sset_count = hinic_get_sset_count,
        .get_ethtool_stats = hinic_get_ethtool_stats,
        .get_strings = hinic_get_strings,
@@ -1829,11 +1813,12 @@ static const struct ethtool_ops hinicvf_ethtool_ops = {
        .get_channels = hinic_get_channels,
        .set_channels = hinic_set_channels,
        .get_rxnfc = hinic_get_rxnfc,
-       .set_rxnfc = hinic_set_rxnfc,
        .get_rxfh_key_size = hinic_get_rxfh_key_size,
        .get_rxfh_indir_size = hinic_get_rxfh_indir_size,
        .get_rxfh = hinic_get_rxfh,
        .set_rxfh = hinic_set_rxfh,
+       .get_rxfh_fields = hinic_get_rxfh_fields,
+       .set_rxfh_fields = hinic_set_rxfh_fields,
        .get_sset_count = hinic_get_sset_count,
        .get_ethtool_stats = hinic_get_ethtool_stats,
        .get_strings = hinic_get_strings,