Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add extern to *_main global variable declarations in header files.
[vpp.git]
/
src
/
vnet
/
devices
/
netmap
/
netmap.c
diff --git
a/src/vnet/devices/netmap/netmap.c
b/src/vnet/devices/netmap/netmap.c
index
3bdb442
..
25a3af7
100644
(file)
--- a/
src/vnet/devices/netmap/netmap.c
+++ b/
src/vnet/devices/netmap/netmap.c
@@
-27,6
+27,8
@@
#include <vnet/ethernet/ethernet.h>
#include <vnet/devices/netmap/netmap.h>
#include <vnet/ethernet/ethernet.h>
#include <vnet/devices/netmap/netmap.h>
+netmap_main_t netmap_main;
+
static u32
netmap_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
u32 flags)
static u32
netmap_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
u32 flags)
@@
-36,7
+38,7
@@
netmap_eth_flag_change (vnet_main_t * vnm, vnet_hw_interface_t * hi,
}
static clib_error_t *
}
static clib_error_t *
-netmap_fd_read_ready (
unix
_file_t * uf)
+netmap_fd_read_ready (
clib
_file_t * uf)
{
vlib_main_t *vm = vlib_get_main ();
netmap_main_t *nm = &netmap_main;
{
vlib_main_t *vm = vlib_get_main ();
netmap_main_t *nm = &netmap_main;
@@
-54,10
+56,10
@@
netmap_fd_read_ready (unix_file_t * uf)
static void
close_netmap_if (netmap_main_t * nm, netmap_if_t * nif)
{
static void
close_netmap_if (netmap_main_t * nm, netmap_if_t * nif)
{
- if (nif->
unix
_file_index != ~0)
+ if (nif->
clib
_file_index != ~0)
{
{
-
unix_file_del (&unix_main, unix_main.file_pool + nif->unix
_file_index);
- nif->
unix
_file_index = ~0;
+
clib_file_del (&file_main, file_main.file_pool + nif->clib
_file_index);
+ nif->
clib
_file_index = ~0;
}
else if (nif->fd > -1)
close (nif->fd);
}
else if (nif->fd > -1)
close (nif->fd);
@@
-137,7
+139,7
@@
netmap_create_if (vlib_main_t * vm, u8 * if_name, u8 * hw_addr_set,
pool_get (nm->interfaces, nif);
nif->if_index = nif - nm->interfaces;
nif->fd = fd;
pool_get (nm->interfaces, nif);
nif->if_index = nif - nm->interfaces;
nif->fd = fd;
- nif->
unix
_file_index = ~0;
+ nif->
clib
_file_index = ~0;
vec_validate (req, 0);
nif->req = req;
vec_validate (req, 0);
nif->req = req;
@@
-185,18
+187,14
@@
netmap_create_if (vlib_main_t * vm, u8 * if_name, u8 * hw_addr_set,
nif->per_interface_next_index = ~0;
if (tm->n_vlib_mains > 1)
nif->per_interface_next_index = ~0;
if (tm->n_vlib_mains > 1)
- {
- nif->lockp = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
- CLIB_CACHE_LINE_BYTES);
- memset ((void *) nif->lockp, 0, CLIB_CACHE_LINE_BYTES);
- }
+ clib_spinlock_init (&nif->lockp);
{
{
-
unix
_file_t template = { 0 };
+
clib
_file_t template = { 0 };
template.read_function = netmap_fd_read_ready;
template.file_descriptor = nif->fd;
template.private_data = nif->if_index;
template.read_function = netmap_fd_read_ready;
template.file_descriptor = nif->fd;
template.private_data = nif->if_index;
- nif->
unix_file_index = unix_file_add (&unix
_main, &template);
+ nif->
clib_file_index = clib_file_add (&file
_main, &template);
}
/*use configured or generate random MAC address */
}
/*use configured or generate random MAC address */