diff options
Diffstat (limited to 'examples/ethtool')
| -rw-r--r-- | examples/ethtool/ethtool-app/main.c | 12 | ||||
| -rw-r--r-- | examples/ethtool/lib/rte_ethtool.c | 4 | ||||
| -rw-r--r-- | examples/ethtool/lib/rte_ethtool.h | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c index 6d50d463..bbab2f6e 100644 --- a/examples/ethtool/ethtool-app/main.c +++ b/examples/ethtool/ethtool-app/main.c @@ -122,6 +122,8 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports) struct rte_eth_conf cfg_port; struct rte_eth_dev_info dev_info; char str_name[16]; + uint16_t nb_rxd = PORT_RX_QUEUE_SIZE; + uint16_t nb_txd = PORT_TX_QUEUE_SIZE; memset(&cfg_port, 0, sizeof(cfg_port)); cfg_port.txmode.mq_mode = ETH_MQ_TX_NONE; @@ -154,15 +156,19 @@ static void setup_ports(struct app_config *app_cfg, int cnt_ports) if (rte_eth_dev_configure(idx_port, 1, 1, &cfg_port) < 0) rte_exit(EXIT_FAILURE, "rte_eth_dev_configure failed"); + if (rte_eth_dev_adjust_nb_rx_tx_desc(idx_port, &nb_rxd, + &nb_txd) < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_dev_adjust_nb_rx_tx_desc failed"); if (rte_eth_rx_queue_setup( - idx_port, 0, PORT_RX_QUEUE_SIZE, + idx_port, 0, nb_rxd, rte_eth_dev_socket_id(idx_port), NULL, ptr_port->pkt_pool) < 0) rte_exit(EXIT_FAILURE, "rte_eth_rx_queue_setup failed" ); if (rte_eth_tx_queue_setup( - idx_port, 0, PORT_TX_QUEUE_SIZE, + idx_port, 0, nb_txd, rte_eth_dev_socket_id(idx_port), NULL) < 0) rte_exit(EXIT_FAILURE, "rte_eth_tx_queue_setup failed" @@ -264,7 +270,7 @@ int main(int argc, char **argv) uint32_t id_core; uint32_t cnt_ports; - /* Init runtime enviornment */ + /* Init runtime environment */ cnt_args_parsed = rte_eal_init(argc, argv); if (cnt_args_parsed < 0) rte_exit(EXIT_FAILURE, "rte_eal_init(): Failed"); diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c index 7e465206..252382cb 100644 --- a/examples/ethtool/lib/rte_ethtool.c +++ b/examples/ethtool/lib/rte_ethtool.c @@ -36,6 +36,7 @@ #include <rte_version.h> #include <rte_ethdev.h> #include <rte_ether.h> +#include <rte_pci.h> #ifdef RTE_LIBRTE_IXGBE_PMD #include <rte_pmd_ixgbe.h> #endif @@ -64,7 +65,7 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) printf("firmware version get error: (%s)\n", strerror(-ret)); else if (ret > 0) printf("Insufficient fw version buffer size, " - "the minimun size should be %d\n", ret); + "the minimum size should be %d\n", ret); memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); @@ -73,6 +74,7 @@ rte_ethtool_get_drvinfo(uint8_t port_id, struct ethtool_drvinfo *drvinfo) dev_info.driver_name); snprintf(drvinfo->version, sizeof(drvinfo->version), "%s", rte_version()); + /* TODO: replace bus_info by rte_devargs.name */ if (dev_info.pci_dev) snprintf(drvinfo->bus_info, sizeof(drvinfo->bus_info), "%04x:%02x:%02x.%x", diff --git a/examples/ethtool/lib/rte_ethtool.h b/examples/ethtool/lib/rte_ethtool.h index 2e79d453..18f44404 100644 --- a/examples/ethtool/lib/rte_ethtool.h +++ b/examples/ethtool/lib/rte_ethtool.h @@ -365,7 +365,7 @@ int rte_ethtool_net_vlan_rx_kill_vid(uint8_t port_id, uint16_t vid); int rte_ethtool_net_set_rx_mode(uint8_t port_id); /** - * Getting ring paramaters for Ethernet device. + * Getting ring parameters for Ethernet device. * * @param port_id * The port identifier of the Ethernet device. @@ -384,7 +384,7 @@ int rte_ethtool_get_ringparam(uint8_t port_id, struct ethtool_ringparam *ring_param); /** - * Setting ring paramaters for Ethernet device. + * Setting ring parameters for Ethernet device. * * @param port_id * The port identifier of the Ethernet device. |