d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/pcap: remove duplicated max queue number check

Browse Source 
Remove duplicated check by reorganizing the code, no functional change.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Ferruh Yigit 2016-08-26 12:17:46 +01:00 committed by Bruce Richardson
parent 7da1154936
commit cdbfc79a26
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/net/pcap/rte_eth_pcap.c
View File

@ -941,11 +941,11 @@ rte_eth_from_pcaps(const char *name, struct pmd_devargs *rx_queues,
static int static int
rte_pmd_pcap_devinit(const char *name, const char *params) rte_pmd_pcap_devinit(const char *name, const char *params)
{ {
unsigned using_dumpers = 0; unsigned int is_rx_pcap = 0, is_tx_pcap = 0;
int ret;
struct rte_kvargs *kvlist; struct rte_kvargs *kvlist;
struct pmd_devargs pcaps = {0}; struct pmd_devargs pcaps = {0};
struct pmd_devargs dumpers = {0}; struct pmd_devargs dumpers = {0};
int ret;
RTE_LOG(INFO, PMD, "Initializing pmd_pcap for %s\n", name); RTE_LOG(INFO, PMD, "Initializing pmd_pcap for %s\n", name);
@ -971,7 +971,7 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
dumpers.queue[0].name = pcaps.queue[0].name; dumpers.queue[0].name = pcaps.queue[0].name;
dumpers.queue[0].type = pcaps.queue[0].type; dumpers.queue[0].type = pcaps.queue[0].type;
ret = rte_eth_from_pcaps(name, &pcaps, 1, &dumpers, 1, ret = rte_eth_from_pcaps(name, &pcaps, 1, &dumpers, 1,
kvlist, 1, using_dumpers); kvlist, 1, is_tx_pcap);
goto free_kvlist; goto free_kvlist;
} }
@ -980,23 +980,21 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
* pcap file * pcap file
*/ */
pcaps.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG); pcaps.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG);
if (pcaps.num_of_queue)
if (pcaps.num_of_queue) { is_rx_pcap = 1;
if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) else
pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG,
&open_rx_pcap, &pcaps);
} else {
pcaps.num_of_queue = rte_kvargs_count(kvlist, pcaps.num_of_queue = rte_kvargs_count(kvlist,
ETH_PCAP_RX_IFACE_ARG); ETH_PCAP_RX_IFACE_ARG);
if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) if (pcaps.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES; pcaps.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
if (is_rx_pcap)
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_PCAP_ARG,
&open_rx_pcap, &pcaps);
else
ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_IFACE_ARG, ret = rte_kvargs_process(kvlist, ETH_PCAP_RX_IFACE_ARG,
&open_rx_iface, &pcaps); &open_rx_iface, &pcaps);
}
if (ret < 0) if (ret < 0)
goto free_kvlist; goto free_kvlist;
@ -1006,30 +1004,27 @@ rte_pmd_pcap_devinit(const char *name, const char *params)
* pcap file * pcap file
*/ */
dumpers.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG); dumpers.num_of_queue = rte_kvargs_count(kvlist, ETH_PCAP_TX_PCAP_ARG);
if (dumpers.num_of_queue)
if (dumpers.num_of_queue) { is_tx_pcap = 1;
if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) else
dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG,
&open_tx_pcap, &dumpers);
using_dumpers = 1;
} else {
dumpers.num_of_queue = rte_kvargs_count(kvlist, dumpers.num_of_queue = rte_kvargs_count(kvlist,
ETH_PCAP_TX_IFACE_ARG); ETH_PCAP_TX_IFACE_ARG);
if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES) if (dumpers.num_of_queue > RTE_PMD_PCAP_MAX_QUEUES)
dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES; dumpers.num_of_queue = RTE_PMD_PCAP_MAX_QUEUES;
if (is_tx_pcap)
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_PCAP_ARG,
&open_tx_pcap, &dumpers);
else
ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_IFACE_ARG, ret = rte_kvargs_process(kvlist, ETH_PCAP_TX_IFACE_ARG,
&open_tx_iface, &dumpers); &open_tx_iface, &dumpers);
}
if (ret < 0) if (ret < 0)
goto free_kvlist; goto free_kvlist;
ret = rte_eth_from_pcaps(name, &pcaps, pcaps.num_of_queue, &dumpers, ret = rte_eth_from_pcaps(name, &pcaps, pcaps.num_of_queue, &dumpers,
dumpers.num_of_queue, kvlist, 0, using_dumpers); dumpers.num_of_queue, kvlist, 0, is_tx_pcap);
free_kvlist: free_kvlist:
rte_kvargs_free(kvlist); rte_kvargs_free(kvlist);