diff options
Diffstat (limited to 'vnet/vnet/ip')
| -rw-r--r-- | vnet/vnet/ip/ip.h | 35 | ||||
| -rw-r--r-- | vnet/vnet/ip/ip6_forward.c | 30 | ||||
| -rw-r--r-- | vnet/vnet/ip/ip6_neighbor.c | 12 |
3 files changed, 0 insertions, 77 deletions
diff --git a/vnet/vnet/ip/ip.h b/vnet/vnet/ip/ip.h index c9a82930a67..f50662b2acf 100644 --- a/vnet/vnet/ip/ip.h +++ b/vnet/vnet/ip/ip.h @@ -63,11 +63,6 @@ #include <vnet/ip/ip6_packet.h> #include <vnet/ip/ip6_error.h> #include <vnet/ip/icmp6.h> - -#if DPDK > 0 -#include <vnet/devices/dpdk/dpdk.h> -#endif - #include <vnet/classify/vnet_classify.h> /* Per protocol info. */ @@ -155,35 +150,6 @@ ip_incremental_checksum_buffer (vlib_main_t * vm, vlib_buffer_t * first_buffer, u32 first_buffer_offset, u32 n_bytes_to_checksum, ip_csum_t sum) -#if DPDK > 0 -{ - u32 n_bytes_left = n_bytes_to_checksum; - struct rte_mbuf * mb = rte_mbuf_from_vlib_buffer(first_buffer); - u8 nb_segs = mb->nb_segs; - ASSERT(mb->data_len >= first_buffer_offset); - void * h; - u32 n; - - n = clib_min (n_bytes_left, mb->data_len); - h = vlib_buffer_get_current (first_buffer) + first_buffer_offset; - while (n_bytes_left) - { - sum = ip_incremental_checksum (sum, h, n); - n_bytes_left -= n; - nb_segs--; - mb = mb->next; - if ((nb_segs == 0) || (mb == 0)) - break; - - n = clib_min (n_bytes_left, mb->data_len); - h = rte_ctrlmbuf_data(mb); - } - - ASSERT(n_bytes_left == 0); - ASSERT(nb_segs == 0); - return sum; -} -#else { vlib_buffer_t * b = first_buffer; u32 n_bytes_left = n_bytes_to_checksum; @@ -210,7 +176,6 @@ ip_incremental_checksum_buffer (vlib_main_t * vm, vlib_buffer_t * first_buffer, return sum; } -#endif /* DPDK */ void ip_del_all_interface_addresses (vlib_main_t *vm, u32 sw_if_index); diff --git a/vnet/vnet/ip/ip6_forward.c b/vnet/vnet/ip/ip6_forward.c index 14dd9dfbdf0..f3cd640a841 100644 --- a/vnet/vnet/ip/ip6_forward.c +++ b/vnet/vnet/ip/ip6_forward.c @@ -1177,35 +1177,6 @@ u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, ip6 } n_bytes_left = n_this_buffer = payload_length_host_byte_order; -#if DPDK > 0 - if (p0 && n_this_buffer + headers_size > p0->current_length) - { - struct rte_mbuf *mb = rte_mbuf_from_vlib_buffer(p0); - u8 nb_segs = mb->nb_segs; - - n_this_buffer = (p0->current_length > headers_size ? - p0->current_length - headers_size : 0); - while (n_bytes_left) - { - sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer); - n_bytes_left -= n_this_buffer; - - mb = mb->next; - nb_segs--; - if ((nb_segs == 0) || (mb == 0)) - break; - - data_this_buffer = rte_ctrlmbuf_data(mb); - n_this_buffer = mb->data_len; - } - if (n_bytes_left || nb_segs) - { - *bogus_lengthp = 1; - return 0xfefe; - } - } - else sum0 = ip_incremental_checksum (sum0, data_this_buffer, n_this_buffer); -#else if (p0 && n_this_buffer + headers_size > p0->current_length) n_this_buffer = p0->current_length > headers_size ? p0->current_length - headers_size : 0; while (1) @@ -1224,7 +1195,6 @@ u16 ip6_tcp_udp_icmp_compute_checksum (vlib_main_t * vm, vlib_buffer_t * p0, ip6 data_this_buffer = vlib_buffer_get_current (p0); n_this_buffer = p0->current_length; } -#endif /* DPDK */ sum16 = ~ ip_csum_fold (sum0); diff --git a/vnet/vnet/ip/ip6_neighbor.c b/vnet/vnet/ip/ip6_neighbor.c index af852a2be86..cc176306969 100644 --- a/vnet/vnet/ip/ip6_neighbor.c +++ b/vnet/vnet/ip/ip6_neighbor.c @@ -23,10 +23,6 @@ #include <vnet/fib/fib_table.h> #include <vnet/fib/ip6_fib.h> -#if DPDK==1 -#include <vnet/devices/dpdk/dpdk.h> -#endif - /** * @file * @brief IPv6 Neighbor Adjacency and Neighbor Discovery. @@ -317,7 +313,6 @@ typedef struct { ip6_address_t addr; } ip6_neighbor_set_unset_rpc_args_t; -#if DPDK > 0 static void ip6_neighbor_set_unset_rpc_callback ( ip6_neighbor_set_unset_rpc_args_t * a); @@ -340,7 +335,6 @@ static void set_unset_ip6_neighbor_rpc vl_api_rpc_call_main_thread (ip6_neighbor_set_unset_rpc_callback, (u8 *) &args, sizeof (args)); } -#endif static void ip6_nbr_probe (ip_adjacency_t *adj) @@ -538,14 +532,12 @@ vnet_set_ip6_ethernet_neighbor (vlib_main_t * vm, u32 next_index; pending_resolution_t * pr, * mc; -#if DPDK > 0 if (os_get_cpu_number()) { set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address, 1 /* set new neighbor */, is_static); return 0; } -#endif k.sw_if_index = sw_if_index; k.ip6_address = a[0]; @@ -687,14 +679,12 @@ vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm, uword * p; int rv = 0; -#if DPDK > 0 if (os_get_cpu_number()) { set_unset_ip6_neighbor_rpc (vm, sw_if_index, a, link_layer_address, 0 /* unset */, 0); return 0; } -#endif k.sw_if_index = sw_if_index; k.ip6_address = a[0]; @@ -722,7 +712,6 @@ vnet_unset_ip6_ethernet_neighbor (vlib_main_t * vm, return rv; } -#if DPDK > 0 static void ip6_neighbor_set_unset_rpc_callback ( ip6_neighbor_set_unset_rpc_args_t * a) { @@ -734,7 +723,6 @@ static void ip6_neighbor_set_unset_rpc_callback vnet_unset_ip6_ethernet_neighbor (vm, a->sw_if_index, &a->addr, a->link_layer_address, 6); } -#endif static int ip6_neighbor_sort (void *a1, void *a2) |