ethtool: Replace ethtool_ops::{get,set}_rxfh_indir() with {get,set}_rxfh()

ETHTOOL_{G,S}RXFHINDIR and ETHTOOL_{G,S}RSSH should work for drivers
regardless of whether they expose the hash key, unless you try to
set a hash key for a driver that doesn't expose it.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

10 files changed, 48 insertions, 49 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 03224090ecf9..af138f8aa361 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -3316,7 +3316,7 @@ static u32 bnx2x_get_rxfh_indir_size(struct net_device *dev)
         return T_ETH_INDIRECTION_TABLE_SIZE;
 }
 
-static int bnx2x_get_rxfh_indir(struct net_device *dev, u32 *indir)
+static int bnx2x_get_rxfh(struct net_device *dev, u32 *indir, u8 *key)
 {
         struct bnx2x *bp = netdev_priv(dev);
         u8 ind_table[T_ETH_INDIRECTION_TABLE_SIZE] = {0};
@@ -3340,14 +3340,15 @@ static int bnx2x_get_rxfh_indir(struct net_device *dev, u32 *indir)
         return 0;
 }
 
-static int bnx2x_set_rxfh_indir(struct net_device *dev, const u32 *indir)
+static int bnx2x_set_rxfh(struct net_device *dev, const u32 *indir,
+                          const u8 *key)
 {
         struct bnx2x *bp = netdev_priv(dev);
         size_t i;
 
         for (i = 0; i < T_ETH_INDIRECTION_TABLE_SIZE; i++) {
                 /*
-                 * The same as in bnx2x_get_rxfh_indir: we can't use a memcpy()
+                 * The same as in bnx2x_get_rxfh: we can't use a memcpy()
                  * as an internal storage of an indirection table is a u8 array
                  * while indir->ring_index points to an array of u32.
                  *
@@ -3471,8 +3472,8 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
         .get_rxnfc              = bnx2x_get_rxnfc,
         .set_rxnfc              = bnx2x_set_rxnfc,
         .get_rxfh_indir_size    = bnx2x_get_rxfh_indir_size,
-        .get_rxfh_indir         = bnx2x_get_rxfh_indir,
-        .set_rxfh_indir         = bnx2x_set_rxfh_indir,
+        .get_rxfh               = bnx2x_get_rxfh,
+        .set_rxfh               = bnx2x_set_rxfh,
         .get_channels           = bnx2x_get_channels,
         .set_channels           = bnx2x_set_channels,
         .get_module_info        = bnx2x_get_module_info,
@@ -3498,8 +3499,8 @@ static const struct ethtool_ops bnx2x_vf_ethtool_ops = {
         .get_rxnfc              = bnx2x_get_rxnfc,
         .set_rxnfc              = bnx2x_set_rxnfc,
         .get_rxfh_indir_size    = bnx2x_get_rxfh_indir_size,
-        .get_rxfh_indir         = bnx2x_get_rxfh_indir,
-        .set_rxfh_indir         = bnx2x_set_rxfh_indir,
+        .get_rxfh               = bnx2x_get_rxfh,
+        .set_rxfh               = bnx2x_set_rxfh,
         .get_channels           = bnx2x_get_channels,
         .set_channels           = bnx2x_set_channels,
 };
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index ccd90156aebc..8c2314ed260c 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -12501,7 +12501,7 @@ static u32 tg3_get_rxfh_indir_size(struct net_device *dev)
         return size;
 }
 
-static int tg3_get_rxfh_indir(struct net_device *dev, u32 *indir)
+static int tg3_get_rxfh(struct net_device *dev, u32 *indir, u8 *key)
 {
         struct tg3 *tp = netdev_priv(dev);
         int i;
@@ -12512,7 +12512,7 @@ static int tg3_get_rxfh_indir(struct net_device *dev, u32 *indir)
         return 0;
 }
 
-static int tg3_set_rxfh_indir(struct net_device *dev, const u32 *indir)
+static int tg3_set_rxfh(struct net_device *dev, const u32 *indir, const u8 *key)
 {
         struct tg3 *tp = netdev_priv(dev);
         size_t i;
@@ -14044,8 +14044,8 @@ static const struct ethtool_ops tg3_ethtool_ops = {
         .get_sset_count         = tg3_get_sset_count,
         .get_rxnfc              = tg3_get_rxnfc,
         .get_rxfh_indir_size    = tg3_get_rxfh_indir_size,
-        .get_rxfh_indir         = tg3_get_rxfh_indir,
-        .set_rxfh_indir         = tg3_set_rxfh_indir,
+        .get_rxfh               = tg3_get_rxfh,
+        .set_rxfh               = tg3_set_rxfh,
         .get_channels           = tg3_get_channels,
         .set_channels           = tg3_set_channels,
         .get_ts_info            = tg3_get_ts_info,
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 266a5bc6aedf..8cf6be93f491 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -2739,7 +2739,7 @@ static u32 get_rss_table_size(struct net_device *dev)
         return pi->rss_size;
 }
 
-static int get_rss_table(struct net_device *dev, u32 *p)
+static int get_rss_table(struct net_device *dev, u32 *p, u8 *key)
 {
         const struct port_info *pi = netdev_priv(dev);
         unsigned int n = pi->rss_size;
@@ -2749,7 +2749,7 @@ static int get_rss_table(struct net_device *dev, u32 *p)
         return 0;
 }
 
-static int set_rss_table(struct net_device *dev, const u32 *p)
+static int set_rss_table(struct net_device *dev, const u32 *p, const u8 *key)
 {
         unsigned int i;
         struct port_info *pi = netdev_priv(dev);
@@ -2851,8 +2851,8 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
         .set_wol           = set_wol,
         .get_rxnfc         = get_rxnfc,
         .get_rxfh_indir_size = get_rss_table_size,
-        .get_rxfh_indir    = get_rss_table,
-        .set_rxfh_indir    = set_rss_table,
+        .get_rxfh          = get_rss_table,
+        .set_rxfh          = set_rss_table,
         .flash_device      = set_flash,
 };
 
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
index 77e786d2d0e0..dbc8986c2dae 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c
@@ -626,13 +626,14 @@ static u32 i40evf_get_rxfh_indir_size(struct net_device *netdev)
 }
 
 /**
- * i40evf_get_rxfh_indir - get the rx flow hash indirection table
+ * i40evf_get_rxfh - get the rx flow hash indirection table
  * @netdev: network interface device structure
  * @indir: indirection table
+ * @key: hash key (will be %NULL until get_rxfh_key_size is implemented)
  *
  * Reads the indirection table directly from the hardware. Always returns 0.
  **/
-static int i40evf_get_rxfh_indir(struct net_device *netdev, u32 *indir)
+static int i40evf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key)
 {
         struct i40evf_adapter *adapter = netdev_priv(netdev);
         struct i40e_hw *hw = &adapter->hw;
@@ -650,14 +651,16 @@ static int i40evf_get_rxfh_indir(struct net_device *netdev, u32 *indir)
 }
 
 /**
- * i40evf_set_rxfh_indir - set the rx flow hash indirection table
+ * i40evf_set_rxfh - set the rx flow hash indirection table
  * @netdev: network interface device structure
  * @indir: indirection table
+ * @key: hash key (will be %NULL until get_rxfh_key_size is implemented)
  *
  * Returns -EINVAL if the table specifies an inavlid queue id, otherwise
  * returns 0 after programming the table.
  **/
-static int i40evf_set_rxfh_indir(struct net_device *netdev, const u32 *indir)
+static int i40evf_set_rxfh(struct net_device *netdev, const u32 *indir,
+                           const u8 *key)
 {
         struct i40evf_adapter *adapter = netdev_priv(netdev);
         struct i40e_hw *hw = &adapter->hw;
@@ -691,8 +694,8 @@ static struct ethtool_ops i40evf_ethtool_ops = {
         .get_rxnfc              = i40evf_get_rxnfc,
         .set_rxnfc              = i40evf_set_rxnfc,
         .get_rxfh_indir_size    = i40evf_get_rxfh_indir_size,
-        .get_rxfh_indir         = i40evf_get_rxfh_indir,
-        .set_rxfh_indir         = i40evf_set_rxfh_indir,
+        .get_rxfh               = i40evf_get_rxfh,
+        .set_rxfh               = i40evf_set_rxfh,
         .get_channels           = i40evf_get_channels,
 };
 
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index a84297c85fb1..d8bbcf1873ca 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -2830,7 +2830,7 @@ static u32 igb_get_rxfh_indir_size(struct net_device *netdev)
         return IGB_RETA_SIZE;
 }
 
-static int igb_get_rxfh_indir(struct net_device *netdev, u32 *indir)
+static int igb_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         int i;
@@ -2876,7 +2876,8 @@ void igb_write_rss_indir_tbl(struct igb_adapter *adapter)
         }
 }
 
-static int igb_set_rxfh_indir(struct net_device *netdev, const u32 *indir)
+static int igb_set_rxfh(struct net_device *netdev, const u32 *indir,
+                        const u8 *key)
 {
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
@@ -3025,8 +3026,8 @@ static const struct ethtool_ops igb_ethtool_ops = {
         .get_module_info        = igb_get_module_info,
         .get_module_eeprom      = igb_get_module_eeprom,
         .get_rxfh_indir_size    = igb_get_rxfh_indir_size,
-        .get_rxfh_indir         = igb_get_rxfh_indir,
-        .set_rxfh_indir         = igb_set_rxfh_indir,
+        .get_rxfh               = igb_get_rxfh,
+        .set_rxfh               = igb_set_rxfh,
         .get_channels           = igb_get_channels,
         .set_channels           = igb_set_channels,
         .begin                  = igb_ethtool_begin,
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index a72d99fd7a2d..263a1c7a3370 100644
--- a/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@ -564,7 +564,7 @@ static u32 mlx4_en_get_rxfh_indir_size(struct net_device *dev)
         return priv->rx_ring_num;
 }
 
-static int mlx4_en_get_rxfh_indir(struct net_device *dev, u32 *ring_index)
+static int mlx4_en_get_rxfh(struct net_device *dev, u32 *ring_index, u8 *key)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_rss_map *rss_map = &priv->rss_map;
@@ -582,8 +582,8 @@ static int mlx4_en_get_rxfh_indir(struct net_device *dev, u32 *ring_index)
         return err;
 }
 
-static int mlx4_en_set_rxfh_indir(struct net_device *dev,
-                const u32 *ring_index)
+static int mlx4_en_set_rxfh(struct net_device *dev, const u32 *ring_index,
+                            const u8 *key)
 {
         struct mlx4_en_priv *priv = netdev_priv(dev);
         struct mlx4_en_dev *mdev = priv->mdev;
@@ -1224,8 +1224,8 @@ const struct ethtool_ops mlx4_en_ethtool_ops = {
         .get_rxnfc = mlx4_en_get_rxnfc,
         .set_rxnfc = mlx4_en_set_rxnfc,
         .get_rxfh_indir_size = mlx4_en_get_rxfh_indir_size,
-        .get_rxfh_indir = mlx4_en_get_rxfh_indir,
-        .set_rxfh_indir = mlx4_en_set_rxfh_indir,
+        .get_rxfh = mlx4_en_get_rxfh,
+        .set_rxfh = mlx4_en_set_rxfh,
         .get_channels = mlx4_en_get_channels,
         .set_channels = mlx4_en_set_channels,
         .get_ts_info = mlx4_en_get_ts_info,
diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c
index 0de8b07c24c2..74739c4b9997 100644
--- a/drivers/net/ethernet/sfc/ethtool.c
+++ b/drivers/net/ethernet/sfc/ethtool.c
@@ -1033,7 +1033,7 @@ static u32 efx_ethtool_get_rxfh_indir_size(struct net_device *net_dev)
                 0 : ARRAY_SIZE(efx->rx_indir_table));
 }
 
-static int efx_ethtool_get_rxfh_indir(struct net_device *net_dev, u32 *indir)
+static int efx_ethtool_get_rxfh(struct net_device *net_dev, u32 *indir, u8 *key)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
@@ -1041,8 +1041,8 @@ static int efx_ethtool_get_rxfh_indir(struct net_device *net_dev, u32 *indir)
         return 0;
 }
 
-static int efx_ethtool_set_rxfh_indir(struct net_device *net_dev,
-                                      const u32 *indir)
+static int efx_ethtool_set_rxfh(struct net_device *net_dev,
+                                const u32 *indir, const u8 *key)
 {
         struct efx_nic *efx = netdev_priv(net_dev);
 
@@ -1125,8 +1125,8 @@ const struct ethtool_ops efx_ethtool_ops = {
         .get_rxnfc              = efx_ethtool_get_rxnfc,
         .set_rxnfc              = efx_ethtool_set_rxnfc,
         .get_rxfh_indir_size    = efx_ethtool_get_rxfh_indir_size,
-        .get_rxfh_indir         = efx_ethtool_get_rxfh_indir,
-        .set_rxfh_indir         = efx_ethtool_set_rxfh_indir,
+        .get_rxfh               = efx_ethtool_get_rxfh,
+        .set_rxfh               = efx_ethtool_set_rxfh,
         .get_ts_info            = efx_ethtool_get_ts_info,
         .get_module_info        = efx_ethtool_get_module_info,
         .get_module_eeprom      = efx_ethtool_get_module_eeprom,
diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
index 00e120296e92..9396cca93b09 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
@@ -579,7 +579,7 @@ vmxnet3_get_rss_indir_size(struct net_device *netdev)
 }
 
 static int
-vmxnet3_get_rss_indir(struct net_device *netdev, u32 *p)
+vmxnet3_get_rss(struct net_device *netdev, u32 *p, u8 *key)
 {
         struct vmxnet3_adapter *adapter = netdev_priv(netdev);
         struct UPT1_RSSConf *rssConf = adapter->rss_conf;
@@ -592,7 +592,7 @@ vmxnet3_get_rss_indir(struct net_device *netdev, u32 *p)
 }
 
 static int
-vmxnet3_set_rss_indir(struct net_device *netdev, const u32 *p)
+vmxnet3_set_rss(struct net_device *netdev, const u32 *p, const u8 *key)
 {
         unsigned int i;
         unsigned long flags;
@@ -628,8 +628,8 @@ static const struct ethtool_ops vmxnet3_ethtool_ops = {
         .get_rxnfc         = vmxnet3_get_rxnfc,
 #ifdef VMXNET3_RSS
         .get_rxfh_indir_size = vmxnet3_get_rss_indir_size,
-        .get_rxfh_indir    = vmxnet3_get_rss_indir,
-        .set_rxfh_indir    = vmxnet3_set_rss_indir,
+        .get_rxfh          = vmxnet3_get_rss,
+        .set_rxfh          = vmxnet3_set_rss,
 #endif
 };
 
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 874fde01d398..e658229fee39 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -158,15 +158,11 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
  *      Returns zero if not supported for this specific device.
  * @get_rxfh_indir_size: Get the size of the RX flow hash indirection table.
  *      Returns zero if not supported for this specific device.
- * @get_rxfh_indir: Get the contents of the RX flow hash indirection table.
- *      Will not be called if @get_rxfh_indir_size returns zero.
  * @get_rxfh: Get the contents of the RX flow hash indirection table and hash
  *      key.
  *      Will only be called if one or both of @get_rxfh_indir_size and
  *      @get_rxfh_key_size are implemented and return non-zero.
  *      Returns a negative error code or zero.
- * @set_rxfh_indir: Set the contents of the RX flow hash indirection table.
- *      Will not be called if @get_rxfh_indir_size returns zero.
  * @set_rxfh: Set the contents of the RX flow hash indirection table and/or
  *      hash key.  In case only the indirection table or hash key is to be
  *      changed, the other argument will be %NULL.
@@ -248,8 +244,6 @@ struct ethtool_ops {
         int     (*get_rxfh)(struct net_device *, u32 *indir, u8 *key);
         int     (*set_rxfh)(struct net_device *, const u32 *indir,
                             const u8 *key);
-        int     (*get_rxfh_indir)(struct net_device *, u32 *);
-        int     (*set_rxfh_indir)(struct net_device *, const u32 *);
         void    (*get_channels)(struct net_device *, struct ethtool_channels *);
         int     (*set_channels)(struct net_device *, struct ethtool_channels *);
         int     (*get_dump_flag)(struct net_device *, struct ethtool_dump *);
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index b8857348bdf3..8ae452afb545 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -582,7 +582,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,
         int ret;
 
         if (!dev->ethtool_ops->get_rxfh_indir_size ||
-            !dev->ethtool_ops->get_rxfh_indir)
+            !dev->ethtool_ops->get_rxfh)
                 return -EOPNOTSUPP;
         dev_size = dev->ethtool_ops->get_rxfh_indir_size(dev);
         if (dev_size == 0)
@@ -608,7 +608,7 @@ static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,
         if (!indir)
                 return -ENOMEM;
 
-        ret = dev->ethtool_ops->get_rxfh_indir(dev, indir);
+        ret = dev->ethtool_ops->get_rxfh(dev, indir, NULL);
         if (ret)
                 goto out;
 
@@ -632,7 +632,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,
         int ret;
         u32 ringidx_offset = offsetof(struct ethtool_rxfh_indir, ring_index[0]);
 
-        if (!ops->get_rxfh_indir_size || !ops->set_rxfh_indir ||
+        if (!ops->get_rxfh_indir_size || !ops->set_rxfh ||
             !ops->get_rxnfc)
                 return -EOPNOTSUPP;
 
@@ -669,7 +669,7 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev,
                         goto out;
         }
 
-        ret = ops->set_rxfh_indir(dev, indir);
+        ret = ops->set_rxfh(dev, indir, NULL);
 
 out:
         kfree(indir);