diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-09-08 19:52:02 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2017-09-09 20:11:03 +0000 |
| commit | 56dd5438b04b869065d8e901c315496bb6777455 (patch) | |
| tree | 517190c53cfd2725d716eda6dddf9a64ad814084 /src/vnet/unix/tuntap.c | |
| parent | 816122e303efb5012f6897bd53ff8fe28cd8fa1c (diff) | |
move unix_file_* code to vppinfra
This will allow us to use this code in client libraries without vlib.
Change-Id: I8557b752496841ba588aa36b6082cbe2cd1867fe
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vnet/unix/tuntap.c')
| -rw-r--r-- | src/vnet/unix/tuntap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c index 2c403679349..9616feb2d51 100644 --- a/src/vnet/unix/tuntap.c +++ b/src/vnet/unix/tuntap.c @@ -104,7 +104,7 @@ typedef struct { mhash_t subif_mhash; /** Unix file index */ - u32 unix_file_index; + u32 clib_file_index; /** For the "normal" interface, if configured */ u32 hw_if_index, sw_if_index; @@ -388,11 +388,11 @@ VLIB_REGISTER_NODE (tuntap_rx_node,static) = { /** * @brief Gets called when file descriptor is ready from epoll. * - * @param *uf - unix_file_t + * @param *uf - clib_file_t * * @return error - clib_error_t */ -static clib_error_t * tuntap_read_ready (unix_file_t * uf) +static clib_error_t * tuntap_read_ready (clib_file_t * uf) { vlib_main_t * vm = vlib_get_main(); vlib_node_set_interrupt_pending (vm, tuntap_rx_node.index); @@ -645,10 +645,10 @@ tuntap_config (vlib_main_t * vm, unformat_input_t * input) } { - unix_file_t template = {0}; + clib_file_t template = {0}; template.read_function = tuntap_read_ready; template.file_descriptor = tm->dev_net_tun_fd; - tm->unix_file_index = unix_file_add (&unix_main, &template); + tm->clib_file_index = clib_file_add (&file_main, &template); } done: |