git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kni: support async user request
[dpdk.git]
/
lib
/
librte_ethdev
/
rte_ethdev.c
diff --git
a/lib/librte_ethdev/rte_ethdev.c
b/lib/librte_ethdev/rte_ethdev.c
index
6b5cfd6
..
c73d263
100644
(file)
--- a/
lib/librte_ethdev/rte_ethdev.c
+++ b/
lib/librte_ethdev/rte_ethdev.c
@@
-2,18
+2,14
@@
* Copyright(c) 2010-2017 Intel Corporation
*/
* Copyright(c) 2010-2017 Intel Corporation
*/
-#include <sys/types.h>
-#include <sys/queue.h>
#include <ctype.h>
#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
#include <errno.h>
#include <errno.h>
+#include <inttypes.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdint.h>
-#include <inttypes.h>
-#include <netinet/in.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/queue.h>
#include <rte_byteorder.h>
#include <rte_log.h>
#include <rte_byteorder.h>
#include <rte_log.h>
@@
-193,13
+189,14
@@
int
rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
{
int ret;
rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
{
int ret;
- struct rte_devargs devargs
= {.args = NULL}
;
+ struct rte_devargs devargs;
const char *bus_param_key;
char *bus_str = NULL;
char *cls_str = NULL;
int str_size;
memset(iter, 0, sizeof(*iter));
const char *bus_param_key;
char *bus_str = NULL;
char *cls_str = NULL;
int str_size;
memset(iter, 0, sizeof(*iter));
+ memset(&devargs, 0, sizeof(devargs));
/*
* The devargs string may use various syntaxes:
/*
* The devargs string may use various syntaxes:
@@
-244,8
+241,6
@@
rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
goto error;
}
iter->cls_str = cls_str;
goto error;
}
iter->cls_str = cls_str;
- free(devargs.args); /* allocated by rte_devargs_parse() */
- devargs.args = NULL;
iter->bus = devargs.bus;
if (iter->bus->dev_iterate == NULL) {
iter->bus = devargs.bus;
if (iter->bus->dev_iterate == NULL) {
@@
-278,13
+273,14
@@
rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
end:
iter->cls = rte_class_find_by_name("eth");
end:
iter->cls = rte_class_find_by_name("eth");
+ rte_devargs_reset(&devargs);
return 0;
error:
if (ret == -ENOTSUP)
RTE_ETHDEV_LOG(ERR, "Bus %s does not support iterating.\n",
iter->bus->name);
return 0;
error:
if (ret == -ENOTSUP)
RTE_ETHDEV_LOG(ERR, "Bus %s does not support iterating.\n",
iter->bus->name);
-
free(devargs.
args);
+
rte_devargs_reset(&dev
args);
free(bus_str);
free(cls_str);
return ret;
free(bus_str);
free(cls_str);
return ret;