VPP-1283: IPv6 PMTU missing MTU value in ICMP6 message.

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

diff --git a/src/vnet/ip/ip4_input.h b/src/vnet/ip/ip4_input.h
index 75306a3..600d693 100644 (file)
--- a/src/vnet/ip/ip4_input.h
+++ b/src/vnet/ip/ip4_input.h
@@ -52,6 +52,7 @@ typedef enum
   IP4_INPUT_NEXT_LOOKUP,
   IP4_INPUT_NEXT_LOOKUP_MULTICAST,
   IP4_INPUT_NEXT_ICMP_ERROR,
+  IP4_INPUT_NEXT_REASSEMBLY,
   IP4_INPUT_N_NEXT,
 } ip4_input_next_t;
 
@@ -132,6 +133,7 @@ ip4_input_check_x2 (vlib_main_t * vm,
       else
        *next0 = error0 != IP4_ERROR_OPTIONS ?
          IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+      p0->error = error_node->errors[error0];
     }
   if (PREDICT_FALSE (error1 != IP4_ERROR_NONE))
     {
@@ -145,10 +147,9 @@ ip4_input_check_x2 (vlib_main_t * vm,
       else
        *next1 = error1 != IP4_ERROR_OPTIONS ?
          IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+      p1->error = error_node->errors[error1];
     }
 
-  p0->error = error_node->errors[error0];
-  p1->error = error_node->errors[error1];
 }
 
 always_inline void
@@ -207,9 +208,9 @@ ip4_input_check_x1 (vlib_main_t * vm,
       else
        *next0 = error0 != IP4_ERROR_OPTIONS ?
          IP4_INPUT_NEXT_DROP : IP4_INPUT_NEXT_PUNT;
+      p0->error = error_node->errors[error0];
     }
 
-  p0->error = error_node->errors[error0];
 }
 
 /*