doc: clarify usage of testpmd MAC forward mode

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

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 129f04b..970fe0c 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -42,7 +42,7 @@
 #include <rte_ip_frag.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
-#include <rte_dev.h>
+#include <rte_vdev.h>
 #include <rte_alarm.h>
 #include <rte_cycles.h>
 
@@ -1650,7 +1650,8 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->max_mac_addrs = 1;
 
-       dev_info->max_rx_pktlen = (uint32_t)2048;
+       dev_info->max_rx_pktlen = internals->candidate_max_rx_pktlen ?
+                                 internals->candidate_max_rx_pktlen : 2048;
 
        dev_info->max_rx_queues = (uint16_t)128;
        dev_info->max_tx_queues = (uint16_t)512;
@@ -2176,7 +2177,7 @@ const struct eth_dev_ops default_dev_ops = {
 };
 
 static int
-bond_init(const char *name, const char *params)
+bond_probe(const char *name, const char *params)
 {
        struct bond_dev_private *internals;
        struct rte_kvargs *kvlist;
@@ -2243,7 +2244,7 @@ parse_error:
 }
 
 static int
-bond_uninit(const char *name)
+bond_remove(const char *name)
 {
        int  ret;
 
@@ -2293,6 +2294,9 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
                }
        }
 
+       /* set the max_rx_pktlen */
+       internals->max_rx_pktlen = internals->candidate_max_rx_pktlen;
+
        /*
         * if no kvlist, it means that this bonded device has been created
         * through the bonding api.
@@ -2504,11 +2508,20 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
        return 0;
 }
 
-static struct rte_driver bond_drv = {
-       .name = "eth_bond",
-       .type = PMD_VDEV,
-       .init = bond_init,
-       .uninit = bond_uninit,
+static struct rte_vdev_driver bond_drv = {
+       .probe = bond_probe,
+       .remove = bond_remove,
 };
 
-PMD_REGISTER_DRIVER(bond_drv);
+DRIVER_REGISTER_VDEV(net_bonding, bond_drv);
+
+DRIVER_REGISTER_PARAM_STRING(net_bonding,
+       "slave=<ifc> "
+       "primary=<ifc> "
+       "mode=[0-6] "
+       "xmit_policy=[l2 | l23 | l34] "
+       "socket_id=<int> "
+       "mac=<mac addr> "
+       "lsc_poll_period_ms=<int> "
+       "up_delay=<int> "
+       "down_delay=<int>");