net/pcap: update single interface handling
authorFerruh Yigit <ferruh.yigit@intel.com>
Fri, 26 Aug 2016 11:17:52 +0000 (12:17 +0100)
committerBruce Richardson <bruce.richardson@intel.com>
Fri, 30 Sep 2016 10:27:18 +0000 (12:27 +0200)
Remove hardcoded single interface values, make it more obvious.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
drivers/net/pcap/rte_eth_pcap.c

index a9688f8..a3cabf4 100644 (file)
@@ -969,16 +969,14 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
 
                if (ret < 0)
                        goto free_kvlist;
-               dumpers.queue[0].pcap = pcaps.queue[0].pcap;
-               dumpers.queue[0].name = pcaps.queue[0].name;
-               dumpers.queue[0].type = pcaps.queue[0].type;
 
-               single_iface = 1;
+               dumpers.queue[0] = pcaps.queue[0];
 
-               ret = rte_eth_from_pcaps(name, &pcaps, 1, &dumpers, 1,
-                       kvlist, single_iface, is_tx_pcap);
+               single_iface = 1;
+               pcaps.num_of_queue = 1;
+               dumpers.num_of_queue = 1;
 
-               goto free_kvlist;
+               goto create_eth;
        }
 
        /*
@@ -1029,6 +1027,7 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
        if (ret < 0)
                goto free_kvlist;
 
+create_eth:
        ret = rte_eth_from_pcaps(name, &pcaps, pcaps.num_of_queue, &dumpers,
                dumpers.num_of_queue, kvlist, single_iface, is_tx_pcap);