ConnextX-4 local build take the right headers

Signed-off-by: Hanoh Haim <[email protected]>

diff --git a/external_libs/ibverbs/include/infiniband/mlx5_hw.h b/external_libs/ibverbs/include/infiniband/mlx5_hw.h
index c772f33..2ac217d 100644 (file)
--- a/external_libs/ibverbs/include/infiniband/mlx5_hw.h
+++ b/external_libs/ibverbs/include/infiniband/mlx5_hw.h
@@ -31,7 +31,6 @@
 #define MLX5_CQ_DB_REQ_NOT                     (0 << 24)
 #define MLX5E_CQE_FORMAT_MASK 0xc
 
-
 enum mlx5_alloc_type { MXM_MLX5_ALLOC_TYPE_DUMMY };
 enum mlx5_rsc_type   { MXM_MLX5_RSC_TYPE_DUMMY };
 enum mlx5_db_method { MXM_MLX5_DB_TYPE_DUMMY };

diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py
index fa427fe..4376244 100755 (executable)
--- a/linux_dpdk/ws_main.py
+++ b/linux_dpdk/ws_main.py
@@ -586,11 +586,12 @@ includes_path =''' ../src/pal/linux_dpdk/
 ../src/dpdk/lib/librte_ring/
               ''';
 
+
+dpdk_includes_verb_path =''
+
 dpdk_includes_path =''' ../src/ 
                         ../src/pal/linux_dpdk/
                         ../src/pal/linux_dpdk/dpdk
-                        ../external_libs/ibverbs/include/
-
 ../src/dpdk/drivers/
 ../src/dpdk/drivers/net/
 ../src/dpdk/drivers/net/af_packet/
@@ -650,6 +651,8 @@ dpdk_includes_path =''' ../src/
 ''';
 
 
+
+
 DPDK_FLAGS=['-D_GNU_SOURCE', '-DPF_DRIVER', '-DX722_SUPPORT', '-DX722_A0_SUPPORT', '-DVF_DRIVER', '-DINTEGRATED_VF'];
 
 client_external_libs = [
@@ -808,10 +811,9 @@ def build_prog (bld, build_obj):
     if not build_obj.isRelease ():
         debug_file_list +=ef_src.file_list(top)
 
-
     bld.objects(
       features='c ',
-      includes = dpdk_includes_path,
+      includes = dpdk_includes_path+dpdk_includes_verb_path,
       
       cflags   = (build_obj.get_c_flags()+DPDK_FLAGS ),
       source   = bp_dpdk.file_list(top),
@@ -841,6 +843,7 @@ def post_build(bld):
         install_single_system(bld, exec_p, obj);
 
 def build(bld):
+    global dpdk_includes_verb_path;
     bld.add_pre_fun(pre_build)
     bld.add_post_fun(post_build);
 
@@ -850,6 +853,7 @@ def build(bld):
         bld.read_shlib(name='ibverbs')
     else:
         ibverbs_lib_path='external_libs/ibverbs/'
+        dpdk_includes_verb_path =' \n ../external_libs/ibverbs/include/ \n'
         bld.read_shlib( name='ibverbs' , paths=[top+ibverbs_lib_path] )
         check_ibverbs_deps(bld)
 

diff --git a/src/dpdk/drivers/net/mlx5/mlx5_rxtx.c b/src/dpdk/drivers/net/mlx5/mlx5_rxtx.c
index fce3381..c0bcfd0 100644 (file)
--- a/src/dpdk/drivers/net/mlx5/mlx5_rxtx.c
+++ b/src/dpdk/drivers/net/mlx5/mlx5_rxtx.c
@@ -908,7 +908,7 @@ mlx5_mpw_new(struct txq *txq, struct mlx5_mpw *mpw, uint32_t length)
        mpw->wqe->mpw.eseg.rsvd2 = 0;
        mpw->wqe->mpw.ctrl.data[0] = htonl((MLX5_OPC_MOD_MPW << 24) |
                                           (txq->wqe_ci << 8) |
-                                          MLX5_OPCODE_LSO_MPW);
+                                          MLX5_OPCODE_TSO);
        mpw->wqe->mpw.ctrl.data[2] = 0;
        mpw->wqe->mpw.ctrl.data[3] = 0;
        mpw->data.dseg[0] = &mpw->wqe->mpw.dseg[0];
@@ -1107,7 +1107,7 @@ mlx5_mpw_inline_new(struct txq *txq, struct mlx5_mpw *mpw, uint32_t length)
        mpw->wqe = &(*txq->wqes)[idx];
        mpw->wqe->mpw_inl.ctrl.data[0] = htonl((MLX5_OPC_MOD_MPW << 24) |
                                               (txq->wqe_ci << 8) |
-                                              MLX5_OPCODE_LSO_MPW);
+                                              MLX5_OPCODE_TSO);
        mpw->wqe->mpw_inl.ctrl.data[2] = 0;
        mpw->wqe->mpw_inl.ctrl.data[3] = 0;
        mpw->wqe->mpw_inl.eseg.mss = htons(length);