dpdk: remove rte_mbuf modifications at many places in the code

[vpp.git] / vnet / vnet / ip / ip.h

diff --git a/vnet/vnet/ip/ip.h b/vnet/vnet/ip/ip.h
index a0b4ea6..f50662b 100644 (file)
--- a/vnet/vnet/ip/ip.h
+++ b/vnet/vnet/ip/ip.h
@@ -42,6 +42,7 @@
 
 #include <vppinfra/hash.h>
 #include <vppinfra/heap.h>             /* adjacency heap */
+#include <vppinfra/ptclosure.h>
 
 #include <vnet/vnet.h>
 
@@ -62,20 +63,8 @@
 #include <vnet/ip/ip6_packet.h>
 #include <vnet/ip/ip6_error.h>
 #include <vnet/ip/icmp6.h>
-
-#include <vnet/ip/tcp.h>
-
-#if DPDK > 0
-#include <vnet/devices/dpdk/dpdk.h>
-#endif
-
 #include <vnet/classify/vnet_classify.h>
 
-typedef union {
-  ip4_address_t ip4;
-  ip6_address_t ip6;
-} ip46_address_t;
-
 /* Per protocol info. */
 typedef struct {
   /* Protocol name (also used as hash key). */
@@ -161,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 = ((struct rte_mbuf *)first_buffer)-1;
-  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;
@@ -216,8 +176,10 @@ 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);
 
+extern vlib_node_registration_t ip4_inacl_node;
+extern vlib_node_registration_t ip6_inacl_node;
+
 #endif /* included_ip_main_h */