diff options
Diffstat (limited to 'examples/ethtool')
| -rw-r--r-- | examples/ethtool/Makefile | 1 | ||||
| -rw-r--r-- | examples/ethtool/lib/Makefile | 1 | ||||
| -rw-r--r-- | examples/ethtool/lib/rte_ethtool.c | 44 | ||||
| -rw-r--r-- | examples/ethtool/lib/rte_ethtool.h | 42 |
4 files changed, 44 insertions, 44 deletions
diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index 30b42b70..e86d68ac 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -47,6 +47,5 @@ DIRS-y += lib ethtool-app endif DEPDIRS-ethtool-app := lib -DEPDIRS-lib := librte_eal librte_ether include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index 266babad..cabd82a0 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -59,5 +59,6 @@ ifeq ($(CONFIG_RTE_LIBRTE_IXGBE_PMD),y) LDLIBS += -lrte_pmd_ixgbe endif endif +LDLIBS += -lrte_eal -lrte_ethdev include $(RTE_SDK)/mk/rte.extlib.mk diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c index 252382cb..c70c5478 100644 --- a/examples/ethtool/lib/rte_ethtool.c +++ b/examples/ethtool/lib/rte_ethtool.c @@ -36,7 +36,7 @@ #include <rte_version.h> #include <rte_ethdev.h> #include <rte_ether.h> -#include <rte_pci.h> +#include <rte_bus_pci.h> #ifdef RTE_LIBRTE_IXGBE_PMD #include <rte_pmd_ixgbe.h> #endif @@ -47,7 +47,7 @@ int -rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) +rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo) { struct rte_eth_dev_info dev_info; struct rte_dev_reg_info reg_info; @@ -106,7 +106,7 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) } int -rte_ethtool_get_regs_len(uint8_t port_id) +rte_ethtool_get_regs_len(uint16_t port_id) { struct rte_dev_reg_info reg_info; int ret; @@ -121,7 +121,7 @@ rte_ethtool_get_regs_len(uint8_t port_id) } int -rte_ethtool_get_regs(uint8_t port_id, struct ethtool_regs *regs, void *data) +rte_ethtool_get_regs(uint16_t port_id, struct ethtool_regs *regs, void *data) { struct rte_dev_reg_info reg_info; int status; @@ -141,7 +141,7 @@ rte_ethtool_get_regs(uint8_t port_id, struct ethtool_regs *regs, void *data) } int -rte_ethtool_get_link(uint8_t port_id) +rte_ethtool_get_link(uint16_t port_id) { struct rte_eth_link link; @@ -151,13 +151,13 @@ rte_ethtool_get_link(uint8_t port_id) } int -rte_ethtool_get_eeprom_len(uint8_t port_id) +rte_ethtool_get_eeprom_len(uint16_t port_id) { return rte_eth_dev_get_eeprom_length(port_id); } int -rte_ethtool_get_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, +rte_ethtool_get_eeprom(uint16_t port_id, struct ethtool_eeprom *eeprom, void *words) { struct rte_dev_eeprom_info eeprom_info; @@ -180,7 +180,7 @@ rte_ethtool_get_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, } int -rte_ethtool_set_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, +rte_ethtool_set_eeprom(uint16_t port_id, struct ethtool_eeprom *eeprom, void *words) { struct rte_dev_eeprom_info eeprom_info; @@ -203,7 +203,7 @@ rte_ethtool_set_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, } int -rte_ethtool_get_pauseparam(uint8_t port_id, +rte_ethtool_get_pauseparam(uint16_t port_id, struct ethtool_pauseparam *pause_param) { struct rte_eth_fc_conf fc_conf; @@ -238,7 +238,7 @@ rte_ethtool_get_pauseparam(uint8_t port_id, } int -rte_ethtool_set_pauseparam(uint8_t port_id, +rte_ethtool_set_pauseparam(uint16_t port_id, struct ethtool_pauseparam *pause_param) { struct rte_eth_fc_conf fc_conf; @@ -281,7 +281,7 @@ rte_ethtool_set_pauseparam(uint8_t port_id, } int -rte_ethtool_net_open(uint8_t port_id) +rte_ethtool_net_open(uint16_t port_id) { rte_eth_dev_stop(port_id); @@ -289,7 +289,7 @@ rte_ethtool_net_open(uint8_t port_id) } int -rte_ethtool_net_stop(uint8_t port_id) +rte_ethtool_net_stop(uint16_t port_id) { RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); rte_eth_dev_stop(port_id); @@ -298,7 +298,7 @@ rte_ethtool_net_stop(uint8_t port_id) } int -rte_ethtool_net_get_mac_addr(uint8_t port_id, struct ether_addr *addr) +rte_ethtool_net_get_mac_addr(uint16_t port_id, struct ether_addr *addr) { RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); if (addr == NULL) @@ -309,7 +309,7 @@ rte_ethtool_net_get_mac_addr(uint8_t port_id, struct ether_addr *addr) } int -rte_ethtool_net_set_mac_addr(uint8_t port_id, struct ether_addr *addr) +rte_ethtool_net_set_mac_addr(uint16_t port_id, struct ether_addr *addr) { if (addr == NULL) return -EINVAL; @@ -317,7 +317,7 @@ rte_ethtool_net_set_mac_addr(uint8_t port_id, struct ether_addr *addr) } int -rte_ethtool_net_validate_addr(uint8_t port_id __rte_unused, +rte_ethtool_net_validate_addr(uint16_t port_id __rte_unused, struct ether_addr *addr) { if (addr == NULL) @@ -326,7 +326,7 @@ rte_ethtool_net_validate_addr(uint8_t port_id __rte_unused, } int -rte_ethtool_net_change_mtu(uint8_t port_id, int mtu) +rte_ethtool_net_change_mtu(uint16_t port_id, int mtu) { if (mtu < 0 || mtu > UINT16_MAX) return -EINVAL; @@ -334,7 +334,7 @@ rte_ethtool_net_change_mtu(uint8_t port_id, int mtu) } int -rte_ethtool_net_get_stats64(uint8_t port_id, struct rte_eth_stats *stats) +rte_ethtool_net_get_stats64(uint16_t port_id, struct rte_eth_stats *stats) { if (stats == NULL) return -EINVAL; @@ -342,13 +342,13 @@ rte_ethtool_net_get_stats64(uint8_t port_id, struct rte_eth_stats *stats) } int -rte_ethtool_net_vlan_rx_add_vid(uint8_t port_id, uint16_t vid) +rte_ethtool_net_vlan_rx_add_vid(uint16_t port_id, uint16_t vid) { return rte_eth_dev_vlan_filter(port_id, vid, 1); } int -rte_ethtool_net_vlan_rx_kill_vid(uint8_t port_id, uint16_t vid) +rte_ethtool_net_vlan_rx_kill_vid(uint16_t port_id, uint16_t vid) { return rte_eth_dev_vlan_filter(port_id, vid, 0); } @@ -361,7 +361,7 @@ rte_ethtool_net_vlan_rx_kill_vid(uint8_t port_id, uint16_t vid) * driver can register device-specific implementation */ int -rte_ethtool_net_set_rx_mode(uint8_t port_id) +rte_ethtool_net_set_rx_mode(uint16_t port_id) { uint16_t num_vfs; struct rte_eth_dev_info dev_info; @@ -387,7 +387,7 @@ rte_ethtool_net_set_rx_mode(uint8_t port_id) int -rte_ethtool_get_ringparam(uint8_t port_id, +rte_ethtool_get_ringparam(uint16_t port_id, struct ethtool_ringparam *ring_param) { struct rte_eth_dev_info dev_info; @@ -419,7 +419,7 @@ rte_ethtool_get_ringparam(uint8_t port_id, int -rte_ethtool_set_ringparam(uint8_t port_id, +rte_ethtool_set_ringparam(uint16_t port_id, struct ethtool_ringparam *ring_param) { struct rte_eth_rxq_info rx_qinfo; diff --git a/examples/ethtool/lib/rte_ethtool.h b/examples/ethtool/lib/rte_ethtool.h index 18f44404..1cd8f4d2 100644 --- a/examples/ethtool/lib/rte_ethtool.h +++ b/examples/ethtool/lib/rte_ethtool.h @@ -79,7 +79,7 @@ extern "C" { * - (0) if successful. * - (-ENODEV) if *port_id* invalid. */ -int rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo); +int rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo); /** * Retrieve the Ethernet device register length in bytes. @@ -93,7 +93,7 @@ int rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_regs_len(uint8_t port_id); +int rte_ethtool_get_regs_len(uint16_t port_id); /** * Retrieve the Ethernet device register information according to @@ -111,7 +111,7 @@ int rte_ethtool_get_regs_len(uint8_t port_id); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_regs(uint8_t port_id, struct ethtool_regs *regs, +int rte_ethtool_get_regs(uint16_t port_id, struct ethtool_regs *regs, void *data); /** @@ -127,7 +127,7 @@ int rte_ethtool_get_regs(uint8_t port_id, struct ethtool_regs *regs, * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_link(uint8_t port_id); +int rte_ethtool_get_link(uint16_t port_id); /** * Retrieve the Ethernet device EEPROM size @@ -141,7 +141,7 @@ int rte_ethtool_get_link(uint8_t port_id); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_eeprom_len(uint8_t port_id); +int rte_ethtool_get_eeprom_len(uint16_t port_id); /** * Retrieve EEPROM content based upon eeprom range described in ethtool @@ -159,7 +159,7 @@ int rte_ethtool_get_eeprom_len(uint8_t port_id); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, +int rte_ethtool_get_eeprom(uint16_t port_id, struct ethtool_eeprom *eeprom, void *words); /** @@ -179,7 +179,7 @@ int rte_ethtool_get_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_set_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, +int rte_ethtool_set_eeprom(uint16_t port_id, struct ethtool_eeprom *eeprom, void *words); /** @@ -199,7 +199,7 @@ int rte_ethtool_set_eeprom(uint8_t port_id, struct ethtool_eeprom *eeprom, * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_get_pauseparam(uint8_t port_id, +int rte_ethtool_get_pauseparam(uint16_t port_id, struct ethtool_pauseparam *pause_param); /** @@ -217,7 +217,7 @@ int rte_ethtool_get_pauseparam(uint8_t port_id, * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_set_pauseparam(uint8_t port_id, +int rte_ethtool_set_pauseparam(uint16_t port_id, struct ethtool_pauseparam *param); /** @@ -231,7 +231,7 @@ int rte_ethtool_set_pauseparam(uint8_t port_id, * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_open(uint8_t port_id); +int rte_ethtool_net_open(uint16_t port_id); /** * Stop the Ethernet device. @@ -242,7 +242,7 @@ int rte_ethtool_net_open(uint8_t port_id); * - (0) if successful. * - (-ENODEV) if *port_id* invalid. */ -int rte_ethtool_net_stop(uint8_t port_id); +int rte_ethtool_net_stop(uint16_t port_id); /** * Get the Ethernet device MAC address. @@ -255,7 +255,7 @@ int rte_ethtool_net_stop(uint8_t port_id); * - (0) if successful. * - (-ENODEV) if *port_id* invalid. */ -int rte_ethtool_net_get_mac_addr(uint8_t port_id, struct ether_addr *addr); +int rte_ethtool_net_get_mac_addr(uint16_t port_id, struct ether_addr *addr); /** * Setting the Ethernet device MAC address. @@ -271,7 +271,7 @@ int rte_ethtool_net_get_mac_addr(uint8_t port_id, struct ether_addr *addr); * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_set_mac_addr(uint8_t port_id, struct ether_addr *addr); +int rte_ethtool_net_set_mac_addr(uint16_t port_id, struct ether_addr *addr); /** * Validate if the provided MAC address is valid unicast address @@ -287,7 +287,7 @@ int rte_ethtool_net_set_mac_addr(uint8_t port_id, struct ether_addr *addr); * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_validate_addr(uint8_t port_id, struct ether_addr *addr); +int rte_ethtool_net_validate_addr(uint16_t port_id, struct ether_addr *addr); /** * Setting the Ethernet device maximum Tx unit. @@ -303,7 +303,7 @@ int rte_ethtool_net_validate_addr(uint8_t port_id, struct ether_addr *addr); * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_change_mtu(uint8_t port_id, int mtu); +int rte_ethtool_net_change_mtu(uint16_t port_id, int mtu); /** * Retrieve the Ethernet device traffic statistics @@ -319,7 +319,7 @@ int rte_ethtool_net_change_mtu(uint8_t port_id, int mtu); * - (-EINVAL) if parameters invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_get_stats64(uint8_t port_id, struct rte_eth_stats *stats); +int rte_ethtool_net_get_stats64(uint16_t port_id, struct rte_eth_stats *stats); /** * Update the Ethernet device VLAN filter with new vid @@ -334,7 +334,7 @@ int rte_ethtool_net_get_stats64(uint8_t port_id, struct rte_eth_stats *stats); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_vlan_rx_add_vid(uint8_t port_id, uint16_t vid); +int rte_ethtool_net_vlan_rx_add_vid(uint16_t port_id, uint16_t vid); /** * Remove VLAN id from Ethernet device. @@ -349,7 +349,7 @@ int rte_ethtool_net_vlan_rx_add_vid(uint8_t port_id, uint16_t vid); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_vlan_rx_kill_vid(uint8_t port_id, uint16_t vid); +int rte_ethtool_net_vlan_rx_kill_vid(uint16_t port_id, uint16_t vid); /** * Setting the Ethernet device rx mode. @@ -362,7 +362,7 @@ int rte_ethtool_net_vlan_rx_kill_vid(uint8_t port_id, uint16_t vid); * - (-ENODEV) if *port_id* invalid. * - others depends on the specific operations implementation. */ -int rte_ethtool_net_set_rx_mode(uint8_t port_id); +int rte_ethtool_net_set_rx_mode(uint16_t port_id); /** * Getting ring parameters for Ethernet device. @@ -380,7 +380,7 @@ int rte_ethtool_net_set_rx_mode(uint8_t port_id); * Only the tx_pending and rx_pending fields of struct ethtool_ringparam * are used, and the function only gets parameters for queue 0. */ -int rte_ethtool_get_ringparam(uint8_t port_id, +int rte_ethtool_get_ringparam(uint16_t port_id, struct ethtool_ringparam *ring_param); /** @@ -399,7 +399,7 @@ int rte_ethtool_get_ringparam(uint8_t port_id, * Only the tx_pending and rx_pending fields of struct ethtool_ringparam * are used, and the function only sets parameters for queue 0. */ -int rte_ethtool_set_ringparam(uint8_t port_id, +int rte_ethtool_set_ringparam(uint16_t port_id, struct ethtool_ringparam *ring_param); |