Skip to contentSkip to conversation

remove redundant stubs

PATCH New Stephen Hemminger 1 participant 3 messages Sep 24 Network drivers

lore
Share & tools
lore

Stephen Hemminger

author
#0 lore raw

cover remove redundant stubs

Work on automating driver features matrix uncovered drivers that were using stub functions with -ENOTSUP. It is better to let ethdev layer do that. The future driver scan script will get confused if drivers do there own not supported stubs.

Stephen Hemminger (2):
net/nfp: remove redundant link up/down stubs net/cnxk: remove redundant IP reassembly conf get stubs

 drivers/net/cnxk/cn10k_ethdev.c | 10 ----------
 drivers/net/cnxk/cn20k_ethdev.c | 10 ----------
 drivers/net/nfp/nfp_ethdev_vf.c | 15 ---------------
 3 files changed, 35 deletions(-)
Signature · 1 line
2.53.0
author
#1 lore raw

PATCH 1/2 net/nfp: remove redundant link up/down stubs

The VF ops nfp_netvf_set_link_up() and nfp_netvf_set_link_down() only return -ENOTSUP. rte_eth_dev_set_link_up() and its down counterpart already return -ENOTSUP when the dev_ops entry is NULL, so leaving the fields unset gives the same result to the application.

These are VF-only; the PF table in nfp_ethdev.c keeps its real implementations.

Signed-off-by Stephen Hemminger <[email protected]>
---
 drivers/net/nfp/nfp_ethdev_vf.c | 15 ---------------
 1 file changed, 15 deletions(-)
drivers/net/nfp/nfp_ethdev_vf.c +0 -15
index d81a5052b9..1ed86cfc9f 100644
@@ -144,19 +144,6 @@ nfp_netvf_stop(struct rte_eth_dev *dev)
 	return 0;
 }
 
-static int
-nfp_netvf_set_link_up(struct rte_eth_dev *dev __rte_unused)
-{
-	return -ENOTSUP;
-}
-
-/* Set the link down. */
-static int
-nfp_netvf_set_link_down(struct rte_eth_dev *dev __rte_unused)
-{
-	return -ENOTSUP;
-}
-
 /* Reset and stop device. The device can not be restarted. */
 static int
 nfp_netvf_close(struct rte_eth_dev *dev)

@@ -203,8 +190,6 @@ static const struct eth_dev_ops nfp_netvf_eth_dev_ops = {
 	.dev_configure          = nfp_net_configure,
 	.dev_start              = nfp_netvf_start,
 	.dev_stop               = nfp_netvf_stop,
-	.dev_set_link_up        = nfp_netvf_set_link_up,
-	.dev_set_link_down      = nfp_netvf_set_link_down,
 	.dev_close              = nfp_netvf_close,
 	.promiscuous_enable     = nfp_net_promisc_enable,
 	.promiscuous_disable    = nfp_net_promisc_disable,
Signature · 1 line
2.53.0
author
#2 lore raw

PATCH 2/2 net/cnxk: remove redundant IP reassembly conf get stubs

In reply to Stephen Hemminger

cn10k_nix_reassembly_conf_get() and cn20k_nix_reassembly_conf_get() only return -ENOTSUP, and they are the only writers of cnxk_eth_dev_ops.ip_reassembly_conf_get in the tree. The field has no initialiser in cnxk_eth_dev_ops, so dropping the assignments leaves it NULL and rte_eth_ip_reassembly_conf_get() returns -ENOTSUP as before.

The sibling ip_reassembly_conf_set and ip_reassembly_capability_get ops are real implementations and are left alone.

Signed-off-by Stephen Hemminger <[email protected]>
---
 drivers/net/cnxk/cn10k_ethdev.c | 10 ----------
 drivers/net/cnxk/cn20k_ethdev.c | 10 ----------
 2 files changed, 20 deletions(-)
drivers/net/cnxk/cn10k_ethdev.c +0 -10
index bcf4e23286..3f987a8195 100644
@@ -645,15 +645,6 @@ cn10k_nix_reassembly_capability_get(struct rte_eth_dev *eth_dev,
 	return rc;
 }
 
-static int
-cn10k_nix_reassembly_conf_get(struct rte_eth_dev *eth_dev,
-		struct rte_eth_ip_reassembly_params *conf)
-{
-	RTE_SET_USED(eth_dev);
-	RTE_SET_USED(conf);
-	return -ENOTSUP;
-}
-
 static int
 cn10k_nix_reassembly_conf_set(struct rte_eth_dev *eth_dev,
 			      const struct rte_eth_ip_reassembly_params *conf)

@@ -883,7 +874,6 @@ nix_eth_dev_ops_override(void)
 		cn10k_nix_timesync_read_tx_timestamp;
 	cnxk_eth_dev_ops.ip_reassembly_capability_get =
 			cn10k_nix_reassembly_capability_get;
-	cnxk_eth_dev_ops.ip_reassembly_conf_get = cn10k_nix_reassembly_conf_get;
 	cnxk_eth_dev_ops.ip_reassembly_conf_set = cn10k_nix_reassembly_conf_set;
 	cnxk_eth_dev_ops.eth_rx_descriptor_dump = cn10k_rx_descriptor_dump;
 }
drivers/net/cnxk/cn20k_ethdev.c +0 -10
index 9fac027650..c1a7916e6f 100644
@@ -629,15 +629,6 @@ cn20k_nix_reassembly_capability_get(struct rte_eth_dev *eth_dev,
 	return 0;
 }
 
-static int
-cn20k_nix_reassembly_conf_get(struct rte_eth_dev *eth_dev,
-			      struct rte_eth_ip_reassembly_params *conf)
-{
-	RTE_SET_USED(eth_dev);
-	RTE_SET_USED(conf);
-	return -ENOTSUP;
-}
-
 static int
 cn20k_nix_reassembly_conf_set(struct rte_eth_dev *eth_dev,
 			      const struct rte_eth_ip_reassembly_params *conf)

@@ -928,7 +919,6 @@ nix_eth_dev_ops_override(void)
 	cnxk_eth_dev_ops.timesync_disable = cn20k_nix_timesync_disable;
 	cnxk_eth_dev_ops.timesync_read_tx_timestamp = cn20k_nix_timesync_read_tx_timestamp;
 	cnxk_eth_dev_ops.ip_reassembly_capability_get = cn20k_nix_reassembly_capability_get;
-	cnxk_eth_dev_ops.ip_reassembly_conf_get = cn20k_nix_reassembly_conf_get;
 	cnxk_eth_dev_ops.ip_reassembly_conf_set = cn20k_nix_reassembly_conf_set;
 	cnxk_eth_dev_ops.eth_rx_descriptor_dump = cn20k_rx_descriptor_dump;
 }
Signature · 1 line
2.53.0