]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
sfc: remove get_rxfh_context dead code
authorEdward Cree <ecree.xilinx@gmail.com>
Thu, 27 Jun 2024 15:33:54 +0000 (16:33 +0100)
committerJakub Kicinski <kuba@kernel.org>
Sat, 29 Jun 2024 01:53:21 +0000 (18:53 -0700)
The core now always satisfies 'ethtool -x context nonzero' from its own
 tracking, so our lookup code for that case is never called.  Remove it.

Signed-off-by: Edward Cree <ecree.xilinx@gmail.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://patch.msgid.link/b426fcc416dedc8f203e52eebef6891eccebe4c1.1719502240.git.ecree.xilinx@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/sfc/ethtool_common.c

index 0a8d2c9ffce6b11e8d5694fa2e85a0139959afc9..6ded44b860522b3056276b7d0b73f4770e614e58 100644 (file)
@@ -1163,48 +1163,14 @@ u32 efx_ethtool_get_rxfh_key_size(struct net_device *net_dev)
        return efx->type->rx_hash_key_size;
 }
 
-static int efx_ethtool_get_rxfh_context(struct net_device *net_dev,
-                                       struct ethtool_rxfh_param *rxfh)
-{
-       struct efx_nic *efx = efx_netdev_priv(net_dev);
-       struct efx_rss_context_priv *ctx_priv;
-       struct efx_rss_context ctx;
-       int rc = 0;
-
-       if (!efx->type->rx_pull_rss_context_config)
-               return -EOPNOTSUPP;
-
-       mutex_lock(&net_dev->ethtool->rss_lock);
-       ctx_priv = efx_find_rss_context_entry(efx, rxfh->rss_context);
-       if (!ctx_priv) {
-               rc = -ENOENT;
-               goto out_unlock;
-       }
-       ctx.priv = *ctx_priv;
-       rc = efx->type->rx_pull_rss_context_config(efx, &ctx);
-       if (rc)
-               goto out_unlock;
-
-       rxfh->hfunc = ETH_RSS_HASH_TOP;
-       if (rxfh->indir)
-               memcpy(rxfh->indir, ctx.rx_indir_table,
-                      sizeof(ctx.rx_indir_table));
-       if (rxfh->key)
-               memcpy(rxfh->key, ctx.rx_hash_key,
-                      efx->type->rx_hash_key_size);
-out_unlock:
-       mutex_unlock(&net_dev->ethtool->rss_lock);
-       return rc;
-}
-
 int efx_ethtool_get_rxfh(struct net_device *net_dev,
                         struct ethtool_rxfh_param *rxfh)
 {
        struct efx_nic *efx = efx_netdev_priv(net_dev);
        int rc;
 
-       if (rxfh->rss_context)
-               return efx_ethtool_get_rxfh_context(net_dev, rxfh);
+       if (rxfh->rss_context) /* core should never call us for these */
+               return -EINVAL;
 
        rc = efx->type->rx_pull_rss_config(efx);
        if (rc)