gso: remove the interface count

[vpp.git] / src / vnet / ip / ip6_forward.c

diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 50de501..ae7083b 100644 (file)
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -1652,7 +1652,7 @@ typedef enum
 always_inline void
 ip6_mtu_check (vlib_buffer_t * b, u16 packet_bytes,
               u16 adj_packet_bytes, bool is_locally_generated,
-              u32 * next, u32 * error)
+              u32 * next, u8 is_midchain, u32 * error)
 {
   if (adj_packet_bytes >= 1280 && packet_bytes > adj_packet_bytes)
     {
@@ -1660,7 +1660,9 @@ ip6_mtu_check (vlib_buffer_t * b, u16 packet_bytes,
        {
          /* IP fragmentation */
          ip_frag_set_vnet_buffer (b, adj_packet_bytes,
-                                  IP6_FRAG_NEXT_IP6_REWRITE, 0);
+                                  (is_midchain ?
+                                   IP_FRAG_NEXT_IP_REWRITE_MIDCHAIN :
+                                   IP_FRAG_NEXT_IP_REWRITE), 0);
          *next = IP6_REWRITE_NEXT_FRAGMENT;
          *error = IP6_ERROR_MTU_EXCEEDED;
        }
@@ -1678,8 +1680,7 @@ always_inline uword
 ip6_rewrite_inline_with_gso (vlib_main_t * vm,
                             vlib_node_runtime_t * node,
                             vlib_frame_t * frame,
-                            int do_counters, int is_midchain, int is_mcast,
-                            int do_gso)
+                            int do_counters, int is_midchain, int is_mcast)
 {
   ip_lookup_main_t *lm = &ip6_main.lookup_main;
   u32 *from = vlib_frame_vector_args (frame);
@@ -1697,7 +1698,7 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 
       while (n_left_from >= 4 && n_left_to_next >= 2)
        {
-         ip_adjacency_t *adj0, *adj1;
+         const ip_adjacency_t *adj0, *adj1;
          vlib_buffer_t *p0, *p1;
          ip6_header_t *ip0, *ip1;
          u32 pi0, rw_len0, next0, error0, adj_index0;
@@ -1831,19 +1832,21 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
          u16 ip1_len =
            clib_net_to_host_u16 (ip1->payload_length) +
            sizeof (ip6_header_t);
-         if (do_gso && (p0->flags & VNET_BUFFER_F_GSO))
+         if (p0->flags & VNET_BUFFER_F_GSO)
            ip0_len = gso_mtu_sz (p0);
-         if (do_gso && (p1->flags & VNET_BUFFER_F_GSO))
+         if (p1->flags & VNET_BUFFER_F_GSO)
            ip1_len = gso_mtu_sz (p1);
 
 
 
          ip6_mtu_check (p0, ip0_len,
                         adj0[0].rewrite_header.max_l3_packet_bytes,
-                        is_locally_originated0, &next0, &error0);
+                        is_locally_originated0, &next0, is_midchain,
+                        &error0);
          ip6_mtu_check (p1, ip1_len,
                         adj1[0].rewrite_header.max_l3_packet_bytes,
-                        is_locally_originated1, &next1, &error1);
+                        is_locally_originated1, &next1, is_midchain,
+                        &error1);
 
          /* Don't adjust the buffer for hop count issue; icmp-error node
           * wants to see the IP header */
@@ -2006,12 +2009,13 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
          u16 ip0_len =
            clib_net_to_host_u16 (ip0->payload_length) +
            sizeof (ip6_header_t);
-         if (do_gso && (p0->flags & VNET_BUFFER_F_GSO))
+         if (p0->flags & VNET_BUFFER_F_GSO)
            ip0_len = gso_mtu_sz (p0);
 
          ip6_mtu_check (p0, ip0_len,
                         adj0[0].rewrite_header.max_l3_packet_bytes,
-                        is_locally_originated0, &next0, &error0);
+                        is_locally_originated0, &next0, is_midchain,
+                        &error0);
 
          /* Don't adjust the buffer for hop count issue; icmp-error node
           * wants to see the IP header */
@@ -2076,15 +2080,8 @@ ip6_rewrite_inline (vlib_main_t * vm,
                    vlib_frame_t * frame,
                    int do_counters, int is_midchain, int is_mcast)
 {
-  vnet_main_t *vnm = vnet_get_main ();
-  if (PREDICT_FALSE (vnm->interface_main.gso_interface_count > 0))
-    return ip6_rewrite_inline_with_gso (vm, node, frame, do_counters,
-                                       is_midchain, is_mcast,
-                                       1 /* do_gso */ );
-  else
-    return ip6_rewrite_inline_with_gso (vm, node, frame, do_counters,
-                                       is_midchain, is_mcast,
-                                       0 /* no do_gso */ );
+  return ip6_rewrite_inline_with_gso (vm, node, frame, do_counters,
+                                     is_midchain, is_mcast);
 }
 
 VLIB_NODE_FN (ip6_rewrite_node) (vlib_main_t * vm,