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
fib: add dataplane algorithm for IPv6
[dpdk.git]
/
lib
/
librte_rawdev
/
rte_rawdev.c
diff --git
a/lib/librte_rawdev/rte_rawdev.c
b/lib/librte_rawdev/rte_rawdev.c
index
62b6b97
..
b6f1e1c
100644
(file)
--- a/
lib/librte_rawdev/rte_rawdev.c
+++ b/
lib/librte_rawdev/rte_rawdev.c
@@
-13,6
+13,7
@@
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/types.h>
#include <sys/queue.h>
+#include <rte_string_fns.h>
#include <rte_byteorder.h>
#include <rte_log.h>
#include <rte_debug.h>
#include <rte_byteorder.h>
#include <rte_log.h>
#include <rte_debug.h>
@@
-35,21
+36,19
@@
/* dynamic log identifier */
int librawdev_logtype;
/* dynamic log identifier */
int librawdev_logtype;
-struct rte_rawdev rte_rawdevices[RTE_RAWDEV_MAX_DEVS];
+st
atic st
ruct rte_rawdev rte_rawdevices[RTE_RAWDEV_MAX_DEVS];
-struct rte_rawdev *rte_rawdevs =
&rte_rawdevices[0]
;
+struct rte_rawdev *rte_rawdevs =
rte_rawdevices
;
static struct rte_rawdev_global rawdev_globals = {
.nb_devs = 0
};
static struct rte_rawdev_global rawdev_globals = {
.nb_devs = 0
};
-struct rte_rawdev_global *rte_rawdev_globals = &rawdev_globals;
-
/* Raw device, northbound API implementation */
uint8_t
rte_rawdev_count(void)
{
/* Raw device, northbound API implementation */
uint8_t
rte_rawdev_count(void)
{
- return r
te_rawdev_globals->
nb_devs;
+ return r
awdev_globals.
nb_devs;
}
uint16_t
}
uint16_t
@@
-60,7
+59,7
@@
rte_rawdev_get_dev_id(const char *name)
if (!name)
return -EINVAL;
if (!name)
return -EINVAL;
- for (i = 0; i < r
te_rawdev_globals->
nb_devs; i++)
+ for (i = 0; i < r
awdev_globals.
nb_devs; i++)
if ((strcmp(rte_rawdevices[i].name, name)
== 0) &&
(rte_rawdevices[i].attached ==
if ((strcmp(rte_rawdevices[i].name, name)
== 0) &&
(rte_rawdevices[i].attached ==
@@
-379,7
+378,7
@@
rte_rawdev_selftest(uint16_t dev_id)
struct rte_rawdev *dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_selftest, -ENOTSUP);
struct rte_rawdev *dev = &rte_rawdevs[dev_id];
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_selftest, -ENOTSUP);
- return (*dev->dev_ops->dev_selftest)();
+ return (*dev->dev_ops->dev_selftest)(
dev_id
);
}
int
}
int
@@
-497,20
+496,21
@@
rte_rawdev_pmd_allocate(const char *name, size_t dev_priv_size, int socket_id)
rawdev = &rte_rawdevs[dev_id];
rawdev = &rte_rawdevs[dev_id];
- rawdev->dev_private = rte_zmalloc_socket("rawdev private",
+ if (dev_priv_size > 0) {
+ rawdev->dev_private = rte_zmalloc_socket("rawdev private",
dev_priv_size,
RTE_CACHE_LINE_SIZE,
socket_id);
dev_priv_size,
RTE_CACHE_LINE_SIZE,
socket_id);
- if (!rawdev->dev_private) {
- RTE_RDEV_ERR("Unable to allocate memory to Skeleton dev");
- return NULL;
+ if (!rawdev->dev_private) {
+ RTE_RDEV_ERR("Unable to allocate memory for rawdev");
+ return NULL;
+ }
}
}
-
rawdev->dev_id = dev_id;
rawdev->socket_id = socket_id;
rawdev->started = 0;
rawdev->dev_id = dev_id;
rawdev->socket_id = socket_id;
rawdev->started = 0;
- s
nprintf(rawdev->name, RTE_RAWDEV_NAME_MAX_LEN, "%s", name
);
+ s
trlcpy(rawdev->name, name, RTE_RAWDEV_NAME_MAX_LEN
);
rawdev->attached = RTE_RAWDEV_ATTACHED;
rawdev_globals.nb_devs++;
rawdev->attached = RTE_RAWDEV_ATTACHED;
rawdev_globals.nb_devs++;