net/enic: fix memory freeing

[dpdk.git] / drivers / net / enic / enic_ethdev.c

diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c
index fab8124..83048d8 100644 (file)
--- a/drivers/net/enic/enic_ethdev.c
+++ b/drivers/net/enic/enic_ethdev.c
@@ -269,14 +269,18 @@ static int enicpmd_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,
        struct enic *enic = pmd_priv(eth_dev);
 
        ENICPMD_FUNC_TRACE();
-       if (queue_idx >= ENIC_RQ_MAX) {
+       /* With Rx scatter support, two RQs are now used on VIC per RQ used
+        * by the application.
+        */
+       if (queue_idx * 2 >= ENIC_RQ_MAX) {
                dev_err(enic,
-                       "Max number of RX queues exceeded.  Max is %d\n",
+                       "Max number of RX queues exceeded.  Max is %d. This PMD uses 2 RQs on VIC per RQ used by DPDK.\n",
                        ENIC_RQ_MAX);
                return -EINVAL;
        }
 
-       eth_dev->data->rx_queues[queue_idx] = (void *)&enic->rq[queue_idx];
+       eth_dev->data->rx_queues[queue_idx] =
+               (void *)&enic->rq[enic_sop_rq(queue_idx)];
 
        ret = enic_alloc_rq(enic, queue_idx, socket_id, mp, nb_desc);
        if (ret) {
@@ -455,8 +459,12 @@ static void enicpmd_dev_info_get(struct rte_eth_dev *eth_dev,
 static const uint32_t *enicpmd_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 {
        static const uint32_t ptypes[] = {
-               RTE_PTYPE_L3_IPV4,
-               RTE_PTYPE_L3_IPV6,
+               RTE_PTYPE_L3_IPV4_EXT_UNKNOWN,
+               RTE_PTYPE_L3_IPV6_EXT_UNKNOWN,
+               RTE_PTYPE_L4_TCP,
+               RTE_PTYPE_L4_UDP,
+               RTE_PTYPE_L4_FRAG,
+               RTE_PTYPE_L4_NONFRAG,
                RTE_PTYPE_UNKNOWN
        };
 
@@ -577,7 +585,7 @@ static int eth_enicpmd_dev_init(struct rte_eth_dev *eth_dev)
        enic->rte_dev = eth_dev;
        eth_dev->dev_ops = &enicpmd_eth_dev_ops;
        eth_dev->rx_pkt_burst = &enic_recv_pkts;
-       eth_dev->tx_pkt_burst = &enicpmd_xmit_pkts;
+       eth_dev->tx_pkt_burst = &enic_xmit_pkts;
 
        pdev = eth_dev->pci_dev;
        rte_eth_copy_pci_info(eth_dev, pdev);