1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/dev_octeon/tx_node.c b/src/plugins/dev_octeon/tx_node.c
index 0907493814d..f42f18d989b 100644
--- a/src/plugins/dev_octeon/tx_node.c
+++ b/src/plugins/dev_octeon/tx_node.c
@@ -255,19 +255,18 @@ oct_tx_enq1 (vlib_main_t *vm, oct_tx_ctx_t *ctx, vlib_buffer_t *b,
       if (oflags & VNET_BUFFER_OFFLOAD_F_IP_CKSUM)
 	{
 	  d.hdr_w1.ol3type = NIX_SENDL3TYPE_IP4_CKSUM;
-	  d.hdr_w1.ol3ptr = vnet_buffer (b)->l3_hdr_offset;
-	  d.hdr_w1.ol4ptr =
-	    vnet_buffer (b)->l3_hdr_offset + sizeof (ip4_header_t);
+	  d.hdr_w1.ol3ptr = vnet_buffer (b)->l3_hdr_offset - b->current_data;
+	  d.hdr_w1.ol4ptr = d.hdr_w1.ol3ptr + sizeof (ip4_header_t);
 	}
       if (oflags & VNET_BUFFER_OFFLOAD_F_UDP_CKSUM)
 	{
 	  d.hdr_w1.ol4type = NIX_SENDL4TYPE_UDP_CKSUM;
-	  d.hdr_w1.ol4ptr = vnet_buffer (b)->l4_hdr_offset;
+	  d.hdr_w1.ol4ptr = vnet_buffer (b)->l4_hdr_offset - b->current_data;
 	}
       else if (oflags & VNET_BUFFER_OFFLOAD_F_TCP_CKSUM)
 	{
 	  d.hdr_w1.ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
-	  d.hdr_w1.ol4ptr = vnet_buffer (b)->l4_hdr_offset;
+	  d.hdr_w1.ol4ptr = vnet_buffer (b)->l4_hdr_offset - b->current_data;
 	}
     }
 
@@ -301,7 +300,8 @@ oct_tx_enq16 (vlib_main_t *vm, oct_tx_ctx_t *ctx, vnet_dev_tx_queue_t *txq,
 {
   u8 dwords_per_line[16], *dpl = dwords_per_line;
   u64 __attribute__ ((unused)) lmt_arg, ioaddr, n_lines;
-  u32 n_left, or_flags_16 = 0, n = 0;
+  u32 __attribute__ ((unused)) or_flags_16 = 0;
+  u32 n_left, n = 0;
   const u32 not_simple_flags =
     VLIB_BUFFER_NEXT_PRESENT | VNET_BUFFER_F_OFFLOAD;
   lmt_line_t *l = ctx->lmt_lines;