Integration changes with latest NWAL
authorTinku Mannan <tmannan@ti.com>
Mon, 21 Apr 2014 17:35:20 +0000 (13:35 -0400)
committerTinku Mannan <tmannan@ti.com>
Mon, 21 Apr 2014 17:35:20 +0000 (13:35 -0400)
18 files changed:
ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/build/Makefile
ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
ti/runtime/netapi/device/k2e/src/netapi_device.c
ti/runtime/netapi/device/k2h/src/netapi_device.c
ti/runtime/netapi/device/k2k/src/netapi_device.c
ti/runtime/netapi/device/k2l/src/netapi_device.c
ti/runtime/netapi/makefile_armv7
ti/runtime/netapi/netapi.h
ti/runtime/netapi/netcp_cfg.h
ti/runtime/netapi/src/netapi.c
ti/runtime/netapi/src/netapi_init.c
ti/runtime/netapi/src/netapi_loc.h
ti/runtime/netapi/src/netcp_cfg.c
ti/runtime/netapi/src/pktio.c
ti/runtime/netapi/test/build/Makefile
ti/runtime/netapi/test/net_test_bench.c
ti/runtime/netapi/test/net_test_loopback.c
ti/runtime/netapi/test/net_test_router.c

index b91ea56a08440d9790800acaf7015672e55ef91b..d43d9c149592f2f97ea4bf09c9757d2ab185ee53 100755 (executable)
@@ -23,26 +23,30 @@ PDK_ARMV7LIBDIR ?= ARMV7LIBDIR
 
 ifeq ($(DEVICE), k2h)
 CSL_DEVICE = -DDEVICE_K2H
+NWAL_LIB ?= nwalsa_$(DEVICE)
 PA_LIB   = pa
 endif
 ifeq  ($(DEVICE), k2k)
 CSL_DEVICE = -DDEVICE_K2K
+NWAL_LIB ?= nwalsa_$(DEVICE)
 PA_LIB   = pa
 endif
 ifeq ($(DEVICE), k2l)
-CSL_DEVICE = -DDEVICE_K2L
+CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
+NWAL_LIB ?= nwalsa_$(DEVICE)
 PA_LIB   = pa2
 endif
 ifeq ($(DEVICE), k2e)
-CSL_DEVICE = -DDEVICE_K2E
+CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
+NWAL_LIB ?= nwalsa_$(DEVICE)
 PA_LIB   = pa2
 endif
 
 #default if DEVICE not provided
 CSL_DEVICE ?= -DDEVICE_K2L
+NWAL_LIB ?= nwalsa_k2l)
 PA_LIB ?=-lpa2
 
-
 ifdef CROSS_TOOL_INSTALL_PATH
 ## Support backwards compatibility with KeyStone1 approach
  CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
@@ -77,7 +81,6 @@ CPPI_LIB=cppi
 HPLIB_LIB=hplib
 SA_LIB=sa
 PKTLIB_LIB=pktlib
-NWAL_LIB=nwalsa
 NETAPI_LIB=netapi
 IPSECMGR_SNOOP_LIB=ipsecmgr_snoop
 IPSECMGR_IPC_LIB=ipsecmgr_ipc
index c04b4f46ac6fc2bc4a74147e7d9e9e463188d121..d99ecbb3076069ec0d614686ac7b4647d02447ba 100755 (executable)
@@ -62,7 +62,6 @@
 
 #if defined(DEVICE_K2H)
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
@@ -72,7 +71,6 @@ char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>
@@ -82,7 +80,6 @@ char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 "/proc/device-tree/soc/pktdma@2004000/channels/netrx0/flow"};
 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>
@@ -92,7 +89,6 @@ char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 "/proc/device-tree/soc/pktdma@26186000/channels/netrx0/flow"};
 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>
@@ -103,7 +99,6 @@ char*  DTS_LOG_FILE_FLOW_ETHx[] = {
 
 #else /*Default */
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
@@ -807,7 +802,6 @@ int32_t main (int argc, char* argv[])
     netapi_handle = netapi_init(NETAPI_SYS_MASTER,
                                 &our_netapi_default_cfg,
                                 &hplibDeviceGblCfgParam,
-                                &nwalDeviceGblCfgParam,
                                 &netapiDeviceGblCfgParam);
     if(netapi_handle == NULL)
     {
index 313a2af5b578cee15d4ad5b57252885a7fc3806d..d183d6f1d15a4998dafe41daf7f7856af363a819 100755 (executable)
 /* NETPAPI initialization parameters */
 NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
 {
-    NWAL_CFG_NSS_GEN2,
+    1,
     CSL_NETCP_CFG_REGS,
     CSL_QMSS_CFG_BASE,
-    CSL_QMSS_DATA_BASE
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
 };
 
 
index d1ebf0111d706bc3919dc759391bab884f4f5ec6..f06e6534352ade3919b2ef7652a7d152e95cc8e4 100755 (executable)
 /* NETPAPI initialization parameters */
 NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
 {
-    NWAL_CFG_NSS_GEN1,
+    0,
     CSL_NETCP_CFG_REGS,
     CSL_QMSS_CFG_BASE,
-    CSL_QMSS_DATA_BASE
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+
 };
 
 
index d1ebf0111d706bc3919dc759391bab884f4f5ec6..f06e6534352ade3919b2ef7652a7d152e95cc8e4 100755 (executable)
 /* NETPAPI initialization parameters */
 NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
 {
-    NWAL_CFG_NSS_GEN1,
+    0,
     CSL_NETCP_CFG_REGS,
     CSL_QMSS_CFG_BASE,
-    CSL_QMSS_DATA_BASE
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+
 };
 
 
index bfdcdf44c551d3b3f0fec38eb2010287c43be0f6..4acdabd6aa90f6a3833e8c312126f6fcad905b9d 100755 (executable)
 /* NETPAPI initialization parameters */
 NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
 {
-    NWAL_CFG_NSS_GEN2,
+    1,
     CSL_NETCP_CFG_REGS,
     CSL_QMSS_CFG_BASE,
-    CSL_QMSS_DATA_BASE
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
 };
 
 
index b8e1955bcafe70a7f6013bb4ea9ea864e1480528..90aca518e724390c1a00ccc1d098ea5442e882ce 100755 (executable)
@@ -64,7 +64,7 @@ all: .executables install installbin
 .executables: lib tests examples
 
 # Make rule to create $(ARMV7LIBDIR)/libnetapi.a library
-lib: $(ARMV7LIBDIR)/libnetapi.a libnetapi.so
+lib: $(ARMV7LIBDIR)/libnetapi.a 
 
 $(ARMV7LIBDIR)/libnetapi.a:
        -@echo Building library...
index b6f28863058a8e904fc215872f1650a9c8457134..933382eb5e0cb040481ee1b6a0d221cd06be4281 100755 (executable)
  *  @param[in]  master  Can be either @ref NETAPI_SYS_MASTER or @ref NETAPI_NO_MASTER
  *  @param[in]  p_cfg   (master mode)  pointer to @ref NETAPI_CFG_T or NULL to use netapi default configuration.
  *  @param[in]  p_hplibDeviceCfg  (master mode)  HPLIB device specific configuration.
- *  @param[in]  p_nwalDeviceCfg   (master mode)  NWAL device specific configuration.
  *  @param[in]  p_netapiDeviceCfg (master mode)  NETAPI device specific configuration.
  *  @retval     Handle to the instance or NULL on error, @ref NETAPI_T
  *  @pre        none
  NETAPI_T netapi_init(int                master,
                      NETAPI_CFG_T *     p_cfg,
                      hplib_globalDeviceConfigParams_t *p_hplibDeviceCfg,
-                     nwalGlobalDeviceConfigParams_t   *p_nwalDeviceCfg,
                      NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapiDeviceCfg);
 
 /**
index a950add79186faeb3d87a27ab6e9e88ce21309ac..3bc9755a9f3433e252de8e883a926e1098402a64 100755 (executable)
@@ -499,10 +499,11 @@ typedef struct NETCP_CFG_FLOW_CONFIG_Tag
  */
 typedef struct NETCP_CFG_GLOB_DEVICE_PARAMS_Tag
 {
-    uint32_t    nssGen;             /**< Generation of Network Subsystem, 1.0 or 1.5*/
+    int         fNssGen2;           /**< 1: NSS Gen2 device */
     uint32_t    cslNetCpCfgRegs;    /**< Base address of NETCP configuration Registers */
     uint32_t    cslQmssCfgBase;     /**< Base address of QMSS configuration Registers */
     uint32_t    cslQmssDataBase;    /**< Base address of QMSS Data Registers */
+    uint32_t    cslNetCpCfgSaCfgRegs;/**< Base address of SA configuration Registers */
 
 } NETCP_CFG_GLOB_DEVICE_PARAMS_T;
 
index 5dc19db54e616ac499096d2ae662e252a7fc5a0a..7b9bf365282af7f5096564e5d9617e277fb7c897 100755 (executable)
@@ -124,7 +124,6 @@ Pktlib_HeapIfTable *netapi_getPktlibIfTable(void) {return &netapi_pktlib_ifTable
 NETAPI_T netapi_init(int                master,
                      NETAPI_CFG_T *     p_cfg,
                      hplib_globalDeviceConfigParams_t *p_hplibDeviceCfg,
-                     nwalGlobalDeviceConfigParams_t   *p_nwalDeviceCfg,
                      NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapiDeviceCfg)
 
 {
@@ -138,7 +137,8 @@ NETAPI_T netapi_init(int                master,
     NETAPI_HANDLE_T * p_master;
     if (!p) return NULL;
     p->master = master;
-
+    p->fNssGen2 = p_netapiDeviceCfg->fNssGen2;
+    
     /*  SYS_MASTER: The following segment should be done 1 Time per system boot by global master process's main core/thread */
     if (master == NETAPI_SYS_MASTER)
     {
@@ -149,8 +149,6 @@ NETAPI_T netapi_init(int                master,
             printf("netapi_init: hplib_shmCreate failure\n");
             return NULL;
         }
-        else
-             printf("netapi_init: hplib_shmCreate sucess\n");
 
         if (hplib_shmAddEntry(pBase, sizeof(NETAPI_SHM_T), NETAPI_ENTRY) !=
             hplib_OK)
@@ -255,7 +253,6 @@ NETAPI_T netapi_init(int                master,
         err = netapip_systemInit(p,
                                  p_hplibDeviceCfg,
                                  p_netapiDeviceCfg,
-                                 p_nwalDeviceCfg,
                                  TRUE);
         if (err<0) 
         {
@@ -270,7 +267,6 @@ NETAPI_T netapi_init(int                master,
         err = netapip_systemInit(p,
                                  p_hplibDeviceCfg,
                                  p_netapiDeviceCfg,
-                                 p_nwalDeviceCfg,
                                  FALSE);
         if (err<0)
         {
@@ -343,7 +339,7 @@ void netapi_shutdown(NETAPI_T h)
     hplib_VirtMemPoolheader_T *poolHdr;
 
     netapi_Log("netapi: WARNING shutdown may not be fully implemented\n");
-    if (p->master ==NETAPI_SYS_MASTER)
+    if (p->master == NETAPI_SYS_MASTER)
     {
         /* Un-configure rules for execption packet handling */
         netapi_netcpCfgExceptions(p,
@@ -373,7 +369,7 @@ void netapi_shutdown(NETAPI_T h)
         printf("netapi_shutdown: calling hplib_shmDelete\n");
         hplib_shmDelete();
     }
-    else if (p->master==NETAPI_PROC_MASTER)
+    else if (p->master == NETAPI_PROC_MASTER)
     {
         //we can zap these because they are local to our process
         netapi_closeHeap(h, p->netcp_control_rx_heap);
@@ -405,6 +401,7 @@ void netapi_shutdown(NETAPI_T h)
 #endif
 
     free(p);
+    printf("netapi_shutdown: complete\n");
     return;
 }
 
index 9028f257aa3b595e5f9f48b7e817e4f93b64ba9e..3af715ff85f4eae3699d3dbeaca04fbd981b6edf 100755 (executable)
@@ -99,6 +99,9 @@ uint8_t *QMemGlobDescRam = 0;
 uint8_t *cppiMemPaSaLinkBuf = 0;
 uint8_t *cppiMemSaPaLinkBuf = 0;
 
+
+
+#if 0
 /*****************************************************************************
  * Local Resource allocated at each Core
  *****************************************************************************/
@@ -109,6 +112,12 @@ uint8_t *cppiMemTxPktLinkBuf = NULL;
 uint8_t *cppiMemRxCtlLinkBuf = NULL;
 uint8_t *cppiMemTxCtlLinkBuf = NULL;
 
+#endif
+
+
+
+NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapi_device_cfg_local;
+
 
 /********************************************************************
  * FUNCTION PURPOSE:  Internal NETAPI function to setup the QM memory region
@@ -247,8 +256,7 @@ int netapip_initNwal(
     int region2use,
     Pktlib_HeapIfTable * p_table,
     NETAPI_NWAL_GLOBAL_CONTEXT_T * p_nwal_context,
-    NETAPI_CFG_T*p_cfg,
-    nwalGlobalDeviceConfigParams_t *p_nwal_device_cfg)
+    NETAPI_CFG_T*p_cfg)
 {
     nwalSizeInfo_t  nwalSizeInfo;
     nwal_RetValue   nwalRetVal;
@@ -348,25 +356,18 @@ int netapip_initNwal(
     nwalGlobCfg.saFwActive = nwal_FALSE;
 
 
-    if(p_nwal_device_cfg)
-    {
-        nwalGlobCfg.pDeviceCfg = p_nwal_device_cfg;
-    }
-    else
-    {
-        netapi_Log ("netapip_initNwal: nwal device configuration not provided %d\n");
-        return nwal_FALSE;
-    }
-
     /* Update nwal cfg with virtual PA and SA addresses */
-    nwalGlobCfg.pDeviceCfg->cslNetCpCfgSaCfgRegs = netapi_VM_VirtAddr->passCfgVaddr +
-                                 (p_nwal_device_cfg->cslNetCpCfgSaCfgRegs -
-                                 p_nwal_device_cfg->cslNetCpCfgRegs);
 
-    nwalGlobCfg.pDeviceCfg->cslNetCpCfgRegs = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr;
+
+    nwalGlobCfg.paVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr;
+    nwalGlobCfg.saVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr +
+                                    p_netapi_device_cfg_local->cslNetCpCfgSaCfgRegs -
+                                    p_netapi_device_cfg_local->cslNetCpCfgRegs;
+        ;
 
     nwalGlobCfg.rxDefPktQ = QMSS_PARAM_NOT_SPECIFIED;
 
+
     /* Get the Buffer Requirement from NWAL */
     memset(&nwalSizeInfo,0,sizeof(nwalSizeInfo));
     nwalSizeInfo.nMaxMacAddress = TUNE_NETAPI_MAX_NUM_MAC;
@@ -612,7 +613,11 @@ int netapip_initTimer(void)
 
 static uint8_t* netapip_sharedMemoryMalloc(uint32_t size)
 {
-return  (uint8_t *)hplib_vmMemAlloc(size +pnetapiShm->netapi_global.cfg.def_heap_extra_size , 128, 0); 
+    //printf("netapip_sharedMemoryMalloc called for size: %d\n", size);
+    return  (uint8_t *)hplib_vmMemAlloc(size + 
+                                    pnetapiShm->netapi_global.cfg.def_heap_extra_size ,
+                                    128,
+                                    0); 
 }
 
 /********************************************************************
@@ -623,6 +628,8 @@ return  (uint8_t *)hplib_vmMemAlloc(size +pnetapiShm->netapi_global.cfg.def_heap
 static void netapip_sharedMemoryFree(uint8_t* ptr, uint32_t size)
 {
     /* Do Nothing. */
+    //printf("netapip_sharedMemoryMalloc called for size: %d\n", size);
+    //hplib_vmMemFree(ptr, size + pnetapiShm->netapi_global.cfg.def_heap_extra_size,0);
     netapi_Log("netapi Unexpected.  need to provide a free () for some reason!! \n");
     return;
 }
@@ -660,9 +667,16 @@ void netapip_cleanupAtStart(void)
 int netapip_systemInit(NETAPI_HANDLE_T * handle,
                        hplib_globalDeviceConfigParams_t *p_hplib_device_cfg,
                        NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapi_device_cfg,
-                       nwalGlobalDeviceConfigParams_t   *p_nwal_device_cfg,
                        Bool global_master_process)
 {
+
+    if(p_netapi_device_cfg)
+        p_netapi_device_cfg_local = p_netapi_device_cfg;
+    else
+    {
+        netapi_Log("netapip_systemInit: - netapi device cfg required\n");
+        return -1;
+    }
     int32_t             result;
     Pktlib_HeapHandle   sharedHeapHandle;
     Pktlib_HeapHandle   controlRxHeapHandle,controlTxHeapHandle;    
@@ -902,8 +916,8 @@ netapi_Log("netapip_systemInit: returned from netapip_qmSetupMemRegion\n");
     result = netapip_initNwal(TUNE_NETAPI_QM_GLOBAL_REGION,
                               &netapi_pktlib_ifTable,
                               &pnetapiShm->netapi_global.nwal_context,
-                              &pnetapiShm->netapi_global.cfg,
-                              p_nwal_device_cfg);
+                              &pnetapiShm->netapi_global.cfg);
+
     if (result<0) {netapi_Log("netapi  init_nwal() failed\n"); return -1; }
  netapi_Log("netapip_systemInit: returned from netapip_initNwal\n");
     /* start NWAL */
index 1cad2e8c0763a4ab5051fba608d8852a2e94a024..09f5f34a3f2c6e92a065edb05474227a41399694 100755 (executable)
@@ -230,7 +230,7 @@ typedef struct NETAPI_HANDLE_Tag
     /* thread cookie */
     void*                      cookie;  /*set by calling thread */
     HPLIB_SPINLOCK_IF_T        spinLock;
-    uint32_t                   nssGen;
+    uint32_t                   fNssGen2;
 } NETAPI_HANDLE_T;
 
 typedef struct NETAPI_SHM_Tag
@@ -252,9 +252,7 @@ int netapip_startQm(void);
 int netapip_initNwal(int region2use,
                      Pktlib_HeapIfTable * p_table,
                      NETAPI_NWAL_GLOBAL_CONTEXT_T * p_nwal_context,
-                     NETAPI_CFG_T *p_cfg,
-                     nwalGlobalDeviceConfigParams_t *p_nwal_device_cfg);
-
+                     NETAPI_CFG_T *p_cfg);
 int netapip_startNwal(Pktlib_HeapHandle             pkt_heap,
                       Pktlib_HeapHandle             cmd_heapRx,
                       Pktlib_HeapHandle             cmd_heapTx,
@@ -402,6 +400,7 @@ void netapip_netcpCfgBuildRoute(NETCP_CFG_ROUTE_T * p_route,
 
 //database utilities
 void netapip_netcpCfgDeleteSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,int sa_slot);
+
 void netapip_netcpCfgInsertSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           int sa_slot,  //we 'reserved it already'
                           int dir,
@@ -410,7 +409,10 @@ void netapip_netcpCfgInsertSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           void * temp2,
                           void * handle_inflow,
                           void * handle_sideband,
-                          nwalTxDmPSCmdInfo_t *dmPSCmdInfo;);
+                          nwalTxDmPSCmdInfo_t *dmPSCmdInfo,
+                          uint32_t swInfo0,
+                          uint32_t swInfo1,
+                          void* user_data);
 void *netapip_netcpCfgGetSaHandles( NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
                           int sa_slot, void ** p_sideband);
 void* netapip_netcpCfgGetMacHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,int iface_no);
@@ -430,7 +432,6 @@ int netapip_netcpCfgGetSaInflowInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
 int netapip_systemInit(NETAPI_HANDLE_T * handle,
                        hplib_globalDeviceConfigParams_t *p_hplib_device_cfg,
                        NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapi_device_cfg,
-                       nwalGlobalDeviceConfigParams_t   *p_nwal_device_cfg,
                        Bool global_master_process);
 
 
index 5c58d7896bb89ae307fde0dc1f3d5f2598f89078..ba314884217fe6b45ca124022163dd11109a3ea3 100755 (executable)
@@ -762,7 +762,7 @@ void netapi_netcpCfgReqStats(NETAPI_T  h,
         netapip_freeTransInfo(pTransInfo);
         return;
     }
-    if((n->nssGen == NWAL_CFG_NSS_GEN2) && (cb))
+    if((n->fNssGen2) && (cb))
     {
         cb(h, &netcp_stats);
     }
index b843d069bc1da6880fb768490e093181ac4d41c0..f5a3f8fadc55d6f93b97bafd216c7eb64fe6caa8 100755 (executable)
@@ -99,11 +99,10 @@ static int netapip_pktioSendL4CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
     uint32_t swInfo0, swInfo1;
 
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
-
+    //printf("netapip_pktioSendL4CkSumCryptPort\n");
     if (netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context, tunnel_id, &swInfo0, &swInfo1))
     {
-        nwal_mCmdSetL4CkSumCrypPort(p->nwalInstanceHandle,
-                                    pkt,
+        nwal_mCmdSetL4CkSumCrypPort(pkt,
                                     &p->tx_psCmdInfo,
                                     pTxPktInfo->l4OffBytes, 
                                     pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
@@ -148,12 +147,13 @@ static int netapip_pktioSendCryptPort(struct PKTIO_HANDLE_tag * pp,
     Cppi_HostDesc*          pPloadDesc;
     uint32_t swInfo0, swInfo1;
 
+    printf("netapip_pktioSendCryptPort\n");
+
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
 
     if (netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context, tunnel_id, &swInfo0, &swInfo1))
     {
-        nwal_mCmdSetCrypPort(p->nwalInstanceHandle,
-                             pkt,
+        nwal_mCmdSetCrypPort(pkt,
                              &p->tx_psCmdInfo,
                               pTxPktInfo->saOffBytes,
                               pTxPktInfo->saPayloadLen,
@@ -198,16 +198,17 @@ static int netapip_pktioSendL3CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
 
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
 
+    printf("netapip_pktioSendL3CkSumCryptPort\n");
+
     if (netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context, tunnel_id, &swInfo0, &swInfo1))
     {
-        nwal_mCmdSetL3CkSumCrypPort(p->nwalInstanceHandle,
-                             pkt,
-                             &p->tx_psCmdInfo,
-                              pTxPktInfo->saOffBytes,
-                              pTxPktInfo->saPayloadLen,
-                              swInfo0,
-                              swInfo1,
-                              pTxPktInfo->enetPort);
+        nwal_mCmdSetL3CkSumCrypPort(pkt,
+                                    &p->tx_psCmdInfo,
+                                    pTxPktInfo->saOffBytes,
+                                    pTxPktInfo->saPayloadLen,
+                                    swInfo0,
+                                    swInfo1,
+                                    pTxPktInfo->enetPort);
 
         pPloadDesc = Pktlib_getDescFromPacket(pkt);
         pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
@@ -250,11 +251,11 @@ static int netapip_pktioSendL4CkSumAHCryptPort(struct PKTIO_HANDLE_tag * pp,
     uint32_t swInfo0, swInfo1;
 
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
+    printf("netapip_pktioSendL4CkSumAHCryptPort\n");
 
     if (netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context, tunnel_id, &swInfo0, &swInfo1))
     {
-        nwal_mCmdSetL4CkSumAHCrypPort(p->nwalInstanceHandle,
-                                pkt,
+        nwal_mCmdSetL4CkSumAHCrypPort(pkt,
                                 &p->tx_psCmdInfo,
                                 pTxPktInfo->l4OffBytes, 
                                 pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
@@ -302,20 +303,21 @@ static int netapip_pktioSendAHCryptPort(struct PKTIO_HANDLE_tag * pp,
     Cppi_HostDesc*          pPloadDesc;
     uint32_t swInfo0, swInfo1;
 
+    printf("netapip_pktioSendAHCryptPort\n");
+
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
 
     if (netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context, tunnel_id, &swInfo0, &swInfo1))
     {
-        nwal_mCmdSetAHCrypPort(p->nwalInstanceHandle,
-                               pkt,
-                                &p->tx_psCmdInfo,
-                                pTxPktInfo->saOffBytes, 
-                                pTxPktInfo->saPayloadLen, 
-                                swInfo0, 
-                                swInfo1,
-                                pTxPktInfo->saAhIcvOffBytes,
-                                pTxPktInfo->saAhMacSize,
-                                pTxPktInfo->enetPort);
+        nwal_mCmdSetAHCrypPort(pkt,
+                               &p->tx_psCmdInfo,
+                               pTxPktInfo->saOffBytes, 
+                               pTxPktInfo->saPayloadLen, 
+                               swInfo0, 
+                               swInfo1,
+                               pTxPktInfo->saAhIcvOffBytes,
+                               pTxPktInfo->saAhMacSize,
+                               pTxPktInfo->enetPort);
         
         pPloadDesc = Pktlib_getDescFromPacket(pkt);
         pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
@@ -352,8 +354,9 @@ static int netapip_pktioSendL4CkSumPort(struct PKTIO_HANDLE_tag * pp,
     PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
     nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
     Cppi_HostDesc*          pPloadDesc;
-    nwal_mCmdSetL4CkSumPort(p->nwalInstanceHandle,
-                            pkt,
+
+        printf("netapip_pktioSendL4CkSumPort\n");
+    nwal_mCmdSetL4CkSumPort(pkt,
                             &p->tx_psCmdInfo,
                             pTxPktInfo->l4OffBytes,
                             pTxPktInfo->l4HdrLen + pTxPktInfo->ploadLen,
@@ -365,6 +368,8 @@ static int netapip_pktioSendL4CkSumPort(struct PKTIO_HANDLE_tag * pp,
     Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
                                   pPloadDesc,
                                   NWAL_DESC_SIZE);
+    printf("netapip_pktioSendL4CkSumPort: txQueue: %d\n",
+        p->tx_psCmdInfo.txQueue);
 }
 
 
@@ -383,10 +388,13 @@ static int netapip_pktioSendPort(struct PKTIO_HANDLE_tag * pp,
     PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
     nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
     Cppi_HostDesc*          pPloadDesc;
-    nwal_mCmdSetPort(p->nwalInstanceHandle,
-                             pkt,
-                                &p->tx_psCmdInfo,
-                                 pTxPktInfo->enetPort);
+    
+    printf("netapip_pktioSendPort\n");
+
+
+    nwal_mCmdSetPort(pkt,
+                     &p->tx_psCmdInfo,
+                     pTxPktInfo->enetPort);
     pPloadDesc = Pktlib_getDescFromPacket(pkt);
     pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
 
@@ -435,6 +443,163 @@ static int netapip_pktioSendNwal(struct PKTIO_HANDLE_tag * pp,
     return 1;
 }
 
+
+static void  PKTIO_dump_buf_32bit
+(
+    uint8_t*                      buf,
+    uint32_t                      buf_length
+)
+{
+    uint8_t                       count = 0;
+    uint16_t                      dump_size;
+    uint32_t*                     tmp_buf;
+    uint8_t                       row_count;
+
+    dump_size = buf_length/4 ;
+
+    tmp_buf = (uint32_t *)(buf);
+
+    printf("pktio *:  - 32 bit word hex Length: %d Start \n",buf_length);
+    do
+    {
+        row_count = (dump_size - count);
+
+        if(row_count == 0)
+        {
+            break;
+        }
+
+        if(row_count > 4)
+        {
+            row_count = 4;
+        }
+
+        switch (row_count)
+        {
+            case 4:
+            {
+                printf("pktio *:%02d : %08x    %08x    %08x    %08x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2],tmp_buf[3]);
+                break;
+            }
+            case 3:
+            {
+                printf("pktio *: %02d : %08x    %08x    %08x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2]);
+                break;
+            }
+
+            case 2:
+            {
+                printf("pktio *: %02d : %08x    %08x \n",
+                      count,tmp_buf[0],tmp_buf[1]);
+                break;
+            }
+
+            case 1:
+            {
+                printf("pktio *: %02d : %08x \n",
+                      count,tmp_buf[0]);
+                break;
+            }
+
+            default:
+            {
+                /* Should never reach here */
+                printf("pktio *: Internal Error in nwal_dump_buf_32bit().Row Count: %d \n",
+                    row_count);
+                return;
+            }
+        }
+
+        tmp_buf = tmp_buf + row_count;
+        count = count +  row_count;
+
+    }while(count < dump_size);
+
+    printf("NWAL *:  - Byte hex Dump End \n");
+
+}
+
+
+static void  PKTIO_dump_buf
+(
+    uint8_t*                      buf,
+    uint32_t                      buf_length
+)
+{
+    uint8_t                       count = 0;
+    uint16_t                      dump_size;
+    uint8_t*                     tmp_buf;
+    uint8_t                       row_count;
+
+
+    dump_size = buf_length ;
+
+    tmp_buf = (uint8_t *)(buf);
+
+    printf("PKTIO *:  - 8 bit word hex Length: %d Start \n",buf_length);
+    do
+    {
+        row_count = (dump_size - count);
+
+        if(row_count == 0)
+        {
+            break;
+        }
+
+        if(row_count > 4)
+        {
+            row_count = 4;
+        }
+
+        switch (row_count)
+        {
+            case 4:
+            {
+                printf("PKTIO *:%02d : %02x    %02x    %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2],tmp_buf[3]);
+                break;
+            }
+            case 3:
+            {
+                printf("PKTIO *: %02d : %02x    %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2]);
+                break;
+            }
+
+            case 2:
+            {
+                printf("PKTIO *: %02d : %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1]);
+                break;
+            }
+
+            case 1:
+            {
+                printf("PKTIO *: %02d : %02x \n",
+                      count,tmp_buf[0]);
+                break;
+            }
+
+            default:
+            {
+                /* Should never reach here */
+                printf("PKTIO *: Internal Error in PKTIO_dump_buf().Row Count: %d \n",
+                    row_count);
+                return;
+            }
+        }
+
+        tmp_buf = tmp_buf + row_count;
+        count = count +  row_count;
+
+    }while(count < dump_size);
+
+    printf("PKTIO *:  - Byte hex Dump End \n");
+
+}
+
 /********************************************************************
  * FUNCTION PURPOSE: Send packet to SA via NWAL
  ********************************************************************
@@ -453,6 +618,7 @@ static int netapip_pktioSendSb(struct PKTIO_HANDLE_tag * pp,
     Cppi_HostDesc*          pPloadDesc;
     PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
     nwalLocCxtInfo_t      info;
+    void* virtAddr = NULL;
     nwalDmTxPayloadInfo_t *pPktInfoSB =  m->u.tx_sb_meta;
 
     NETCP_CFG_SA_T tunnel_id = (NETCP_CFG_SA_T) m->sa_handle;
@@ -482,6 +648,24 @@ static int netapip_pktioSendSb(struct PKTIO_HANDLE_tag * pp,
             pPktInfoSB->aadSize,
             pPktInfoSB->pAad);
         pPloadDesc = Pktlib_getDescFromPacket(pkt);
+
+#if 0
+        printf("netapip_pktioSendSb: dumping descriptor begin\n");
+        PKTIO_dump_buf_32bit(pPloadDesc, 128);
+        printf("netapip_pktioSendSb: dumping descriptor end\n");
+        
+                virtAddr= hplib_mVMPhyToVirt(pPloadDesc->softwareInfo1);
+
+                printf("phy Addr: 0x%x\n", pPloadDesc->softwareInfo1);
+                printf("virtAddr: 0x%x\n", virtAddr);
+
+                printf("netapip_pktioSendSb: dumping security context begin\n");
+                PKTIO_dump_buf((uint8_t*)virtAddr, 128);
+                PKTIO_dump_buf((uint8_t*)virtAddr+128, 128);
+                printf("netapip_pktioSendSb: dumping security context end\n");
+#endif
+
+
         pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
 
         Qmss_queuePushDescSizeRaw(dmPSCmdInfo->txQueue,
index 5cfb908ad2494fc89f75e95f06969e4a510c504d..69b65c14af4f344806779ae2a01db98f5032a646 100755 (executable)
@@ -47,28 +47,33 @@ HP_LIB = -lhplib
 SA_LIB = -lsa
 #
 #with security enabled..
-NWAL_LIB = -lnwalsa
+
 
 ifeq ($(DEVICE), k2h)
 CSL_DEVICE = -DDEVICE_K2H
 PA_LIB   = -lpa
+NWAL_LIB = -lnwalsa_$(DEVICE)
 endif
 ifeq  ($(DEVICE), k2k)
 CSL_DEVICE = -DDEVICE_K2K
 PA_LIB   = -lpa
+NWAL_LIB = -lnwalsa_$(DEVICE)
 endif
 ifeq ($(DEVICE), k2l)
-CSL_DEVICE = -DDEVICE_K2L
+CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
 PA_LIB   = -lpa2
+NWAL_LIB = -lnwalsa_$(DEVICE)
 endif
 ifeq ($(DEVICE), k2e)
-CSL_DEVICE = -DDEVICE_K2E
+CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
 PA_LIB   = -lpa2
+NWAL_LIB = -lnwalsa_$(DEVICE)
 endif
 
 #default if DEVICE not provided
 CSL_DEVICE ?= -DDEVICE_K2L
 PA_LIB ?=-lpa2
+NWAL_LIB ?= -lnwalsa_k2l
 
 ifeq ($(USEDYNAMIC_LIB), yes)
 #presuming ARM executable would depend on dynamic library dependency
index 190db3db7060b8503238ac6752eacdef70d7a8ba..2473c4213d88bfe4d6910fe5bdb19b3ef7b7190e 100755 (executable)
 
 #if defined(DEVICE_K2H)
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>
 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>
 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>
 #else /*Default */
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
@@ -333,7 +328,6 @@ int main(int argc, char **argv)
     netapi_handle = netapi_init(NETAPI_SYS_MASTER,
                                 &our_netapi_default_cfg,
                                 &hplibDeviceGblCfgParam,
-                                &nwalDeviceGblCfgParam,
                                 &netapiDeviceGblCfgParam);
     if (netapi_handle == NULL)
     {
index 285859f7dee3ee103ac4de79d0533bb0cf0a5098..ccc15f034189809da9f92737d56ee4185d9983b0 100755 (executable)
 
 #if defined(DEVICE_K2H)
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>
 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>
 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>
 #else /*Default */
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
@@ -1019,7 +1014,6 @@ void slow_path_thread(uint32_t index)
     worker_nh[thread_num] = netapi_init(NETAPI_CORE_MASTER,
                                         NULL,
                                         &hplibDeviceGblCfgParam,
-                                        &nwalDeviceGblCfgParam,
                                         &netapiDeviceGblCfgParam);
 
     if (worker_nh[thread_num] == NULL)
@@ -1078,7 +1072,6 @@ void fast_path_thread(uint32_t index)
     worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
                                       NULL,
                                       &hplibDeviceGblCfgParam,
-                                      &nwalDeviceGblCfgParam,
                                       &netapiDeviceGblCfgParam);
     if (worker_nh[thread_num] == NULL)
     {
@@ -1195,7 +1188,6 @@ int main(int argc, char **argv)
     netapi_handle = netapi_init(NETAPI_SYS_MASTER,
                                 &our_netapi_default_cfg,
                                 &hplibDeviceGblCfgParam,
-                                &nwalDeviceGblCfgParam,
                                 &netapiDeviceGblCfgParam);
 
     if (netapi_handle == NULL)
@@ -1262,32 +1254,7 @@ int main(int argc, char **argv)
     printf("\n net_test_loopback running ....\n");
     printf("\n Enter 's' for stats or 'q'to quit net_test_loopback app, or 'h' for help\n");
 
-#if 0
-    for (i=0;i<10;i++)
-    {
-        void* ptr;
-        ptr = hplib_vmMemAlloc(127,128,0);
-        printf("*************** Debug: MemPtr with size 127: 0x%x\n", ptr);
-    }
-    for (i=0;i<10;i++)
-    {
-        void* ptr;
-        ptr = hplib_vmMemAlloc(128,128,0);
-        printf("*************** Debug: MemPtr with size 128: 0x%x\n", ptr);
-    }
-    for (i=0;i<10;i++)
-    {
-        void* ptr;
-        ptr = hplib_vmMemAlloc(1,128,0);
-        printf("*************** Debug: MemPtr with size 1: 0x%x\n", ptr);
-    }
-        for (i=0;i<10;i++)
-    {
-        void* ptr;
-        ptr = hplib_vmMemAlloc(128*4,128,0);
-        printf("*************** Debug: MemPtr with size 128 * 4: 0x%x\n", ptr);
-    }
-#endif
+
     char c;
         //this thread of execution (main) now just waits on user input
         for(;;)
index 7dbe5d04e124c179d24d35562a1cdbf6134a29c3..f1202ee78f57bf90c517acd738a11a396336efb3 100755 (executable)
@@ -52,25 +52,21 @@ extern int QUIT;
 
 #if defined(DEVICE_K2H)
 #include <ti/runtime/hplib/device/k2h/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2h/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2h/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2h/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2h/src/cppi_device.c>
 #elif defined (DEVICE_K2K)
 #include <ti/runtime/hplib/device/k2k/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2k/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2k/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2k/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2k/src/cppi_device.c>
 #elif defined (DEVICE_K2L)
 #include <ti/runtime/hplib/device/k2l/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2l/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2l/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2l/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2l/src/cppi_device.c>
 #elif defined (DEVICE_K2E)
 #include <ti/runtime/hplib/device/k2e/src/hplib_device.c>
-#include <ti/drv/nwal/device/k2e/src/nwal_device.c>
 #include <ti/runtime/netapi/device/k2e/src/netapi_device.c>
 #include <ti/drv/qmss/device/k2e/src/qmss_device.c>
 #include <ti/drv/cppi/device/k2e/src/cppi_device.c>
@@ -357,7 +353,6 @@ void slow_path_thread(uint32_t index)
     worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
                                       NULL,
                                       &hplibDeviceGblCfgParam,
-                                      &nwalDeviceGblCfgParam,
                                       &netapiDeviceGblCfgParam);
     if (worker_nh[thread_num] == NULL)
     {
@@ -423,7 +418,6 @@ void fast_path_thread(uint32_t index)
     worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
                                       NULL,
                                       &hplibDeviceGblCfgParam,
-                                      &nwalDeviceGblCfgParam,
                                       &netapiDeviceGblCfgParam);
     if (worker_nh[thread_num] == NULL)
     {
@@ -525,7 +519,6 @@ int main(int argc, char **argv)
     netapi_handle = netapi_init(NETAPI_SYS_MASTER,
                                 &our_netapi_default_cfg,
                                 &hplibDeviceGblCfgParam,
-                                &nwalDeviceGblCfgParam,
                                 &netapiDeviceGblCfgParam);
 
     if (netapi_handle == NULL)