4 files changed, 17 insertions, 15 deletions

diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index d8a1372d7f0..fc860e14d89 100644
--- a/src/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
@@ -2257,7 +2257,7 @@ build_map_request (lisp_cp_main_t * lcm, gid_address_t * deid,
 
   /* push outer ip header */
   pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       rloc);
+		       rloc, 1);
 
   bi_res[0] = bi;
 
@@ -2283,6 +2283,7 @@ build_encapsulated_map_request (lisp_cp_main_t * lcm,
     }
 
   b = vlib_get_buffer (vm, bi);
+  b->flags = 0;
 
   /* leave some space for the encap headers */
   vlib_buffer_make_headroom (b, MAX_LISP_MSG_ENCAP_LEN);
@@ -2311,7 +2312,7 @@ build_encapsulated_map_request (lisp_cp_main_t * lcm,
 
   /* push outer ip header */
   pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       mr_ip);
+		       mr_ip, 1);
 
   bi_res[0] = bi;
 
@@ -2466,7 +2467,7 @@ build_map_register (lisp_cp_main_t * lcm, ip_address_t * sloc,
 
   /* push outer ip header */
   pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
-		       ms_ip);
+		       ms_ip, 1);
 
   bi_res[0] = bi;
   return b;
@@ -3650,7 +3651,7 @@ build_map_reply (lisp_cp_main_t * lcm, ip_address_t * sloc,
   lisp_msg_put_map_reply (b, records, nonce, probe_bit);
 
   /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, dst_port, sloc, dst);
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, dst_port, sloc, dst, 1);
 
   bi_res[0] = bi;
   return b;
diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.c b/src/vnet/lisp-cp/lisp_msg_serdes.c
index 6c0a7219f31..aee4f25e6a6 100644
--- a/src/vnet/lisp-cp/lisp_msg_serdes.c
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.c
@@ -229,7 +229,7 @@ lisp_msg_push_ecm (vlib_main_t * vm, vlib_buffer_t * b, int lp, int rp,
     }
 
   /* Push inner ip and udp */
-  pkt_push_udp_and_ip (vm, b, lp, rp, src_ip, dst_ip);
+  pkt_push_udp_and_ip (vm, b, lp, rp, src_ip, dst_ip, 0);
 
   /* Push lisp ecm hdr */
   h = pkt_push_ecm_hdr (b);
diff --git a/src/vnet/lisp-cp/packets.c b/src/vnet/lisp-cp/packets.c
index a3d6f1cdf06..25086b8e7d9 100644
--- a/src/vnet/lisp-cp/packets.c
+++ b/src/vnet/lisp-cp/packets.c
@@ -143,7 +143,7 @@ pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
 
 void *
 pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
-	     ip_address_t * dst, u32 proto)
+	     ip_address_t * dst, u32 proto, u8 csum_offload)
 {
   if (ip_addr_version (src) != ip_addr_version (dst))
     {
@@ -156,7 +156,7 @@ pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
     {
     case IP4:
       return vlib_buffer_push_ip4 (vm, b, &ip_addr_v4 (src),
-				   &ip_addr_v4 (dst), proto);
+				   &ip_addr_v4 (dst), proto, csum_offload);
       break;
     case IP6:
       return vlib_buffer_push_ip6 (vm, b, &ip_addr_v6 (src),
@@ -167,11 +167,9 @@ pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
   return 0;
 }
 
-#define UDP_CHECKSUM_OFFLOAD 1
-
 void *
 pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
-		     ip_address_t * sip, ip_address_t * dip)
+		     ip_address_t * sip, ip_address_t * dip, u8 csum_offload)
 {
   u16 udpsum;
   udp_header_t *uh;
@@ -179,10 +177,9 @@ pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
 
   uh = pkt_push_udp (vm, b, sp, dp);
 
-  ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP);
-
-  if (UDP_CHECKSUM_OFFLOAD)
+  if (csum_offload)
     {
+      ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP, 1);
       b->flags |= VNET_BUFFER_F_OFFLOAD_UDP_CKSUM;
       vnet_buffer (b)->l3_hdr_offset = (u8 *) ih - b->data;
       vnet_buffer (b)->l4_hdr_offset = (u8 *) uh - b->data;
@@ -190,6 +187,7 @@ pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
     }
   else
     {
+      ih = pkt_push_ip (vm, b, sip, dip, IP_PROTOCOL_UDP, 0);
       udpsum = udp_checksum (uh, clib_net_to_host_u16 (uh->length), ih,
 			     ip_addr_version (sip));
       if (udpsum == (u16) ~ 0)
@@ -197,6 +195,8 @@ pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp,
 	  clib_warning ("Failed UDP checksum! Discarding");
 	  return 0;
 	}
+      /* clear flags used for csum since we're not offloading */
+      b->flags &= ~(VNET_BUFFER_F_IS_IP4 | VNET_BUFFER_F_IS_IP6);
       uh->checksum = udpsum;
     }
   return ih;
diff --git a/src/vnet/lisp-cp/packets.h b/src/vnet/lisp-cp/packets.h
index f6da3bf4b87..eb9871bf9c0 100644
--- a/src/vnet/lisp-cp/packets.h
+++ b/src/vnet/lisp-cp/packets.h
@@ -19,10 +19,11 @@
 #define IP_DF 0x4000		/* don't fragment */
 
 void *pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
-		   ip_address_t * dst, u32 proto);
+		   ip_address_t * dst, u32 proto, u8 csum_offload);
 
 void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp,
-			   u16 dp, ip_address_t * sip, ip_address_t * dip);
+			   u16 dp, ip_address_t * sip, ip_address_t * dip,
+			   u8 cksum_offload);
 
 void *pkt_push_ecm_hdr (vlib_buffer_t * b);