net/mlx5: fix suffix flow creation in metadata split

[dpdk.git] / drivers / net / bonding / rte_eth_bond_args.c

diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index e99681e..abdf552 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -7,11 +7,8 @@
 #include <rte_bus_pci.h>
 #include <rte_kvargs.h>
 
-#include <cmdline_parse.h>
-#include <cmdline_parse_etheraddr.h>
-
 #include "rte_eth_bond.h"
-#include "rte_eth_bond_private.h"
+#include "eth_bond_private.h"
 
 const char *pmd_bond_init_valid_arguments[] = {
        PMD_BOND_SLAVE_PORT_KVARG,
@@ -32,7 +29,7 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)
        struct rte_pci_addr *eth_pci_addr;
        unsigned i;
 
-       for (i = 0; i < rte_eth_dev_count(); i++) {
+       RTE_ETH_FOREACH_DEV(i) {
                pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]);
                eth_pci_addr = &pci_dev->addr;
 
@@ -50,7 +47,7 @@ find_port_id_by_dev_name(const char *name)
 {
        unsigned i;
 
-       for (i = 0; i < rte_eth_dev_count(); i++) {
+       RTE_ETH_FOREACH_DEV(i) {
                if (rte_eth_devices[i].data == NULL)
                        continue;
 
@@ -63,11 +60,10 @@ find_port_id_by_dev_name(const char *name)
 static inline int
 bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
 {
-       struct rte_pci_device *pdev;
+       const struct rte_pci_device *pdev = RTE_DEV_TO_PCI_CONST(dev);
        const struct rte_pci_addr *paddr = _pci_addr;
 
-       pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
-       return rte_eal_compare_pci_addr(&pdev->addr, paddr);
+       return rte_pci_addr_cmp(&pdev->addr, paddr);
 }
 
 /**
@@ -84,7 +80,7 @@ parse_port_id(const char *port_str)
 
        pci_bus = rte_bus_find_by_name("pci");
        if (pci_bus == NULL) {
-               RTE_LOG(ERR, PMD, "unable to find PCI bus\n");
+               RTE_BOND_LOG(ERR, "unable to find PCI bus\n");
                return -1;
        }
 
@@ -92,7 +88,7 @@ parse_port_id(const char *port_str)
        if (pci_bus->parse(port_str, &dev_addr) == 0) {
                dev = pci_bus->find_device(NULL, bond_pci_addr_cmp, &dev_addr);
                if (dev == NULL) {
-                       RTE_LOG(ERR, PMD, "unable to find PCI device\n");
+                       RTE_BOND_LOG(ERR, "unable to find PCI device");
                        return -1;
                }
                port_id = find_port_id_by_pci_addr(&dev_addr);
@@ -134,7 +130,8 @@ bond_ethdev_parse_slave_port_kvarg(const char *key,
        if (strcmp(key, PMD_BOND_SLAVE_PORT_KVARG) == 0) {
                int port_id = parse_port_id(value);
                if (port_id < 0) {
-                       RTE_BOND_LOG(ERR, "Invalid slave port value (%s) specified", value);
+                       RTE_BOND_LOG(ERR, "Invalid slave port value (%s) specified",
+                                    value);
                        return -1;
                } else
                        slave_ports->slaves[slave_ports->slave_count++] =
@@ -280,8 +277,7 @@ bond_ethdev_parse_bond_mac_addr_kvarg(const char *key __rte_unused,
                return -1;
 
        /* Parse MAC */
-       return cmdline_parse_etheraddr(NULL, value, extra_args,
-               sizeof(struct ether_addr));
+       return rte_ether_unformat_addr(value, extra_args);
 }
 
 int