Message ID | 20240802001801.565176-6-kuba@kernel.org (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | ethtool: rss: driver tweaks and netlink context dumps | expand |
On Thu, Aug 01, 2024 at 05:17:54PM -0700, Jakub Kicinski wrote: > Remove .cap_rss_ctx_supported from drivers which moved to the new API. > This makes it easy to grep for drivers which still need to be converted. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 1 - > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 - > drivers/net/ethernet/sfc/ef100_ethtool.c | 1 - > drivers/net/ethernet/sfc/ethtool.c | 1 - > 4 files changed, 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > index ab8e3f197e7b..33e8cf0a3764 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > @@ -5289,7 +5289,6 @@ void bnxt_ethtool_free(struct bnxt *bp) > > const struct ethtool_ops bnxt_ethtool_ops = { > .cap_link_lanes_supported = 1, > - .cap_rss_ctx_supported = 1, > .rxfh_max_context_id = BNXT_MAX_ETH_RSS_CTX, > .rxfh_indir_space = BNXT_MAX_RSS_TABLE_ENTRIES_P5, > .rxfh_priv_size = sizeof(struct bnxt_rss_ctx), > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > index e962959676ac..ceafac832f45 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c > @@ -5786,7 +5786,6 @@ static const struct net_device_ops mvpp2_netdev_ops = { > }; > > static const struct ethtool_ops mvpp2_eth_tool_ops = { > - .cap_rss_ctx_supported = true, > .rxfh_max_context_id = MVPP22_N_RSS_TABLES, > .supported_coalesce_params = ETHTOOL_COALESCE_USECS | > ETHTOOL_COALESCE_MAX_FRAMES, > diff --git a/drivers/net/ethernet/sfc/ef100_ethtool.c b/drivers/net/ethernet/sfc/ef100_ethtool.c > index 896ffca4aee2..746b5314acb5 100644 > --- a/drivers/net/ethernet/sfc/ef100_ethtool.c > +++ b/drivers/net/ethernet/sfc/ef100_ethtool.c > @@ -37,7 +37,6 @@ ef100_ethtool_get_ringparam(struct net_device *net_dev, > /* Ethtool options available > */ > const struct ethtool_ops ef100_ethtool_ops = { > - .cap_rss_ctx_supported = true, > .get_drvinfo = efx_ethtool_get_drvinfo, > .get_msglevel = efx_ethtool_get_msglevel, > .set_msglevel = efx_ethtool_set_msglevel, > diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c > index 7c887160e2ef..15245720c949 100644 > --- a/drivers/net/ethernet/sfc/ethtool.c > +++ b/drivers/net/ethernet/sfc/ethtool.c > @@ -240,7 +240,6 @@ static int efx_ethtool_get_ts_info(struct net_device *net_dev, > } > > const struct ethtool_ops efx_ethtool_ops = { > - .cap_rss_ctx_supported = true, > .supported_coalesce_params = ETHTOOL_COALESCE_USECS | > ETHTOOL_COALESCE_USECS_IRQ | > ETHTOOL_COALESCE_USE_ADAPTIVE_RX, > -- > 2.45.2 I didn't review the mvpp2 change earlier in this series because I've never read that driver before and I don't have one of those devices to test on. I have no idea if I can give my Reviewed-by for this patch (which depends partially on the one I didn't read), but assuming that other patch is fine: Reviewed-by: Joe Damato <jdamato@fastly.com>
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index ab8e3f197e7b..33e8cf0a3764 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -5289,7 +5289,6 @@ void bnxt_ethtool_free(struct bnxt *bp) const struct ethtool_ops bnxt_ethtool_ops = { .cap_link_lanes_supported = 1, - .cap_rss_ctx_supported = 1, .rxfh_max_context_id = BNXT_MAX_ETH_RSS_CTX, .rxfh_indir_space = BNXT_MAX_RSS_TABLE_ENTRIES_P5, .rxfh_priv_size = sizeof(struct bnxt_rss_ctx), diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index e962959676ac..ceafac832f45 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -5786,7 +5786,6 @@ static const struct net_device_ops mvpp2_netdev_ops = { }; static const struct ethtool_ops mvpp2_eth_tool_ops = { - .cap_rss_ctx_supported = true, .rxfh_max_context_id = MVPP22_N_RSS_TABLES, .supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_MAX_FRAMES, diff --git a/drivers/net/ethernet/sfc/ef100_ethtool.c b/drivers/net/ethernet/sfc/ef100_ethtool.c index 896ffca4aee2..746b5314acb5 100644 --- a/drivers/net/ethernet/sfc/ef100_ethtool.c +++ b/drivers/net/ethernet/sfc/ef100_ethtool.c @@ -37,7 +37,6 @@ ef100_ethtool_get_ringparam(struct net_device *net_dev, /* Ethtool options available */ const struct ethtool_ops ef100_ethtool_ops = { - .cap_rss_ctx_supported = true, .get_drvinfo = efx_ethtool_get_drvinfo, .get_msglevel = efx_ethtool_get_msglevel, .set_msglevel = efx_ethtool_set_msglevel, diff --git a/drivers/net/ethernet/sfc/ethtool.c b/drivers/net/ethernet/sfc/ethtool.c index 7c887160e2ef..15245720c949 100644 --- a/drivers/net/ethernet/sfc/ethtool.c +++ b/drivers/net/ethernet/sfc/ethtool.c @@ -240,7 +240,6 @@ static int efx_ethtool_get_ts_info(struct net_device *net_dev, } const struct ethtool_ops efx_ethtool_ops = { - .cap_rss_ctx_supported = true, .supported_coalesce_params = ETHTOOL_COALESCE_USECS | ETHTOOL_COALESCE_USECS_IRQ | ETHTOOL_COALESCE_USE_ADAPTIVE_RX,
Remove .cap_rss_ctx_supported from drivers which moved to the new API. This makes it easy to grep for drivers which still need to be converted. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 1 - drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 1 - drivers/net/ethernet/sfc/ef100_ethtool.c | 1 - drivers/net/ethernet/sfc/ethtool.c | 1 - 4 files changed, 4 deletions(-)