X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fpipeline%2Frte_swx_pipeline.c;h=8c4670e11172283fdc76b50dbcebf652e7510646;hb=1e1bfd078e581c155cd5a2b5c9191d87714dfc93;hp=f404ff1596372585223b374184fa2803b3ad36a6;hpb=eb3e2c11830e4d75ff5dff20cfa70599a1613f71;p=dpdk.git

diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index f404ff1596..8c4670e111 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4,7 +4,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <dlfcn.h>
 
 #include <rte_swx_port_ethdev.h>
@@ -2887,8 +2886,8 @@ instr_alu_ckadd_translate(struct rte_swx_pipeline *p,
 	CHECK(n_tokens == 3, EINVAL);
 
 	fdst = header_field_parse(p, dst, &hdst);
-	CHECK(fdst && (fdst->n_bits == 16), EINVAL);
-	CHECK(!fdst->var_size, EINVAL);
+	CHECK(fdst, EINVAL);
+	CHECK(!fdst->var_size && (fdst->n_bits == 16), EINVAL);
 
 	/* CKADD_FIELD. */
 	fsrc = header_field_parse(p, src, &hsrc);
@@ -2908,17 +2907,16 @@ instr_alu_ckadd_translate(struct rte_swx_pipeline *p,
 	/* CKADD_STRUCT, CKADD_STRUCT20. */
 	hsrc = header_parse(p, src);
 	CHECK(hsrc, EINVAL);
-	CHECK(!hsrc->st->var_size, EINVAL);
 
 	instr->type = INSTR_ALU_CKADD_STRUCT;
-	if ((hsrc->st->n_bits / 8) == 20)
+	if (!hsrc->st->var_size && ((hsrc->st->n_bits / 8) == 20))
 		instr->type = INSTR_ALU_CKADD_STRUCT20;
 
 	instr->alu.dst.struct_id = (uint8_t)hdst->struct_id;
 	instr->alu.dst.n_bits = fdst->n_bits;
 	instr->alu.dst.offset = fdst->offset / 8;
 	instr->alu.src.struct_id = (uint8_t)hsrc->struct_id;
-	instr->alu.src.n_bits = hsrc->st->n_bits;
+	instr->alu.src.n_bits = (uint8_t)hsrc->id; /* The src header ID is stored here. */
 	instr->alu.src.offset = 0; /* Unused. */
 	return 0;
 }
@@ -2938,8 +2936,8 @@ instr_alu_cksub_translate(struct rte_swx_pipeline *p,
 	CHECK(n_tokens == 3, EINVAL);
 
 	fdst = header_field_parse(p, dst, &hdst);
-	CHECK(fdst && (fdst->n_bits == 16), EINVAL);
-	CHECK(!fdst->var_size, EINVAL);
+	CHECK(fdst, EINVAL);
+	CHECK(!fdst->var_size && (fdst->n_bits == 16), EINVAL);
 
 	fsrc = header_field_parse(p, src, &hsrc);
 	CHECK(fsrc, EINVAL);