Merge branch 'master' of gtgit01.gt.design.ti.com:git/projects/netapi

130 files changed, 34617 insertions, 0 deletions

diff --git a/COPYING.txt b/COPYING.txt
new file mode 100755
index 0000000..9de3325
--- /dev/null
+++ b/COPYING.txt
@@ -0,0 +1,61 @@
+/*  ===========================================================================

+ *  Copyright (c) Texas Instruments Incorporated 2010-2013

+ * 

+ *  Redistribution and use in source and binary forms, with or without 

+ *  modification, are permitted provided that the following conditions 

+ *  are met:

+ *

+ *    Redistributions of source code must retain the above copyright 

+ *    notice, this list of conditions and the following disclaimer.

+ *

+ *    Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the 

+ *    documentation and/or other materials provided with the   

+ *    distribution.

+ *

+ *    Neither the name of Texas Instruments Incorporated nor the names of

+ *    its contributors may be used to endorse or promote products derived

+ *    from this software without specific prior written permission.

+ *

+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 

+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 

+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 

+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 

+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 

+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 

+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ */

+ 

+ NETAPI Test Source Code: trie.c, trie.h

+ Copyright (c) 2005, Simon Howard

+ All rights reserved.

+ Redistribution and use in source and binary forms, with or without

+ modification, are permitted provided that the following conditions

+ are met:

+ Redistributions of source code must retain the above copyright

+ notice, this list of conditions and the following disclaimer.

+ Redistributions in binary form must reproduce the above copyright

+ notice, this list of conditions and the following disclaimer in

+ the documentation and/or other materials provided with the

+ distribution.

+ Neither the name of the C Algorithms project nor the names of its

+ contributors may be used to endorse or promote products derived

+ from this software without specific prior written permission.

+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER

+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN

+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ POSSIBILITY OF SUCH DAMAGE.

+ ALSO: TI modifications made to support binary data keys

+ Copyright (c) Texas Instruments Incorporated 2010-2011

diff --git a/ti/runtime/netapi/OLD/qmsim.c b/ti/runtime/netapi/OLD/qmsim.c
new file mode 100755
index 0000000..7791c38
--- /dev/null
+++ b/ti/runtime/netapi/OLD/qmsim.c
@@ -0,0 +1,113 @@
+/*******************************************************************

+* FILE:  qmsim.c

+ * 

+ * DESCRIPTION:  netapi user space transport

+ *               library  desktop simulator for queues.

+ *              (test code, not operational) 

+ * 

+ * REVISION HISTORY:  rev 0.0.1 

+ *

+ *  Copyright (c) Texas Instruments Incorporated 2010-2011

+ * 

+ *  Redistribution and use in source and binary forms, with or without 

+ *  modification, are permitted provided that the following conditions 

+ *  are met:

+ *

+ *    Redistributions of source code must retain the above copyright 

+ *    notice, this list of conditions and the following disclaimer.

+ *

+ *    Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the 

+ *    documentation and/or other materials provided with the   

+ *    distribution.

+ *

+ *    Neither the name of Texas Instruments Incorporated nor the names of

+ *    its contributors may be used to endorse or promote products derived

+ *    from this software without specific prior written permission.

+ *

+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 

+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 

+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 

+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 

+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 

+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 

+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ ***********************************************************************/

+

+

+#include <stdlib.h>

+#include "qmsim.h"

+

+/*-------------------Simulator part ---------------*/

+

+void dumpq(Q* q)

+{

+  printf("QDUMP: %d %d %d %d\n",q->size, q->ne, q->head,q->tail);

+}

+void qsim_close(Q * q)

+{

+  if (!q) return;

+  if (q->q) free(q->q);

+  free(q);

+  printf("QSIM: freeing queue\n");

+}

+

+Q * qsim_create(nelem)

+{

+void *p;

+Q * q;

+if (!nelem) return NULL;

+q = (Q*) calloc(1,sizeof(Q));

+if (!q) return NULL;

+

+p = (void **) calloc(nelem,sizeof(void *));

+if (!p) { free(q); return NULL; }

+

+q->size=nelem;

+q->q = p ;

+ printf("QSIM CREATE .. "); dumpq(q);

+return q;

+}

+

+int  qsim_push(Q *q, void *p)

+{

+ if (!q) return -1;

+ if (q->ne >= q->size) return-1;

+ q->q[q->tail] = p;

+ q->tail +=1;

+ q->ne+=1;

+ if (q->tail >= q->size) q->tail = 0;

+ //dumpq(q);

+ return 1;

+}

+void * qsim_pop(Q *q )

+{

+   void * val;

+   if (!q) return NULL;

+   if (q->ne ==0) return NULL;

+   val = q->q[q->head];

+   q->head+=1;

+   if(q->head>= q->size) q->head=0;

+   q->ne -=1;

+ //dumpq(q);

+   return val;

+} 

+

+//#define TEST_QSIM

+#ifdef TEST_QSIM

+main()

+{

+ Q * q;

+ int i;

+ q=  qsim_create(10);

+ for(i=1;i<11;i++)  qsim_push(q, (void *) i);

+ 

+ for(;i<16;i++) { void * val; val = qsim_pop(q); printf("%d\n", (int) val);}

+ for(;i<21;i++) qsim_push(q, (void *) i);

+ for(;i<31;i++) { void * val; val = qsim_pop(q); printf("%d\n", (int) val);}

+}

+#endif

diff --git a/ti/runtime/netapi/OLD/qmsim.h b/ti/runtime/netapi/OLD/qmsim.h
new file mode 100755
index 0000000..9dfc3a9
--- /dev/null
+++ b/ti/runtime/netapi/OLD/qmsim.h
@@ -0,0 +1,64 @@
+/****************************

+ * qmsim.h: qmss lld, hw simulator

+ *************************************************

+ * FILE:  net_test.c

+ * 

+ * DESCRIPTION:  netapi user space transport

+ *               library  test application - simulator code for desktop testing

+ * 

+ * REVISION HISTORY:  rev 0.0.1 

+ *

+ *  Copyright (c) Texas Instruments Incorporated 2010-2011

+ * 

+ *  Redistribution and use in source and binary forms, with or without 

+ *  modification, are permitted provided that the following conditions 

+ *  are met:

+ *

+ *    Redistributions of source code must retain the above copyright 

+ *    notice, this list of conditions and the following disclaimer.

+ *

+ *    Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the 

+ *    documentation and/or other materials provided with the   

+ *    distribution.

+ *

+ *    Neither the name of Texas Instruments Incorporated nor the names of

+ *    its contributors may be used to endorse or promote products derived

+ *    from this software without specific prior written permission.

+ *

+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 

+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 

+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 

+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 

+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 

+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 

+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+*****************************/

+#ifndef __QMSIM__H

+#define __QMSIM__H

+

+

+#ifndef NULL

+#define NULL (void*) 0

+#endif

+

+typedef struct Q_t

+{

+  int size;

+  int head;

+  int tail;

+  int ne;

+  void ** q;

+} Q;

+

+/*-----------------------*/

+/*--------simulator------*/

+Q * qsim_create(int nelem);

+int  qsim_push(Q *, void *p);

+void * qsim_pop(Q * );

+void qsim_close(Q * );

+#endif

diff --git a/ti/runtime/netapi/OLD/shmtest.c b/ti/runtime/netapi/OLD/shmtest.c
new file mode 100755
index 0000000..f4c9479
--- /dev/null
+++ b/ti/runtime/netapi/OLD/shmtest.c
@@ -0,0 +1,118 @@
+/*************************************************

+* FILE:  shmtest.c

+ * 

+ * DESCRIPTION:  netapi user space transport

+ *               library  test application (not used, kept as refenence)

+ * 

+ * REVISION HISTORY:  rev 0.0.1 

+ *

+ *  Copyright (c) Texas Instruments Incorporated 2010-2011

+ * 

+ *  Redistribution and use in source and binary forms, with or without 

+ *  modification, are permitted provided that the following conditions 

+ *  are met:

+ *

+ *    Redistributions of source code must retain the above copyright 

+ *    notice, this list of conditions and the following disclaimer.

+ *

+ *    Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in the 

+ *    documentation and/or other materials provided with the   

+ *    distribution.

+ *

+ *    Neither the name of Texas Instruments Incorporated nor the names of

+ *    its contributors may be used to endorse or promote products derived

+ *    from this software without specific prior written permission.

+ *

+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 

+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 

+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 

+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 

+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 

+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 

+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ **********************************************************************/

+

+

+#include <stdlib.h>

+#include <sys/shm.h>

+#include <errno.h>

+

+ char * p= NULL;

+main(int argc, char * argv[])

+{

+int fd;

+int op=0;

+int name = 0xfeed;

+int err;

+if (argc<3) {printf("shmtest  (c[reate]| d[delete]| o[open])  key\n"); exit(1);}

+

+

+switch (argv[1][0])

+{

+case 'D':

+case 'd':

+        op =2; //delete

+        break;

+case 'c':

+case 'C':

+        op =0; //create

+        break;

+case 'o':

+case 'O':

+        op =1; //open

+        break;

+default:

+printf(" unknown op code %c.  Need d, o, or c\n", argv[1][0]);

+exit(1);

+break;

+}

+

+name = atoi(argv[2]); printf("key = %d op=%d\n", name,op);

+switch (op)

+{

+case(1): /* open */

+default:

+        fd = shmget( (key_t) name, 100000, 0666 );

+        if (fd <0) {

+          perror(" shget open failed\n"); 

+          exit( 1);

+        }

+        break;

+

+case(0): /* create */

+  fd = shmget(name, 100000, IPC_CREAT | 0666 );

+  if (fd<0) {perror(" shget create failed , exiting "); exit(1);}

+  break;

+

+case(2):

+   fd = shmget( (key_t) name, 100000, 0666 );

+  if (fd <0) {

+      perror(" delete: shget open failed\n");

+      exit( 1);

+  }

+  err=shmctl(fd, IPC_RMID, 0);

+  if(err<0) {perror("ctl failed: ");}

+  exit( 0);  //all we do 

+  break;

+}

+

+/* map into us */  

+p = shmat(fd, 0, 0);

+if (p == -1) {

+perror("shmat failed\n"); exit(1);

+}

+ else {printf("mapped to %x\n",p);}

+

+if (op==1) { printf("got something: %s\n", p);}

+else if(op==0) 

+{

+sprintf(p,"created some shared memory, key=%d...\n",name); 

+printf("creating shm ok: %s",p);

+}

+

+}

diff --git a/ti/runtime/netapi/applications/ipsec_offload/config-app/build/Makefile b/ti/runtime/netapi/applications/ipsec_offload/config-app/build/Makefile
new file mode 100755
index 0000000..4867929
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/config-app/build/Makefile
@@ -0,0 +1,102 @@
+# Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+
+space =$(empty) $(empty)
+
+export ARMV7OBJDIR ?= ./obj
+export ARMV7BINDIR ?= ./bin
+export ARMV7LIBDIR ?= ./lib
+# INCLUDE Directories
+
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+
+CSL_DEVICE ?= -DDEVICE_K2L
+
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+#QUIET_CMD=@
+EXE_NAME_PRFX=ipsecmgr_cmd_shell_$(DEVICE)
+
+###############################################################################
+# Set default options
+###############################################################################
+CFLAGS+= $(DEBUG_FLAG) -I../ -I. $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+
+OUTPUT_FILE_OPTION = -o
+
+EXE_NAME = $(EXE_NAME_PRFX).out
+
+ROOT_DIR = ..
+IPSECMGR_UTIL_IFACE_DIR?= ../../../utils/iface
+IPSECMGR_IFACE_DIR?= ../
+
+
+OBJ_DIR = obj
+NETAPI_LIB=netapi
+IPSECMGR_IPC_LIB=ipsecmgr_ipc
+IPSECMGR_SYSLOG_LIB=ipsecmgr_syslog
+IPSECMGR_SNOOP_LIB=ipsecmgr_snoop
+LD_OPTS += -pthread -lrt
+LD_OPTS += -L $(ARMV7LIBDIR) -L $(PDK_ARMV7LIBDIR) -l$(IPSECMGR_SNOOP_LIB) -l$(IPSECMGR_IPC_LIB) -l$(IPSECMGR_SYSLOG_LIB)
+
+###############################################################################
+# List of modules and their files
+###############################################################################
+CONFIG_APP_SRC_DIR ?=../src/
+CONFIG_APP_FILES = \
+        cmd_shell.c \
+        cmd_shell_main.c \
+        cmd_shell_loc.h
+
+VPATH = $(CONFIG_APP_SRC_DIR)
+FILES = $(CONFIG_APP_FILES)
+
+INCL_DIRS= $(IPSECMGR_IFACE_DIR) $(IPSECMGR_UTIL_IFACE_DIR)
+
+HEADERS = $(filter %.h, $(FILES))
+INCL = -I. $(patsubst %,-I%,$(INCL_DIRS))
+
+BIN_DIR = $(ARMV7BINDIR)/netapi/applications/ipsec_offload/config-app
+OBJ_DIR = $(ARMV7OBJDIR)/netapi/applications/ipsec_offload/config-app
+CONFIG_APP_OBJS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(filter %.c, $(FILES)))
+
+
+all: app install
+
+app: $(BIN_DIR)/.created $(BIN_DIR)/$(EXE_NAME)
+###############################################################################
+# Normal make process                                                         
+###############################################################################
+
+$(OBJ_DIR)/%.o: %.c $(OBJ_DIR)/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS) $(INCL)  $<  -o $@
+
+$(OBJ_DIR)/.created:
+        $(QUIET_CMD)@echo "making $@" 
+        @mkdir -p $(OBJ_DIR)
+
+$(BIN_DIR)/.created:
+        @mkdir -p $(BIN_DIR)
+
+$(BIN_DIR)/$(EXE_NAME): $(CONFIG_APP_OBJS) $(BIN_DIR)/.created
+        $(QUIET_CMD)@echo "linking $@" 
+        $(CC) $(CONFIG_APP_OBJS) $(LD_OPTS) -o $(BIN_DIR)/$(EXE_NAME)
+
+install:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(BIN_DIR)/$(EXE_NAME) $(INSTALL_BIN_BASE_DIR)/$(EXE_NAME)
+
+clean:
+        rm -rf $(OBJ_DIR)
+        rm -rf $(BIN_DIR)/$(EXE_NAME)
+
+
+
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/config-app/build/setup_shell_env.sh b/ti/runtime/netapi/applications/ipsec_offload/config-app/build/setup_shell_env.sh
new file mode 100755
index 0000000..0aba750
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/config-app/build/setup_shell_env.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Source this script before starting the ipsecmgr command shell
+
+# Variable to specify the local unix socket name for IPC with IPSec daemon
+export IPSECMGR_APP_SOCK_NAME="/etc/app_sock"
+# Variable to specify the unix socket name of the IPSec daemon
+export IPSECMGR_DAEMON_SOCK_NAME="/etc/ipsd_sock"
+# Variable to specify the log file to be used by the ipsecmgr library
+export IPSECMGR_LOG_FILE="/var/run/ipsecmgr_app.log"
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell.c b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell.c
new file mode 100755
index 0000000..152a2cf
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell.c
@@ -0,0 +1,615 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+/* Standard include files */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <string.h>
+
+/* module specific include files */
+#include <ipsecmgr_ipc.h>
+
+#include "cmd_shell_loc.h"
+
+/* For debugging */
+#define  DEBUG
+#define DEBUG1
+
+#define OPTION_ID_IF_NAME       1
+#define OPTION_ID_SP_ID         2
+#define OPTION_ID_CMD_NAME      3
+#define OPTION_ID_ESN           4
+#define OPTION_ID_GTPU_TEID     5
+#define OPTION_ID_NUM_TEIDS     6
+#define OPTION_ID_SHARED_SA     7
+#define OPTION_ID_NO_EXPIRE_SA  8
+#define OPTION_ID_MAX           9
+
+enum cmd_id {
+    CMD_ID_OFFLOAD_SP   = 1,
+    CMD_ID_STOP_OFFLOAD,
+    CMD_ID_HELP,
+    CMD_ID_EXIT,
+    CMD_ID_LAST
+};
+
+/* Maximum strlen() of string variables */
+#define MAX_STR_VAR_SIZE   32
+
+/* Maximum number of commands */
+#define MAX_CMDS    CMD_ID_LAST
+
+typedef union {
+    unsigned long   intval;
+    char            strval[MAX_STR_VAR_SIZE];
+} opt_val_gen_t;
+    
+typedef struct {
+    opt_val_gen_t   value;
+    uint8_t         is_valid;
+} opt_attr_gen_t;
+ 
+static opt_attr_gen_t opt_input_gen[OPTION_ID_MAX];
+
+/* Module context */
+static cmd_shell_ctx_t shell_ctx;
+
+static int parse_intval(char* int_str, opt_attr_gen_t *opt_attr) {
+    int i;
+    for (i=0; int_str[i]!= '\0'; i++) int_str[i] = (char) tolower(int_str[i]);
+    if (strncmp("0x", int_str, 2)) {
+        opt_attr->value.intval = strtoul(int_str, (char **)NULL, 10);
+    } else {
+        opt_attr->value.intval = strtoul(int_str, (char **)NULL, 16);
+    }
+    opt_attr->is_valid = 1;
+    return 0;
+}
+
+static int parse_strval(char* str, opt_attr_gen_t *opt_attr) {
+
+    strncpy(opt_attr->value.strval, str, MAX_STR_VAR_SIZE-1);
+    opt_attr->is_valid = 1;
+    return 0;
+}
+
+#define CMD_SHORT_OPTS_LEN 200
+static char short_opts[CMD_SHORT_OPTS_LEN];
+
+#define CMD_NAME_OFFLOAD_SP   "offload_sp"
+#define CMD_DESC_OFFLOAD_SP   "Offload an IPSec Policy to Fast Path"
+#define CMD_MIN_ARGS_OFFLOAD_SP    3
+#define CMD_SHORT_OPTS_OFFLOAD_SP snprintf(short_opts,CMD_SHORT_OPTS_LEN, "%d:%d:%d%d:%d:",\
+                           OPTION_ID_SP_ID, OPTION_ID_IF_NAME, OPTION_ID_ESN,\
+                           OPTION_ID_GTPU_TEID, OPTION_ID_NUM_TEIDS,\
+                           OPTION_ID_SHARED_SA);
+
+static struct option offload_sp_options[] =
+{
+    {"sp_id",  required_argument, 0, OPTION_ID_SP_ID},
+    {"if_name", required_argument, 0, OPTION_ID_IF_NAME},
+    {"esn", no_argument, 0, OPTION_ID_ESN},
+    {"gtpu_teid", required_argument, 0, OPTION_ID_GTPU_TEID},
+    {"num_teids", required_argument, 0, OPTION_ID_NUM_TEIDS},
+    {"shared", no_argument, 0, OPTION_ID_SHARED_SA},
+    {0, 0, 0, 0}
+};
+
+#define CMD_NAME_STOP_OFFLOAD   "stop_offload"
+#define CMD_DESC_STOP_OFFLOAD   "Stop Offload of an IPSec Policy"
+#define CMD_MIN_ARGS_STOP_OFFLOAD   3
+#define CMD_SHORT_OPTS_STOP_OFFLOAD snprintf(short_opts,CMD_SHORT_OPTS_LEN, "%d:%d",\
+                                OPTION_ID_SP_ID, OPTION_ID_NO_EXPIRE_SA);
+static struct option stop_offload_options[] =
+{
+    {"sp_id",  required_argument, 0, OPTION_ID_SP_ID},
+    {"no_expire_sa", no_argument, 0, OPTION_ID_NO_EXPIRE_SA},
+    {0, 0, 0, 0}
+};
+
+#define CMD_NAME_EXIT   "exit"
+#define CMD_DESC_EXIT   "Exit the netcpcfg command shell"
+#define CMD_MIN_ARGS_EXIT    1
+#define CMD_SHORT_OPTS_EXIT snprintf(short_opts,CMD_SHORT_OPTS_LEN, ""); 
+static struct option exit_options[] =
+{
+    {0, 0, 0, 0}
+};
+
+#define CMD_NAME_HELP       "help"
+#define CMD_DESC_HELP       "Help on available commands"
+#define CMD_MIN_ARGS_HELP   1
+#define CMD_SHORT_OPTS_HELP snprintf(short_opts,CMD_SHORT_OPTS_LEN, "%d:", OPTION_ID_CMD_NAME); 
+static struct option help_options[] =
+{
+    {"cmd",  required_argument, 0, OPTION_ID_CMD_NAME},
+    {0, 0, 0, 0}
+};
+
+struct cmd_tbl_s {
+    char            *cmd_name;
+    struct option   *opt_tbl;
+    char            *desc;
+};
+
+struct cmd_tbl_s cmd_table[MAX_CMDS] = 
+{
+    {CMD_NAME_OFFLOAD_SP, offload_sp_options, CMD_DESC_OFFLOAD_SP},
+    {CMD_NAME_STOP_OFFLOAD, stop_offload_options, CMD_DESC_STOP_OFFLOAD},
+    {CMD_NAME_EXIT, exit_options, CMD_DESC_EXIT},
+    {CMD_NAME_HELP, help_options, CMD_DESC_HELP},
+    {0, 0}
+};
+
+static void print_help (char *cmd_name)
+{
+    int i,j;
+
+    if (!cmd_name) {
+        printf ("For help on command options type \"%s --cmd <cmd name>\"\n",
+                CMD_NAME_HELP);
+        printf ("Available commands:\n");
+
+        for (i=0; ((i < MAX_CMDS) && cmd_table[i].cmd_name); i++) {
+            printf ("    %s\t%s\n", cmd_table[i].cmd_name, cmd_table[i].desc);
+        }
+        return;
+    }
+
+    for (i=0; ((i < MAX_CMDS) && (cmd_table[i].cmd_name)); i++) {
+        struct option *opt = cmd_table[i].opt_tbl;
+        if (strcmp(cmd_name, cmd_table[i].cmd_name)) {
+            continue;
+        }
+
+        printf ("options for \"%s\"\n", cmd_name);
+        for (j=0; opt->name; j++, opt++) {
+            printf ("    --%s\n", opt->name);
+        }
+        return;
+    }
+
+    printf ("No help available for %s\n", cmd_name);
+    return;
+}
+
+static int setargs (char *args, char **argv)
+{
+    int count = 0;
+
+    while (isspace(*args)) ++args;
+    while (*args) {
+        if (argv) argv[count] = args;
+        while (*args && !isspace(*args)) ++args;
+        if (argv && *args) *args++ = '\0';
+        while (isspace(*args)) ++args;
+        count++;
+    }
+    return count;
+}
+
+static char **parsedargs(char *args, int *argc)
+{
+    char **argv = NULL;
+    int    argn = 0;
+
+    if (args && *args
+        && (args = strdup(args))
+        && (argn = setargs(args,NULL))
+        && (argv = malloc((argn+1) * sizeof(char *)))) {
+          *argv++ = args;
+          argn = setargs(args,argv);
+    }
+
+    //if (args && !argv) free(args);
+
+    *argc = argn;
+    return argv;
+}
+
+static void freeparsedargs(char **argv)
+{
+    if (argv) {
+        free(argv[-1]);
+        free(argv-1);
+    } 
+}
+
+#define COMMAND_LINE_SIZE 400
+     
+void* cmd_shell (void* args)
+{
+    char *line = NULL;
+    size_t len = 0;
+    ssize_t read = 0;
+    char cmd[COMMAND_LINE_SIZE];
+    int nargs, c, rargs;
+    struct option *long_options; 
+    char **av;
+    enum cmd_id  cmd_id;
+
+    memset(&shell_ctx, 0, sizeof(shell_ctx));
+    if (ipsecmgr_ipc_get_user_send_iface(&shell_ctx.ipc_send_if)) {
+        printf ("\ncmd_shell: Failed to get IPC send interface\n");
+        return (void*)(0);
+    }
+
+    while (1) {
+        memset(opt_input_gen, 0, sizeof(opt_input_gen));
+        cmd_id = 0;
+
+        printf ("\nIPSECMGR-CFG> ");
+
+        if (line) free(line);
+        line = malloc(COMMAND_LINE_SIZE);
+        if (line == NULL) {
+            printf("\nError allocating memory");
+            return (void*)(0);
+        }
+
+        read = getline(&line, &len, stdin);
+        if ((read == -1) || (read > COMMAND_LINE_SIZE)) {
+            printf("\nERROR: reading line");
+            continue;
+        }
+        if (!read) continue;
+        memset(cmd, 0, sizeof(cmd));
+        sscanf(line, "%s", cmd);
+
+        if ( !strcmp(cmd, "exit"))
+            exit(0);
+
+        if (!strcmp(cmd, CMD_NAME_OFFLOAD_SP)) {
+            cmd_id = CMD_ID_OFFLOAD_SP;
+            long_options = offload_sp_options; 
+            CMD_SHORT_OPTS_OFFLOAD_SP;
+            rargs = CMD_MIN_ARGS_OFFLOAD_SP;
+        } else if (!strcmp(cmd, CMD_NAME_STOP_OFFLOAD)) {
+            cmd_id = CMD_ID_STOP_OFFLOAD;
+            long_options = stop_offload_options; 
+            CMD_SHORT_OPTS_STOP_OFFLOAD;
+            rargs = CMD_MIN_ARGS_STOP_OFFLOAD;
+        } else if (!strcmp(cmd, CMD_NAME_HELP)) {
+            cmd_id = CMD_ID_HELP;
+            long_options = help_options; 
+            CMD_SHORT_OPTS_HELP;
+            rargs = CMD_MIN_ARGS_HELP;
+        } else {
+            if (strlen(cmd))
+                printf ("Unknown command: %s\n", cmd);
+            continue;
+        }
+
+        if ((av = parsedargs(line, &nargs)) == NULL) {
+            printf ("error parsing arguments\n");
+            continue;
+        }
+
+        if (nargs < rargs) {
+            printf ("Insufficient paramaters for command \"%s\"\n", cmd);
+            print_help (cmd);
+            goto loop_over;
+        }
+
+#ifdef DEBUG1
+        {
+            int i;
+            for (i = 0; i < nargs; i++)
+            printf("[%s]\n",av[i]);
+        }
+#endif
+                
+        optind = 0;
+        while (1) {
+            /* getopt_long stores the option index here. */
+            int option_index = 0;
+            c = getopt_long (nargs, av, short_opts,
+                        long_options, &option_index);
+     
+            /* Detect the end of the options. */
+#ifdef DEBUG1
+                        printf("c=%d",c);
+#endif
+            if (c == -1)
+                break;
+
+            switch (c)
+            {
+
+                case OPTION_ID_SP_ID:
+#ifdef DEBUG
+                printf ("option sp_id with value `%s'\n", optarg);
+#endif
+                if (parse_intval(optarg, &opt_input_gen[c])) {
+                    printf ("Invalid argument for sp_id\n");
+                }
+                break;
+
+                case OPTION_ID_IF_NAME:
+#ifdef DEBUG
+                printf ("option if_name with value `%s'\n", optarg);
+#endif
+                if (parse_strval(optarg, &opt_input_gen[c])) {
+                    printf ("Invalid argument for if_name\n");
+                }
+                break;
+
+                case OPTION_ID_CMD_NAME:
+#ifdef DEBUG
+                printf ("option cmd with value `%s'\n", optarg);
+#endif
+                if (parse_strval(optarg, &opt_input_gen[c])) {
+                    printf ("Invalid argument for cmd\n");
+                }
+                break;
+
+                case OPTION_ID_ESN:
+#ifdef DEBUG
+                printf ("option esn enabled\n");
+#endif
+                opt_input_gen[c].is_valid = 1;
+                break;
+
+                case OPTION_ID_GTPU_TEID:
+#ifdef DEBUG
+                printf ("option gtpu_teid with value `%s'\n", optarg);
+#endif
+                if (parse_intval(optarg, &opt_input_gen[c])) {
+                    printf ("Invalid argument for gtpu_teid\n");
+                }
+                break;
+
+                case OPTION_ID_NUM_TEIDS:
+#ifdef DEBUG
+                printf ("option num_teids with value `%s'\n", optarg);
+#endif
+                if (parse_intval(optarg, &opt_input_gen[c])) {
+                    printf ("Invalid argument for num_teids\n");
+                }
+                break;
+
+                case OPTION_ID_SHARED_SA:
+#ifdef DEBUG
+                printf ("option shared SA enabled\n");
+#endif
+                opt_input_gen[c].is_valid = 1;
+                break;
+
+                case OPTION_ID_NO_EXPIRE_SA:
+#ifdef DEBUG
+                printf ("option no_expire_sa enabled\n");
+#endif
+                opt_input_gen[c].is_valid = 1;
+                break;
+                default:
+                printf ("unknown option c=%d\n", c);
+                break;
+            }
+        }
+#ifdef DEBUG1
+    /* Print any remaining command line arguments (not options). */
+    if (optind < nargs)
+    {
+        printf ("non-option elements: ");
+        while (optind < nargs)
+            printf ("%s ", av[optind++]);
+        putchar ('\n');
+    }
+#endif
+
+    switch (cmd_id) {
+
+        case CMD_ID_HELP:
+        {
+            if (!opt_input_gen[OPTION_ID_CMD_NAME].is_valid) {
+                print_help(NULL);
+            } else {
+                print_help(opt_input_gen[OPTION_ID_CMD_NAME].value.strval);
+            }
+            break;
+        }
+
+        case CMD_ID_OFFLOAD_SP:
+        {
+            ipsecmgr_ipc_offload_sp_req_param_t req;
+            ipsecmgr_ifname_t if_name;
+            ipsecmgr_l5_selector_t l5_selector;
+
+            if (!opt_input_gen[OPTION_ID_SP_ID].is_valid) {
+                printf ("Mandatory paramater missing: sp_id\n");
+                goto loop_over;
+            }
+
+            memset(&req, 0, sizeof(req));
+            memset(&if_name, 0, sizeof(if_name));
+            memset(&l5_selector, 0, sizeof(l5_selector));
+
+            req.trans_id = ++shell_ctx.trans_id;
+
+            /* sp_id */
+            req.policy_id =
+                    (uint32_t)opt_input_gen[OPTION_ID_SP_ID].value.intval;
+
+            /* if_name */
+            if (opt_input_gen[OPTION_ID_IF_NAME].is_valid) {
+                strcpy(if_name.name,
+                       opt_input_gen[OPTION_ID_IF_NAME].value.strval);
+                req.if_name = &if_name;
+            }
+
+            /* esn */
+            if (opt_input_gen[OPTION_ID_ESN].is_valid) {
+                req.sa_flags |= IPSECMGR_SA_FLAGS_ESN;
+            }
+
+            /* gtpu_teid */
+            if (opt_input_gen[OPTION_ID_GTPU_TEID].is_valid) {
+                l5_selector.proto = IPSECMGR_L5_PROTO_GTPU;
+                l5_selector.value.gtpu.teid_start =
+                    (uint32_t)opt_input_gen[OPTION_ID_GTPU_TEID].value.intval;
+                req.l5_selector = &l5_selector;
+            }
+
+            /* num_teids */
+            if (opt_input_gen[OPTION_ID_NUM_TEIDS].is_valid) {
+                l5_selector.value.gtpu.teid_end =
+                    l5_selector.value.gtpu.teid_start - 1 +
+                    (uint32_t)opt_input_gen[OPTION_ID_NUM_TEIDS].value.intval;
+            } else { /* default is 1 TEID */
+                l5_selector.value.gtpu.teid_end =
+                    l5_selector.value.gtpu.teid_start;
+            }
+
+            /* shared tunnel */
+            if (opt_input_gen[OPTION_ID_SHARED_SA].is_valid) {
+                req.sa_flags |= IPSECMGR_SA_FLAGS_SHARED;
+            }
+
+            if (shell_ctx.ipc_send_if->offload_sp_req(&req)) {
+                printf("%s failed\n", CMD_NAME_OFFLOAD_SP);
+            } else {
+                printf("%s trans_id: 0x%x\n", CMD_NAME_OFFLOAD_SP,
+                       shell_ctx.trans_id);
+            }
+
+            break;
+        }
+
+        case CMD_ID_STOP_OFFLOAD:
+        {
+            ipsecmgr_ipc_stop_offload_req_param_t req;
+
+            if (!opt_input_gen[OPTION_ID_SP_ID].is_valid) {
+                printf ("Mandatory paramater missing: sp_id\n");
+                goto loop_over;
+            }
+
+            memset(&req, 0, sizeof(req));
+
+            req.trans_id = ++shell_ctx.trans_id;
+
+            /* sp_id */
+            req.policy_id =
+                    (uint32_t)opt_input_gen[OPTION_ID_SP_ID].value.intval;
+
+            if (opt_input_gen[OPTION_ID_NO_EXPIRE_SA].is_valid) {
+                req.no_expire_sa = 1;
+            }
+            if (shell_ctx.ipc_send_if->stop_offload_req(&req)) {
+                printf("%s failed\n", CMD_NAME_STOP_OFFLOAD);
+            } else {
+                printf("%s trans_id: 0x%x\n", CMD_NAME_STOP_OFFLOAD,
+                       shell_ctx.trans_id);
+            }
+
+            break;
+        }
+
+    } /* switch cmd_id */
+
+loop_over:
+        freeparsedargs(av);
+    }
+    return (void*)(0);
+}
+
+void cmd_shell_offload_sp_rsp
+(
+    ipsecmgr_ipc_offload_sp_rsp_param_t *rsp
+)
+{
+    char resp_str[10] = {0,};
+
+    printf ("\nRecvd OFFLOAD_SP response:\n");
+    printf ("  trans_id:\t0x%x\n", rsp->trans_id);
+
+    if (rsp->type & RSP_TYPE_ACK) {
+        strcpy(resp_str, "ACK");
+    } else if (rsp->type & RSP_TYPE_DONE) {
+        int slen = strlen(resp_str);
+        if (slen)
+            strcpy(&resp_str[slen], "|DONE");
+        else
+            strcpy(&resp_str[slen], "DONE");
+    } 
+
+    printf ("  resp_type:\t(%d) %s\n", rsp->type, resp_str);
+    printf ("  result:\t(%d) %s\n", rsp->result,
+            ((rsp->result == RESULT_SUCCESS) ? "SUCCESS":"FAIL"));
+
+    if (rsp->err_code) {
+        printf ("  FP lib retval:\t%d\n", rsp->err_code);
+    }
+
+    if (rsp->sa_handle) 
+        printf ("  sa_handle:\t0x%x\n", rsp->sa_handle);
+    if (rsp->sp_handle) 
+        printf ("  sp_handle:\t0x%x\n", rsp->sp_handle);
+
+    return;
+}
+
+void cmd_shell_stop_offload_rsp
+(
+    ipsecmgr_ipc_stop_offload_rsp_param_t *rsp
+)
+{
+    char resp_str[10] = {0,};
+
+    printf ("\nRecvd STOP_OFFLOAD response:\n");
+    printf ("  trans_id:\t0x%x\n", rsp->trans_id);
+
+    if (rsp->type & RSP_TYPE_ACK) {
+        strcpy(resp_str, "ACK");
+    } else if (rsp->type & RSP_TYPE_DONE) {
+        int slen = strlen(resp_str);
+        if (slen)
+            strcpy(&resp_str[slen], "|DONE");
+        else
+            strcpy(&resp_str[slen], "DONE");
+    } 
+
+    printf ("  resp_type:\t(%d) %s\n", rsp->type, resp_str);
+    printf ("  result:\t(%d) %s\n", rsp->result,
+            ((rsp->result == RESULT_SUCCESS) ? "SUCCESS":"FAIL"));
+
+    return;
+}
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_loc.h b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_loc.h
new file mode 100755
index 0000000..8ee899c
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_loc.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+#ifndef __CMD_SHELL_LOC_H__
+#define __CMD_SHELL_LOC_H__
+
+#include <ipsecmgr_ipc.h>
+
+/* Module context for command shell */
+typedef struct {
+    ipsecmgr_trans_id_t  trans_id;
+    ipsecmgr_ipc_user_send_if_t *ipc_send_if;
+} cmd_shell_ctx_t;
+
+/* Command line interpreter task */
+void* cmd_shell (void *args);
+
+/* OFFLOAD_SP response handler */
+void cmd_shell_offload_sp_rsp
+(
+    ipsecmgr_ipc_offload_sp_rsp_param_t *rsp
+);
+
+/* STOP_OFFLOAD response handler */
+void cmd_shell_stop_offload_rsp
+(
+    ipsecmgr_ipc_stop_offload_rsp_param_t *rsp
+);
+
+#endif
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_main.c b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_main.c
new file mode 100755
index 0000000..22f34e6
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/config-app/src/cmd_shell_main.c
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h> 
+#include <time.h>
+#include <pthread.h>
+#include <string.h>
+#include <stdarg.h>
+#include <unistd.h>
+
+#include <ipsecmgr_ipc.h>
+#include <ipsecmgr_syslog.h>
+
+#include "cmd_shell_loc.h"
+
+typedef pthread_t task_handle;
+
+#define DEFAULT_STACK_SIZE      0x8000
+static int task_create ( void *(start_routine)(void*), void* args, void* handle)
+{
+    int max_priority, err;
+    pthread_t thread;
+    pthread_attr_t attr;
+    struct sched_param param;
+
+    max_priority = sched_get_priority_max(SCHED_FIFO);
+    err = pthread_attr_init(&attr);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_init failed: (%s)\n", strerror(err));
+        return err;
+    }
+    err = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_setdetachstate failed: (%s)\n", strerror(err));
+        return err;
+    }
+    err = pthread_attr_setstacksize(&attr, DEFAULT_STACK_SIZE);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_setstacksize failed: (%s)\n", strerror(err));
+        return err;
+    }
+    err = pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_setinheritsched failed: (%s)\n", strerror(err));
+        return err;
+    }
+    err = pthread_attr_setschedpolicy(&attr, SCHED_FIFO);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_setschedpolicy failed: (%s)\n", strerror(err));
+        return err;
+    }
+    memset(&param, 0, sizeof(param));
+    param.sched_priority = max_priority;
+    err = pthread_attr_setschedparam(&attr, &param);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_attr_setschedparam failed: (%s)\n", strerror(err));
+        return err;
+    }
+    err = pthread_create(&thread, &attr, start_routine, args);
+    if (err) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "pthread_create failed: (%s)\n", strerror(err));
+        return err;
+    }
+    *(pthread_t*)handle = thread;
+    return 0;
+}
+
+static void task_wait (void *handle)
+{
+    pthread_join(*((pthread_t*)handle), NULL);
+    return;
+}
+
+static void task_sleep(int time_in_msec)
+{
+    pthread_mutex_t fake_mutex = PTHREAD_MUTEX_INITIALIZER;
+    pthread_cond_t fake_cond = PTHREAD_COND_INITIALIZER;
+    struct timespec ts;
+    int rt;
+    unsigned int sec, nsec;
+
+    sec = time_in_msec/1000;
+    nsec = (time_in_msec - (sec*1000)) * 1000000;
+
+    /* Use the wall-clock time */
+    clock_gettime(CLOCK_REALTIME, &ts);
+
+    ts.tv_sec += sec;
+    ts.tv_nsec += nsec;
+
+    pthread_mutex_lock(&fake_mutex);
+    rt = pthread_cond_timedwait(&fake_cond, &fake_mutex, &ts);
+    pthread_mutex_unlock(&fake_mutex);
+}
+
+#define IPC_POLL_INTVL   1000
+
+static void *ipc_poll(void *args)
+{
+    while(1) {
+        ipsecmgr_ipc_poll();
+        task_sleep(IPC_POLL_INTVL);
+    } /* end while */
+    return (void*)(0);
+}
+
+/* usage ipsecmgr_cmd_shell 
+ */
+int main(int argc, char **argv)
+{
+    ipsecmgr_ipc_cfg_t  ipc_cfg;
+    ipsecmgr_ipc_user_recv_if_t recv_if;
+    task_handle cmd_th, ipc_th;
+    int status;
+    int c;
+    static char usage[] = "usage: %s -s <daemon id>\n";
+
+    memset(&ipc_cfg, 0, sizeof(ipc_cfg));
+    while ((c = getopt (argc, argv, "i:")) != -1)
+    {
+        switch (c)
+        {
+            case 'i':
+                ipc_cfg.ipc_id = (uint32_t)strtol(optarg, NULL,0);
+                if(!ipc_cfg.ipc_id)
+                {
+                    printf(usage, argv[0]);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+        case '?':
+            printf(usage, argv[0]);
+            exit(EXIT_FAILURE);
+        default:
+            break;
+        }
+    }
+    /* Start logging module */
+    if (ipsecmgr_syslog_init()) {
+        printf ("Failed to initialize syslog\n");
+        return -1;
+    }
+
+    ipc_cfg.mode = IPC_MODE_USER_APP;
+
+    if (ipsecmgr_ipc_init(&ipc_cfg)) {
+        printf ("Failed to initialize IPC\n");
+        return -1;
+    }
+
+    recv_if.offload_sp_rsp = cmd_shell_offload_sp_rsp;
+    recv_if.stop_offload_rsp = cmd_shell_stop_offload_rsp;
+
+    if (ipsecmgr_ipc_register_user_recv_iface(&recv_if)) {
+        printf ("Failed to IPC recv interface\n");
+        return -1;
+    }
+
+    /* Create the command line interpreter task */
+    if (status = task_create(cmd_shell, NULL, &cmd_th)) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "ERROR: Command shell task-create failed (%d)\n", status);
+        return (-1);
+    }
+
+    /* Create the FP IPC poll task */
+    if (status = task_create(ipc_poll, NULL, &ipc_th)) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "ERROR: IPC recv task-create failed (%d)\n", status);
+        return (-1);
+    }
+
+    task_wait(&cmd_th);
+    return 0;
+}
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/build/Makefile b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/build/Makefile
new file mode 100755
index 0000000..916e9ce
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/build/Makefile
@@ -0,0 +1,144 @@
+# Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+
+space =$(empty) $(empty)
+
+export ARMV7OBJDIR ?= ./obj
+export ARMV7BINDIR ?= ./bin
+export ARMV7LIBDIR ?= ./lib
+export ARMV7SALIBDIR ?= ./lib
+
+# DEVICE
+export DEVICE ?= k2l
+
+# INCLUDE Directories
+SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
+QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
+CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
+PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
+
+HPLIB_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
+NETAPI_INC_DIR ?=  $(TRANS_SDK_INSTALL_PATH)
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+
+PDK_ARMV7LIBDIR ?= ARMV7LIBDIR
+
+QMSS_LIB=qmss
+CPPI_LIB=cppi
+HPLIB_LIB=hplib_$(DEVICE)
+NETAPI_LIB=netapi_$(DEVICE)
+NWAL_LIB ?= nwalsa_$(DEVICE)
+SA_LIB=sa
+PKTLIB_LIB=pktlib
+IPSECMGR_SNOOP_LIB=ipsecmgr_snoop
+IPSECMGR_IPC_LIB=ipsecmgr_ipc
+IPSECMGR_SYSLOG_LIB=ipsecmgr_syslog
+RM_LIB = -lrm
+
+ifeq ($(DEVICE), k2h)
+CSL_DEVICE = -DDEVICE_K2H
+PA_LIB   = pa
+endif
+ifeq  ($(DEVICE), k2k)
+CSL_DEVICE = -DDEVICE_K2K
+PA_LIB   = pa
+endif
+ifeq ($(DEVICE), k2l)
+CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
+PA_LIB   = pa2
+endif
+ifeq ($(DEVICE), k2e)
+CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
+PA_LIB   = pa2
+endif
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+#QUIET_CMD=@
+EXE_NAME_PRFX=ipsecmgr_daemon_$(DEVICE)
+
+###############################################################################
+# Set default options
+###############################################################################
+CFLAGS+= $(DEBUG_FLAG) -I../ -I. $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+
+ifeq ($(ENABLE_ADD_POLICY),y)
+        CFLAGS += -DENABLE_ADD_POLICY
+endif
+OUTPUT_FILE_OPTION = -o
+
+EXE_NAME = $(EXE_NAME_PRFX).out
+
+ROOT_DIR = ..
+#IPSECMGR_IFACE_DIR?= ../../../
+IPSECMGR_UTIL_IFACE_DIR?= ../../../utils/iface
+IPSECMGR_IFACE_DIR?= ../
+
+LIBNL_LD_OPTS = -lnl-3 -lnl-xfrm -lnl-route-3
+
+LD_OPTS += -pthread -lrt
+
+LD_OPTS += -L $(ARMV7LIBDIR) -L $(PDK_ARMV7LIBDIR) -l$(IPSECMGR_SNOOP_LIB) -l$(IPSECMGR_IPC_LIB) -l$(IPSECMGR_SYSLOG_LIB) -l$(NETAPI_LIB) -l$(NWAL_LIB) -l$(PKTLIB_LIB) -l$(SA_LIB) -l$(QMSS_LIB) -l$(CPPI_LIB) -l$(PA_LIB) -l$(HPLIB_LIB) $(RM_LIB) $(LIBNL_LD_OPTS)
+###############################################################################
+# List of modules and their files
+###############################################################################
+DAEMON_SRC_DIR ?= ../src/
+UTILS_SRC_DIR ?= $(NETAPI_SRC_DIR)/utils
+
+DAEMON_FILES = \
+        netapi_ipsecmgr.c \
+        netapilib_interface.c
+
+UTIL_FILES = \
+        sockutils.c \
+        netapi_util_rm.c
+
+VPATH = $(DAEMON_SRC_DIR):$(UTILS_SRC_DIR)
+FILES = $(DAEMON_FILES) $(UTIL_FILES)
+
+INCL_DIRS= $(IPSECMGR_IFACE_DIR) $(IPSECMGR_UTIL_IFACE_DIR) $(NETAPI_INC_DIR) $(CPPI_INC_DIR) $(QMSS_INC_DIR) $(HPLIB_INC_DIR) $(SA_INSTALL_PATH) $(PDK_INSTALL_PATH) $(UTILS_SRC_DIR)
+
+HEADERS = $(filter %.h, $(FILES))
+INCL = -I. $(patsubst %,-I%,$(INCL_DIRS))
+
+
+BIN_DIR = $(ARMV7BINDIR)/netapi/applications/ipsec_offload/ipsecmgr
+OBJ_DIR = $(ARMV7OBJDIR)/netapi/applications/ipsec_offload/ipsecmgr
+DAEMON_OBJS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(filter %.c, $(FILES)))
+
+
+all: app install
+
+app: $(BIN_DIR)/.created $(BIN_DIR)/$(EXE_NAME)
+###############################################################################
+# Normal make process                                                         
+###############################################################################
+
+$(OBJ_DIR)/%.o: %.c $(OBJ_DIR)/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS) $(INCL)  $<  -o $@
+
+$(OBJ_DIR)/.created:
+        $(QUIET_CMD)@echo "making $@" 
+        @mkdir -p $(OBJ_DIR)
+
+$(BIN_DIR)/.created:
+        @mkdir -p $(BIN_DIR)
+
+$(BIN_DIR)/$(EXE_NAME): $(DAEMON_OBJS) $(BIN_DIR)/.created
+        $(QUIET_CMD)@echo "linking $@" 
+        $(QUIET_CMD)@echo "$(LD_OPTS)" 
+        $(CC) $(DAEMON_OBJS) $(LD_OPTS) -o $(BIN_DIR)/$(EXE_NAME)
+
+install:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(BIN_DIR)/$(EXE_NAME) $(INSTALL_BIN_BASE_DIR)/$(EXE_NAME)
+clean:
+        rm -rf $(OBJ_DIR)
+        rm -rf $(BIN_DIR)/$(EXE_NAME)
diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
new file mode 100644
index 0000000..f2a99b2
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapi_ipsecmgr.c
@@ -0,0 +1,1096 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+
+/* IPSec Manager Include Files */
+#include "ipsecmgr_snoop.h"
+#include "ipsecmgr_ipc.h"
+#include "ipsecmgr_syslog.h"
+
+/* Local include */
+#include "netapilib_interface.h"
+
+/* Standard includes */
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <stdarg.h>
+
+
+
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <sys/types.h>
+#include <netinet/in.h> 
+#include <string.h> 
+
+#if defined(DEVICE_K2H)
+#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/netcp@2000000/netcp-interfaces/interface-0/rx-queue"};
+#elif defined (DEVICE_K2K)
+#include <ti/drv/qmss/device/k2k/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/netcp@2000000/netcp-interfaces/interface-0/rx-queue"};
+#elif defined (DEVICE_K2L)
+#include <ti/drv/qmss/device/k2l/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2l/src/cppi_device.c>
+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/netcp@2600000/netcp-interfaces/interface-0/rx-queue"};
+#elif defined (DEVICE_K2E)
+#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/netcp@2400000/netcp-interfaces/interface-0/rx-queue"};
+
+#else /*Default */
+#include <ti/runtime/hplib/device/k2h/src/hplib_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>
+char*  DTS_LOG_FILE_QUEUE_ETHx[] = {
+ "/proc/device-tree/soc/netcp@2000000/netcp-interfaces/interface-0/rx-queue"};
+
+#endif
+
+/**********************************************************************
+ ************************** Local Definitions *************************
+ **********************************************************************/
+
+/**********************************************************************
+ ************************** Global Variables **************************
+ **********************************************************************/
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+
+static ipsecmgr_ipc_daemon_send_if_t *send_iface;
+NETAPI_T netapi_handle;
+
+ipsecMgrMcb_t globalDB;
+
+static int use_rm =0;
+
+/* Lock file for the daemon */
+#define LOCK_FILE   "/var/lock/ipsecmgr_daemon"
+
+/* snoop task */
+static pthread_t    snoop_run_th;
+
+static pthread_t stats_th;
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+    TUNE_NETAPI_PERM_MEM_SZ,
+    128,  //start of packet offset for hw to place data on rx for default flow
+    TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+    TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+    TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+    64, //#descriptors w/o buffers in default heap
+    TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+    128,    //tail room
+    256,    //extra room
+    0,
+    NULL,
+    0,
+    0
+};
+
+
+
+static int QUIT = 0;
+ipsecMgrShm_T* pIpsecMgrSaStats;
+
+/* stub functions */
+static void recv_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    return;
+}
+
+/* byte swap routine */
+static unsigned int swap32 (unsigned int x)
+{
+    unsigned int y;
+
+    y = (((x >> 24) & 0xff) <<  0) |
+        (((x >> 16) & 0xff) <<  8) |
+        (((x >>  8) & 0xff) << 16) |
+        (((x >>  0) & 0xff) << 24) ;
+
+    return (y);
+
+}
+
+void cleanup_sa_sp()
+{
+    int slot, error=0;;
+    /* delete any offloaded rx SA's and policies */
+    /* and delete any offloaded tx SA's */
+    for (slot = 0; slot < IPSECMGR_MAX_SA; slot++)
+    {
+        if(globalDB.rx_sa[slot].in_use)
+        {
+            globalDB.rx_sa[slot].in_use = 0;
+            if(globalDB.rx_sa[slot].spAppId)
+            {
+                netapi_secDelRxPolicy(netapi_handle,
+                              (NETCP_CFG_IPSEC_POLICY_T) globalDB.rx_sa[slot].spAppId,
+                              &error);
+                ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "cleanup_sa_sp: SP deleted: sp_app_id: 0x%x, slot: %d, error: %d\n", 
+                globalDB.rx_sa[slot].spAppId, slot, error);
+            }
+            netapi_secDelSA(netapi_handle,
+                        NETCP_CFG_NO_INTERFACE,
+                        (NETCP_CFG_SA_T) globalDB.rx_sa[slot].saAppId,
+                        &error);
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "cleanup_sa_sp: SA deleted: sa_app_id: 0x%x, slot: %d, error: %d\n", 
+                globalDB.rx_sa[slot].saAppId, slot, error);
+            
+        }
+        if(globalDB.tx_sa[slot].in_use)
+        {
+            globalDB.tx_sa[slot].in_use = 0;
+            netapi_secDelSA(netapi_handle,
+                            NETCP_CFG_NO_INTERFACE,
+                           (NETCP_CFG_SA_T) globalDB.tx_sa[slot].saAppId,
+                            &error);
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "cleanup_sa_sp: SA deleted: sa_app_id: 0x%x, slot: %d, error: %d\n", 
+                globalDB.tx_sa[slot].saAppId, slot, error);
+        }
+    }
+}
+
+
+static void* snoop_run_thread (void* arg)
+{
+    cpu_set_t cpu_set;
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+    ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO,
+        "snoop_run_thread: daemon entering forever event loop\n");
+
+    while (1)
+    {
+        /* Poll for message from user application */
+        ipsecmgr_ipc_poll();
+
+        /* Poll for message from Kernel */
+        ipsecmgr_snoop_run();
+        if (QUIT == 1)
+            break;
+    }
+    ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO,
+        "snoop_run_thread: calling shutdown\n");
+    ipsecmgr_snoop_shutdown ();
+    cleanup_sa_sp();
+    netapi_shutdown(netapi_handle);
+
+        closeRm();
+    return ((void*)NULL);
+}
+
+/**
+ *  @b Description
+ *  @n  
+ *      SIGTERM handler.
+ *
+ *  @param[in]  signum
+ *      signal number to terminate deamon.
+ */
+static void sig_term_handler(int signum)
+{
+    QUIT = 1;
+}
+
+/**
+ *  @b Description
+ *  @n  
+ *      Function to implement task sleep functionality 
+ *      for IPSecMgr
+ *
+ *  @param[in]  time_in_msec
+ *      Time in milliseconds to sleep
+ *
+ *  @retval
+ *      Not Applicable.
+ */
+static void task_sleep(uint32_t time_in_msec)
+{
+    pthread_mutex_t fake_mutex = PTHREAD_MUTEX_INITIALIZER;
+    pthread_cond_t fake_cond = PTHREAD_COND_INITIALIZER;
+    struct timespec ts;
+    int rt;
+    unsigned int sec, nsec;
+
+    sec = time_in_msec/1000;
+    nsec = (time_in_msec - (sec*1000)) * 1000000;
+
+    /* Use the wall-clock time */
+    clock_gettime(CLOCK_REALTIME, &ts);
+
+    ts.tv_sec += sec;
+    ts.tv_nsec += nsec;
+
+    pthread_mutex_lock(&fake_mutex);
+    rt = pthread_cond_timedwait(&fake_cond, &fake_mutex, &ts);
+    pthread_mutex_unlock(&fake_mutex);
+}
+
+
+/**
+ *  @b Description
+ *  @n  
+ *      NETAPI Proxy's IPSecMgr Start Offload Response 
+ *      message handler.
+ *
+ *      This function is called by the IPSecMgr library
+ *      when it has a response ready corresponding to an
+ *      Start Offload SP request issued by the user application.
+ *
+ *  @param[in]  rsp
+ *      IPSecMgr's Start Offload SP response
+ *  @param[in]  addr
+ *      Destination address (user application) to send 
+ *      the response to
+ *  @param[in]  addr_size
+ *      Size of destination address passed
+ *
+ *  @retval
+ *      Success -   0
+ *  @retval
+ *      ERROR   -   <0
+ */
+static int offload_sp_rsp_send
+(
+    ipsecmgr_snoop_offload_sp_rsp_param_t *rsp,
+    void                                  *addr,
+    uint32_t                              addr_size
+)
+{
+    ipsecmgr_ipc_offload_sp_rsp_param_t offload_sp_rsp;
+
+    offload_sp_rsp.type = rsp->type;
+    offload_sp_rsp.result = rsp->result;
+    offload_sp_rsp.trans_id = rsp->trans_id;
+    offload_sp_rsp.err_code = rsp->err_code;
+    offload_sp_rsp.sp_handle = rsp->sp_handle;
+    offload_sp_rsp.sa_handle = rsp->sa_handle;
+
+    if (addr_size != sizeof(ipsecmgr_ipc_addr_t)) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "offload_sp_rsp_send: addr size not correct\n");
+        return -1;
+    }
+
+    return send_iface->offload_sp_rsp(&offload_sp_rsp,
+                                      (ipsecmgr_ipc_addr_t *)addr);
+}
+static void offload_sp_req_recv
+(
+    ipsecmgr_ipc_offload_sp_req_param_t *req,
+    ipsecmgr_ipc_addr_t                 *src_addr
+)
+{
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,"offload_sp_req_recv called for policy id\n",
+    req->policy_id);
+    ipsecmgr_snoop_offload_sp_rsp_param_t rsp;
+    uint32_t addr_size = sizeof(ipsecmgr_ipc_addr_t);
+    ipsecmgr_snoop_offload_sp_req_param_t offload_sp_req;
+
+    offload_sp_req.trans_id = req->trans_id;
+    offload_sp_req.policy_id = req->policy_id;
+    offload_sp_req.sa_flags = req->sa_flags;
+    offload_sp_req.if_name = req->if_name;
+    offload_sp_req.dscp_cfg = req->dscp_cfg;
+    offload_sp_req.l5_selector = req->l5_selector;
+    //offload_sp_req.oseq_offset = req->oseq_offset;
+
+    memset(&rsp, 0, sizeof(rsp));
+    rsp.trans_id = req->trans_id;
+
+    if (ipsecmgr_snoop_offload_sp_req(&offload_sp_req, (void*)src_addr,
+                                      addr_size)) {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "offload_sp_req_recv: snoop_offload_sp_req failed\n");
+        rsp.result = RESULT_FAILURE;
+        rsp.type = RSP_TYPE_ACK | RSP_TYPE_DONE;
+    }
+    else
+    {
+        rsp.result = RESULT_SUCCESS;
+        rsp.type = RSP_TYPE_ACK;
+    }
+    
+    if (offload_sp_rsp_send(&rsp, (void *)src_addr, addr_size))
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "offload_sp_req_recv: failed to send ACK for offload_sp\n");
+    }
+    return;
+}
+
+
+/**
+ *  @b Description
+ *  @n  
+ *      NETAPI Proxy's IPSecMgr Stop Offload response message 
+ *      handler.
+ *
+ *      This function is called by the IPSecMgr library
+ *      when it has a response ready corresponding to an
+ *      Stop Offload SP request issued by the user application.
+ *
+ *  @param[in]  rsp
+ *      IPSecMgr's Stop Offload SP response
+ *  @param[in]  addr
+ *      Destination address (user application) to send 
+ *      the response to
+ *  @param[in]  addr_size
+ *      Size of destination address passed
+ *
+ *  @retval
+ *      Success -   0
+ *  @retval
+ *      ERROR   -   <0
+ */
+static int stop_offload_rsp_send
+(
+    ipsecmgr_snoop_stop_offload_rsp_param_t *rsp,
+    void                                    *addr,
+    uint32_t                                addr_size
+)
+{
+    ipsecmgr_ipc_stop_offload_rsp_param_t stop_offload_rsp;
+
+    stop_offload_rsp.type = rsp->type;
+    stop_offload_rsp.result = rsp->result;
+    stop_offload_rsp.trans_id = rsp->trans_id;
+
+    if (addr_size != sizeof(ipsecmgr_ipc_addr_t)) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "stop_offload_rsp_send: addr size not correct\n");
+        return -1;
+    }
+
+    return send_iface->stop_offload_rsp(&stop_offload_rsp,
+                                      (ipsecmgr_ipc_addr_t *)addr);
+}
+
+static void stop_offload_req_recv
+(
+    ipsecmgr_ipc_stop_offload_req_param_t   *req,
+    ipsecmgr_ipc_addr_t                     *src_addr
+)
+{
+    ipsecmgr_snoop_stop_offload_req_param_t stop_offload_req;
+    uint32_t addr_size = sizeof(ipsecmgr_ipc_addr_t);
+    ipsecmgr_snoop_stop_offload_rsp_param_t rsp;
+
+    stop_offload_req.trans_id = req->trans_id;
+    stop_offload_req.policy_id = req->policy_id;
+    stop_offload_req.no_expire_sa = req->no_expire_sa;
+
+    memset(&rsp, 0, sizeof(rsp));
+    rsp.trans_id = req->trans_id;
+
+    if (ipsecmgr_snoop_stop_offload(&stop_offload_req, (void*)src_addr,
+                                      addr_size)) {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "stop_offload_req_recv: snoop_stop_offload failed\n");
+        rsp.result = RESULT_FAILURE;
+        rsp.type = RSP_TYPE_ACK | RSP_TYPE_DONE;
+    }
+    else
+    {
+        rsp.result = RESULT_SUCCESS;
+        rsp.type = RSP_TYPE_ACK;
+    }
+
+    if (stop_offload_rsp_send(&rsp, (void *)src_addr, addr_size))
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "stop_offload_req_recv: failed to send ACK for stop_offload\n");
+    }
+    return;
+}
+
+static void stats_callback(NETAPI_T h)
+{
+    int i;
+    for (i = 0; i < IPSECMGR_MAX_SA; i++)
+    {
+        /* Statistics for RX Tunnel */
+        if(globalDB.rx_sa[i].in_use)
+        {
+            netapi_getSaStats(h,
+                              globalDB.rx_sa[i].saAppId,
+                              &(pIpsecMgrSaStats->netapi_sa_stats_rx[i]));
+            if (pIpsecMgrSaStats->netapi_sa_stats_rx[i].validParams & NETAPI_IPSEC_STAT_VALID)
+            {
+                memcpy(&(pIpsecMgrSaStats->info_rx[i]),
+                         &(globalDB.rx_sa[i]),
+                         sizeof(ipsecMgrAppId_T));
+            }
+        }
+    }
+    for (i = 0; i < IPSECMGR_MAX_SA; i++)
+    {
+        /* Statistics for TX Tunnel */
+        if (globalDB.tx_sa[i].in_use)
+        {
+            netapi_getSaStats(h,
+                             globalDB.tx_sa[i].saAppId,
+                             &(pIpsecMgrSaStats->netapi_sa_stats_tx[i]));
+            if (pIpsecMgrSaStats->netapi_sa_stats_tx[i].validParams & NETAPI_IPSEC_STAT_VALID)
+            {
+                memcpy(&(pIpsecMgrSaStats->info_tx[i]),
+                                        &(globalDB.tx_sa[i]),
+                                        sizeof(ipsecMgrAppId_T));
+            }
+        }
+    }
+}
+
+static void slow_path_thread(uint32_t index)
+{
+    NETAPI_T worker_nh;
+    int err, i;;
+    cpu_set_t cpu_set;
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( index, &cpu_set);
+
+    hplib_utilSetupThread(index, &cpu_set, hplib_spinLock_Type_LOL);
+    worker_nh = netapi_init(NETAPI_CORE_MASTER,NULL);
+
+    if (worker_nh == NULL)
+    {
+        exit(1);
+    }
+    while(1)
+    {
+        if (QUIT == 1)
+        {
+            break;
+        }
+        sleep(2);
+        stats_callback(worker_nh);
+    }
+
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+        "slow_path_thread: calling netapi_shutdown\n");
+    netapi_shutdown(worker_nh);
+}
+/**
+ *  @b Description
+ *  @n  
+ *      Function to initialize IPSec Manager library.
+ *
+ *  @retval
+ *      Success -   0
+ *  @retval
+ *      ERROR   -   >0
+ */
+static int32_t init_ipsecmgr (void)
+{
+    struct ipsecmgr_snoop_fp_cfg_cb     fp_cfg_cb;
+    struct ipsecmgr_snoop_mgnt_cb       mgnt_cb;
+    struct ipsecmgr_snoop_platform_cb   plat_cb;
+    ipsecmgr_ipc_daemon_recv_if_t       recv_if;
+    ipsecmgr_ipc_cfg_t                  ipc_cfg;
+    int32_t                             status;
+    pthread_attr_t threadAttr;
+
+    /* Initializations */
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO, 
+                        "DEBUG: init_ipsecmgr() starting initialization\n");
+    memset(&fp_cfg_cb, 0, sizeof(fp_cfg_cb));
+    memset(&mgnt_cb, 0, sizeof(mgnt_cb));
+    memset(&plat_cb, 0, sizeof(plat_cb));
+    memset(&recv_if, 0, sizeof(recv_if));
+    memset(&ipc_cfg, 0, sizeof(ipc_cfg));
+
+    /* Initialize IPC library */
+    ipc_cfg.mode = IPC_MODE_SNOOP_DAEMON;
+    ipc_cfg.ipc_id = globalDB.ipc_id;
+    if (ipsecmgr_ipc_init(&ipc_cfg)) {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "init_ipsecmgr: ipc_init failed\n");
+        return -1;
+    }
+    else
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "init_ipsecmgr: ipc_init sucess\n");
+
+    if (ipsecmgr_ipc_get_daemon_send_iface(&send_iface)) {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "init_ipsecmgr: ipc_get_daemon_send_iface failed\n");
+        return -1;
+    }
+    recv_if.offload_sp_req = offload_sp_req_recv;
+    recv_if.stop_offload_req = stop_offload_req_recv;
+    /* Register ipsecmgr daemon recieve i/f */
+    if (ipsecmgr_ipc_register_daemon_recv_iface(&recv_if)) {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "snoop_run: ipc_register_daemon_recv_iface failed\n");
+        return -1;
+    }
+
+    /* Initialize the IPSec Manager Snoop library */
+    fp_cfg_cb.add_sa        =   netapilib_ifAddSA;
+    fp_cfg_cb.add_sp        =   netapilib_ifAddSP;
+    fp_cfg_cb.del_sa        =   netapilib_ifDeleteSA;
+    fp_cfg_cb.del_sp        =   netapilib_ifDeleteSP;
+    fp_cfg_cb.get_sa_ctx    =   netapilib_ifGetSACtx;
+
+    plat_cb.log_msg  = (ipsecmgr_snoop_log_msg_t)ipsecmgr_syslog_msg;
+    plat_cb.sleep           =   task_sleep;
+
+    mgnt_cb.offload_sp_rsp  =   offload_sp_rsp_send;
+    mgnt_cb.stop_offload_rsp=   stop_offload_rsp_send;
+    mgnt_cb.rekey_event     =   NULL; // No explicit notifications needed on Rekey completion
+
+    if ((status = ipsecmgr_snoop_init (&fp_cfg_cb, &mgnt_cb, &plat_cb))) 
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                            "DEBUG: init_ipsecmgr() ipsecmgr_snoop_init failed (%d)\n", status);
+        return -1;
+    }
+
+
+
+#ifdef GDB_DEBUG
+    snoop_run_thread(NULL);
+#else
+     if (pthread_create( &stats_th, (void*)NULL, (void*)slow_path_thread,
+                     (void *) 0))
+     {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "ERROR: stats collection thread failed to start, error code\n"); 
+        return -1;
+     }
+    /* Create the task context for snoop library */
+    if (pthread_create(&snoop_run_th, (void*) NULL, snoop_run_thread, NULL))
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "ERROR: snoop run thread failed to start, error code\n"); 
+        return -1;
+    }
+
+    /* Setup signal handler for SIGTERM */
+    if (signal(SIGTERM, sig_term_handler) == SIG_ERR) {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_WARN,
+            "init_ipsecmgr: cannot handle SIGTERM\n");
+    }
+    /* Wait for the NETAPI Proxy task to finish its processing and exit. */
+    pthread_join (stats_th, NULL);
+    pthread_join (snoop_run_th, NULL);
+#endif
+    return 0;
+}
+
+/**
+ *  @b Description
+ *  @n  
+ *      Utility function to daemonize the current
+ *      application.
+ *
+ *  @param[in]  lock_file
+ *      Lock file to be used by the daemon
+ */
+static void daemonize (const char *lock_file)
+{
+    pid_t       pid, sid;
+    int32_t     lock_fp = -1;
+    char        str[10];
+
+    /* already a daemon */
+    if (getppid () == 1)
+        return;
+
+    /* Fork off the parent process */
+    if ((pid = fork ()) < 0) 
+    {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR, 
+                            "ERROR: daemonize() unable to fork daemon, code=%d (%s)",
+                            errno, 
+                            strerror(errno));
+        exit (-1);
+    }
+
+    /* If we got a PID, then exit the parent process. */
+    if (pid > 0)
+        exit (0);
+
+    /* At this point we are executing as the child process */
+
+    /* Create a new SID for the child process */
+    if ((sid = setsid ()) < 0) 
+    {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR, 
+                            "ERROR: daemonize() unable to create a new session, code %d (%s)",
+                            errno, 
+                            strerror(errno));
+        exit (-1);
+    }
+
+    /* Change the file mode mask */
+    umask (027);
+
+    /* Change the current working directory.  This prevents the current
+     * directory from being locked; hence not being able to remove it. */
+    if ((chdir("/")) < 0) 
+    {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR, 
+                            "ERROR: daemonize() unable to change directory to %s, code %d (%s)",
+                            "/", 
+                            errno, 
+                            strerror(errno));
+        exit (-1);
+    }
+
+    /* Create the lock file */
+    if (lock_file) 
+    {
+        if ((lock_fp = open(lock_file, O_RDWR|O_CREAT, 0640)) < 0 ) 
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR, 
+                                "ERROR: daemonize() unable to create lock file %s, code=%d (%s)",
+                                lock_file, 
+                                errno, 
+                                strerror(errno));
+            exit (-1);
+        }
+    
+
+        if (lockf (lock_fp, F_TLOCK, 0) < 0) 
+            exit(-1); /* can not lock */
+
+        /* Record pid to lockfile */
+        snprintf (str, 10,"%d\n", getpid());
+        write (lock_fp, str, strlen(str));
+        close(lock_fp);
+    }
+    /* Cancel certain signals */
+    signal (SIGCHLD, SIG_DFL); /* A child process dies */
+    signal (SIGTSTP, SIG_IGN); /* Various TTY signals */
+    signal (SIGTTOU, SIG_IGN);
+    signal (SIGTTIN, SIG_IGN);
+    signal (SIGHUP, SIG_IGN); /* Ignore hangup signal */
+    signal (SIGTERM, sig_term_handler); /* catch SIGTERM */
+
+    /* Redirect standard files to /dev/null */
+    freopen( "/dev/null", "r", stdin);
+    freopen( "/dev/null", "w", stdout);
+    freopen( "/dev/null", "w", stderr);
+
+    /* Done setting up the daemon */
+    return;
+}
+
+int get_kernel_config()
+{
+    uint32_t temp=0;
+    FILE *pDts = NULL;
+
+    pDts = fopen(DTS_LOG_FILE_QUEUE_ETHx[0], "rb");
+
+    if(pDts)
+    {
+        if(fread((void*)&temp, sizeof(uint32_t), 1, pDts))
+        {
+            globalDB.qNum = (int)swap32(temp);
+        }
+        fclose(pDts);
+    }
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "main: error opening device tree file: %s\n",DTS_LOG_FILE_QUEUE_ETHx[0]);
+        return -1;
+    }
+#if (defined(DEVICE_K2L) || defined(DEVICE_K2E))
+    globalDB.flowId = 0;
+#else
+    globalDB.flowId = 22;
+#endif
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "get_kernel_config: flow: 0x%x, qNum: 0x%x\n", 
+             globalDB.flowId, globalDB.qNum);
+    return 0;
+}
+
+int create_pktio_channel()
+{
+    static int count = 0;
+    int error = 0;
+    char name[PKTIO_MAX_NAME];
+    PKTIO_HANDLE_T *pktio_channel;
+    PKTIO_CFG_T pktio_cfg;
+    NETCP_CFG_ROUTE_T route;
+    NETCP_CFG_FLOW_T flow;
+    NETCP_CFG_EXCEPTION_PKT_T expPkt_appid = 0;
+
+    memset(&pktio_cfg,0,sizeof(PKTIO_CFG_T));
+    memset((void *)&route, 0, sizeof (NETCP_CFG_ROUTE_T));
+    memset((void *)&flow, 0, sizeof (NETCP_CFG_FLOW_T));
+
+    snprintf(&name[0],PKTIO_MAX_NAME, "%s","offload_0");
+    pktio_cfg.qnum = globalDB.qNum;
+    pktio_cfg.flags1 = PKTIO_RX;
+    pktio_cfg.flags2 = PKTIO_GLOBAL | PKTIO_PKT;
+    pktio_cfg.max_n = 8;
+    pktio_cfg.queueType = Qmss_QueueType_GIC400_QUEUE;
+
+    globalDB.pktio_channel = netapi_pktioCreate(netapi_handle,
+                                               &name[0],
+                                               (PKTIO_CB)recv_cb,
+                                               &pktio_cfg,
+                                               &error);
+    if (!globalDB.pktio_channel)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "create_pktio_channel: failed\n");
+        return -1;
+    }
+
+
+    flow.dma_engine= 1;
+    flow.flowid = globalDB.flowId;
+    route.p_dest_q = globalDB.pktio_channel;
+    route.p_flow = &flow;
+    route.valid_params |= NETCP_CFG_VALID_PARAM_ROUTE_TYPE;
+    route.routeType = NWAL_ROUTE_RX_INTF_W_FLOW;
+    /* enable exception packet handling for fragmented packets */
+    expPkt_appid = netapi_netcpCfgExceptions(netapi_handle,
+                                             7,
+                                             NETCP_CFG_ACTION_TO_SW,
+                                             (NETCP_CFG_ROUTE_HANDLE_T) &route);
+
+    return 0;
+}
+void print_ipsec_stats(Sa_IpsecStats_t* p_saIpsecStats, 
+                                 nwal_saAALG auth,
+                                 nwal_saEALG cipher, 
+                                 uint32_t spi)
+{
+    printf("\nspi: 0x%x, Autentication mode: %d, Encryption Mode: %d\n",
+            spi, auth, cipher);
+    printf("IPSec replayOld:0x%x,replayDup:0x%x,authFail:0x%x \n",
+                   p_saIpsecStats->replayOld,p_saIpsecStats->replayDup,p_saIpsecStats->authFail);
+    printf("IPSec txESN:0x%x,rxESN:0x%x,pktEncHi:0x%x,pktEncLo:0x%x,pktDecHi:0x%x,pktDecLo:0x%x \n",
+                   p_saIpsecStats->txESN,p_saIpsecStats->rxESN,p_saIpsecStats->pktEncHi,
+                   p_saIpsecStats->pktEncLo,p_saIpsecStats->pktDecHi,p_saIpsecStats->pktDecLo);
+}
+/**
+ *  @b Description
+ *  @n  
+ *      Entry point for the NETAPI Proxy application.
+ *
+ *  @param[in]  argc
+ *      Number of arguments passed to the application
+ *  @param[in]  argv
+ *      Arguments passed to the application.
+ *
+ *  @retval
+ *      Success -   0
+ *  @retval
+ *      ERROR   -   >0
+ */
+int32_t main (int argc, char* argv[])
+{
+    int32_t             retVal;
+    int i, iface;
+    char* pTok = NULL;
+    int ip_entry_count = 0;
+    struct ifaddrs *ifaddr, *ifa;
+    int family, s;
+    char host[NI_MAXHOST];
+    struct sockaddr_in6 ipv6_addr;
+    cpu_set_t cpu_set;
+    int c;
+    int statsQueryRequest = 0;
+    void* pShmBase;
+    void* pTemp;
+    void* pShmEntry;
+    int offloaded_sa = 0;
+    static char usage[] = "usage: %s -s <outbound sequence number>\n \
+               -f <SA transmit flow Id>\n \
+               -i<daemon id>\n \
+               -t <stats collection mode\n \
+               -m <master Type ,sysMaster or procMaster >\n";
+
+    memset(&globalDB, 0, sizeof(globalDB));
+    globalDB.sa_tx_flow = -1;
+    globalDB.masterType = NETAPI_SYS_MASTER;
+    int temp;
+    while ((c = getopt (argc, argv, "s:f:i:m:t:")) != -1)
+    {
+       switch (c)
+       {
+            case 's':
+                /* check is user input 0 for oseq_offset (valid but also default)*/
+                if(strncmp("0", optarg,1) == 0)
+                {
+                    globalDB.oseq_offset = 0;
+                }
+                else
+                {
+                    globalDB.oseq_offset = (uint32_t)strtol(optarg, NULL,0);
+                    if(!globalDB.oseq_offset)
+                    {
+                        printf(usage, argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                }
+                break;
+            case 'f':
+                /* check is user input 0 for sa_tx_flow(valid) */
+                if(strncmp("0", optarg,1) == 0)
+                {
+                    globalDB.sa_tx_flow= 0;
+                }
+                else
+                {
+                    globalDB.sa_tx_flow = (uint32_t)strtol(optarg, NULL,0);
+                    if(!globalDB.sa_tx_flow)
+                    {
+                        printf(usage, argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                }
+                break;
+            case 'i':
+                /* check is user input 0 for daemon id, valid */
+                 if(strncmp("0", optarg,1) == 0)
+                 {
+                     globalDB.ipc_id= 0;
+                 }
+                 else
+                 {
+                     globalDB.ipc_id = (uint32_t)strtol(optarg, NULL,0);
+                     if(!globalDB.ipc_id)
+                     {
+                         printf(usage, argv[0]);
+                         exit(EXIT_FAILURE);
+                     }
+                 }
+                 break;
+            case 'm':
+                if(strcmp("sysMaster", optarg) == 0)
+                {
+                    globalDB.masterType = NETAPI_SYS_MASTER;
+                }
+                else if (strcmp("procMaster", optarg) == 0)
+                {
+                    globalDB.masterType = NETAPI_PROC_MASTER;
+                }
+                else
+                {
+                    printf(usage, argv[0]);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+            case 't':
+                if(strcmp("stats", optarg) == 0)
+                   /* running in stats collection mode only */
+                   statsQueryRequest = 1;
+                else
+                {
+                    printf(usage, argv[0]);
+                    exit(EXIT_FAILURE);
+                }
+                break;
+            case '?':
+                printf(usage, argv[0]);
+                exit(EXIT_FAILURE);
+            default:
+                break;
+        }
+    }
+    if(statsQueryRequest)
+    {
+        pShmBase = hplib_shmOpen();
+        if (pShmBase)
+        {
+            if (globalDB.masterType == NETAPI_SYS_MASTER)
+                pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+            else
+                pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
+
+            pIpsecMgrSaStats = (ipsecMgrShm_T*) pTemp;
+
+            for (i = 0; i < IPSECMGR_MAX_SA; i ++)
+            {
+                if(pIpsecMgrSaStats->info_rx[i].in_use)
+                {
+                    offloaded_sa++;
+                    print_ipsec_stats(&(pIpsecMgrSaStats->netapi_sa_stats_rx[i].saIpsecStats), 
+                                 pIpsecMgrSaStats->info_rx[i].authMode,
+                                 pIpsecMgrSaStats->info_rx[i].cipherMode,
+                                 pIpsecMgrSaStats->info_rx[i].spi);
+                }
+            }
+            for (i = 0; i < IPSECMGR_MAX_SA; i ++)
+            {
+                if(pIpsecMgrSaStats->info_tx[i].in_use)
+                {
+                    offloaded_sa++;
+                    print_ipsec_stats(&(pIpsecMgrSaStats->netapi_sa_stats_tx[i].saIpsecStats), 
+                                 pIpsecMgrSaStats->info_tx[i].authMode,
+                                 pIpsecMgrSaStats->info_tx[i].cipherMode,
+                                 pIpsecMgrSaStats->info_tx[i].spi);
+                }
+            }
+        }
+        if(!offloaded_sa)
+            printf("NO Offloaded SA's\n");
+        exit(EXIT_SUCCESS);
+    }
+    ipsecmgr_syslog_init();
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                   "main: oseq_offset: %d, sa_tx_flow: %d\n",
+                    globalDB.oseq_offset, globalDB.sa_tx_flow);
+
+    if (initRm())
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "main: initRm() returned error\n");
+        exit(1);
+    }
+    our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+
+
+    /* assign main net_test thread to run on core 0 */
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+    /* create netapi */
+    netapi_handle = netapi_init(globalDB.masterType,
+                                &our_netapi_default_cfg);
+    if(netapi_handle == NULL)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                             "ERROR: netapi_init failed\n");
+        return -1;
+    }
+    pShmBase = hplib_shmOpen();
+    if (pShmBase)
+    {
+        if (globalDB.masterType == NETAPI_SYS_MASTER)
+        {
+            if (hplib_shmAddEntry(pShmBase,
+                                  sizeof(ipsecMgrShm_T),
+                                 APP_ENTRY_1) != hplib_OK)
+            {
+                return -1;
+            }
+            else
+            {
+                pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+                pIpsecMgrSaStats =  (ipsecMgrShm_T*)pShmEntry;
+                memset(pIpsecMgrSaStats,
+                       0,
+                       sizeof(ipsecMgrShm_T));
+            }
+        }
+        else
+        {
+            if (hplib_shmAddEntry(pShmBase,
+                                  sizeof(ipsecMgrShm_T),
+                                 APP_ENTRY_2) != hplib_OK)
+            {
+                return -1;
+            }
+            else
+            {
+                pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
+                pIpsecMgrSaStats =  (ipsecMgrShm_T*)pShmEntry;
+                memset(pIpsecMgrSaStats,
+                       0,
+                       sizeof(ipsecMgrShm_T));
+            }
+        }
+    }
+    else
+    {
+        exit(1);
+    }
+
+    if (get_kernel_config())
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                            "ERROR: main: get_kernel_config() failed\n");
+        return -1;
+    }
+    else
+    {
+        /* create pktio channel */
+        if(create_pktio_channel())
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                            "ERROR: main: pktio channel creation failed\n");
+            return -1;
+        }
+    }
+     /*Create the proxy daemon. */
+    ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO, "main: calling daemonize\n");
+    daemonize (LOCK_FILE);
+
+    /* Initialize and start the IPSec Mgr Snoop functionality */
+    if ((retVal = init_ipsecmgr ()) < 0)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                            "ERROR: IPSec Mgr init failed, error code %d \n",
+                            retVal);
+        return -1;
+    }
+    else
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                             "main: ipsecmgr daemon shutdonw complete\n");
+
+    exit(EXIT_SUCCESS);
+
+}
diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.c b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.c
new file mode 100755
index 0000000..0b3d1be
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.c
@@ -0,0 +1,629 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+/* Standard includes */
+#include <stdio.h>
+#include <arpa/inet.h>
+#include <inttypes.h>
+
+/* ipsecmgr includes */
+#include <ipsecmgr_snoop.h>
+#include <ipsecmgr_syslog.h>
+
+#include "netapilib_interface.h"
+
+
+extern ipsecMgrMcb_t globalDB;
+extern NETAPI_T netapi_handle;
+extern ipsecMgrShm_T* pIpsecMgrSaStats;
+
+/**************************************************************************
+ * FUNCTION PURPOSE:  Internal function to find a free slot to store APPID
+ *                    in list
+ **************************************************************************
+ * DESCRIPTION:  Internal internal function to find a free slot in SA list for an SA
+ ********************************************************************/
+int findFreeAppIdSlot(ipsecMgrAppId_T *pList)
+{
+    int i;
+    for(i=0;i < IPSECMGR_MAX_SA; i++)
+    {                       
+        if (!pList[i].in_use)
+        {
+            pList[i].in_use = 1; //pending
+            return i;
+        }
+    }
+    return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to find a SA app id  in SA list
+ *                    and free SA Slot entry if specified
+ ********************************************************************
+ * DESCRIPTION:  Internal function to find a SA app id  in SA list
+ *                    and free SA Slot entry if specified
+ ********************************************************************/
+int findAppIdSlot(ipsecMgrAppId_T *pList, uint32_t saAppId, int freeSlot)
+{
+    int i;
+    for(i=0; i< IPSECMGR_MAX_SA; i++)
+    {                       
+        if ((pList[i].in_use) && (pList[i].saAppId == saAppId))
+        {
+            if(freeSlot)
+                pList[i].in_use = 0;
+            return i;
+        }
+    }
+    return -1;
+}
+
+/**************************************************************************
+ * FUNCTION PURPOSE: The function is used to translate the SA configuration
+ * parameters received from the IPSec Snopper and call the NETAPI function
+ * to create a security association
+ ********************************************************************/
+int netapilib_ifAddSA
+(
+    ipsecmgr_af_t               af,
+    ipsecmgr_sa_id_t            *sa_id,
+    ipsecmgr_sa_info_t          *sa_info,
+    ipsecmgr_sa_dscp_map_cfg_t  *dscp_map_cfg,
+    ipsecmgr_ifname_t           *if_name,
+    ipsecmgr_sa_encap_tmpl_t    *encap,
+    ipsecmgr_fp_handle_t        *sa_handle
+)
+{
+    int i;
+    uint8_t                 auth_key[36];
+    uint8_t                 encr_key[36];
+    int error, index,slot;
+    NETAPI_SEC_SA_INFO_T saInfo;
+    nwalSecKeyParams_t  keyParams;
+    void * p_rx_inflow_mode_handle;
+    void * p_tx_inflow_mode_handle;
+    NETCP_CFG_ROUTE_T  route;
+    NETCP_CFG_FLOW_T flow;
+    NETCP_CFG_SA_HANDLE_T pSaHandle;
+    char* pTok = NULL;
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO, 
+                "netapilib_ifAddSA:, DEBUG: Translating SA\n");
+
+    memset((void *)&saInfo, 0, sizeof (NETAPI_SEC_SA_INFO_T));
+    memset((void *)&keyParams, 0, sizeof (nwalSecKeyParams_t));
+    memset((void *)&route, 0, sizeof (NETCP_CFG_ROUTE_T));
+    memset((void *)&flow, 0, sizeof (NETCP_CFG_FLOW_T));
+
+    /* Initialize the SA Config structure. */
+    /* Get the IP protocol version. */
+    if (af == IPSECMGR_AF_IPV4)
+    {
+        saInfo.ipType = nwal_IPV4;
+        /* Populate the source and destination IP addresses. */
+        for (index = 0; index < NWAL_IPV4_ADDR_SIZE; index++)
+        {
+            saInfo.dst.ipv4[index] = sa_id->daddr.ipv4[index];
+            saInfo.src.ipv4[index] = sa_info->saddr.ipv4[index];
+        }
+    }
+    else if (af == IPSECMGR_AF_IPV6)
+    { 
+        saInfo.ipType = nwal_IPV6;
+
+        /* Populate the source and destination IP addresses. */
+        for (index = 0; index < NWAL_IPV6_ADDR_SIZE; index++)
+        {
+            saInfo.dst.ipv6[index] = sa_id->daddr.ipv6[index];
+            saInfo.src.ipv6[index] = sa_info->saddr.ipv6[index];
+        }
+    }
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: Address family (%d) is invalid\n", af);
+        return -1;
+    }
+    /* Get the SPI. */
+    saInfo.spi = sa_id->spi;
+
+    /* Get the SA direction. */
+    if (sa_info->dir == DIR_INBOUND)
+    {
+        slot = findFreeAppIdSlot(&globalDB.rx_sa[0]);
+        if (slot == -1)
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR, 
+                "netapilib_ifAddSA:, Too many INBOUND SAs already offloaded\n");
+            return -1;
+        }
+        saInfo.dir = NWAL_SA_DIR_INBOUND;
+
+        flow.dma_engine= 1;
+        flow.flowid = globalDB.flowId;
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO,
+                           "add_sa:flowid: %d\n",flow.flowid);
+
+        route.p_flow = &flow;
+        route.p_dest_q = globalDB.pktio_channel;
+
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO,
+                       "add_sa: p_dest_q: 0x%x, flowId: 0x%x\n",
+                       route.p_dest_q,
+                       route.p_flow->flowid);
+       route.valid_params |= NETCP_CFG_VALID_PARAM_ROUTE_TYPE;
+       route.routeType = NWAL_ROUTE_RX_INTF_W_FLOW;
+    }
+    else if (sa_info->dir == DIR_OUTBOUND)
+    {
+        slot = findFreeAppIdSlot(&globalDB.tx_sa[0]);
+        if (slot == -1)
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR, 
+                "netapilib_ifAddSA:, Too many OUTBOUND SAs already offloaded\n");
+            return -1;
+        }
+        saInfo.dir = NWAL_SA_DIR_OUTBOUND;
+    }
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: IPSec direction (%d) is invalid\n", sa_info->dir);
+        return -1;
+    }
+    
+
+    /* Get the replay Window */
+    saInfo.replayWindow = sa_info->replay_window;
+   
+    /* Get the IPSec protocol. */
+    if (sa_id->proto == SA_PROTO_AH)
+        saInfo.proto = nwal_IpSecProtoAH;
+    else if (sa_id->proto == SA_PROTO_ESP)
+        saInfo.proto = nwal_IpSecProtoESP;
+    else
+    {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_INFO,
+            "netapilib_ifAddSA: IPSec protocol (%d) is invalid.\n", sa_id->proto);
+        return -1;
+    }
+    /* Get the IPSec mode. */
+    if (sa_info->mode == SA_MODE_TRANSPORT)
+        saInfo.saMode = nwal_SA_MODE_TRANSPORT;
+    else if (sa_info->mode == SA_MODE_TUNNEL)
+        saInfo.saMode = nwal_SA_MODE_TUNNEL;
+    else
+    {
+        ipsecmgr_syslog_msg(SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: IPSec mode (%d) is invalid.\n", sa_info->mode);
+        return -1;
+    }
+    /* Get the authentication mode algorithm. */
+    if (sa_info->auth.algo == SA_AALG_HMAC_SHA1)
+        saInfo.authMode = NWAL_SA_AALG_HMAC_SHA1;
+    else if (sa_info->auth.algo == SA_AALG_HMAC_MD5)
+        saInfo.authMode = NWAL_SA_AALG_HMAC_MD5;
+    else if (sa_info->auth.algo == SA_AALG_AES_XCBC)
+        saInfo.authMode = NWAL_SA_AALG_AES_XCBC;
+    else if (sa_info->auth.algo == SA_AALG_HMAC_SHA2_256)
+        saInfo.authMode = NWAL_SA_AALG_HMAC_SHA2_256;
+    else if (sa_info->auth.algo == SA_AALG_NONE || sa_info->auth.algo == SA_AALG_NULL)  
+        saInfo.authMode = NWAL_SA_AALG_NULL;
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "netapilib_ifAddSA: Authentication algorithm (%d) is invalid\n", sa_info->auth.algo);
+        return -1;
+    }
+
+    /* Get the encryption mode algorithm. */
+    if (sa_info->enc.algo == SA_EALG_NULL) 
+        saInfo.cipherMode = NWAL_SA_EALG_NULL;
+    else if (sa_info->enc.algo == SA_EALG_AES_CTR) 
+        saInfo.cipherMode = NWAL_SA_EALG_AES_CTR;
+    else if (sa_info->enc.algo == SA_EALG_AES_CBC)
+        saInfo.cipherMode = NWAL_SA_EALG_AES_CBC;
+    else if (sa_info->enc.algo == SA_EALG_3DES_CBC) 
+        saInfo.cipherMode = NWAL_SA_EALG_3DES_CBC;
+    else if (sa_info->enc.algo == SA_EALG_DES_CBC) 
+        saInfo.cipherMode = NWAL_SA_EALG_DES_CBC;
+    else if (sa_info->enc.algo == SA_EALG_AES_GCM)
+        saInfo.cipherMode = NWAL_SA_EALG_AES_GCM;
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: Encryption algorithm (%d) is invalid\n", sa_info->enc.algo);
+        return -1;
+    }
+    /* Validate the key lengths. */
+    if ((keyParams.macKeySize = sa_info->auth_key_len) > 32)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: Authentication key size (%d) is invalid.\n", sa_info->auth_key_len);
+        return -1;
+    }
+    if ((keyParams.encKeySize = sa_info->enc_key_len) > 32)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSA: Encryption key size (%d) is invalid.\n", sa_info->enc_key_len);
+        return -1;
+    }
+
+    /* Get the authentication/encryption keys. */
+    keyParams.pAuthKey = &sa_info->auth_key[0];
+    keyParams.pEncKey = &sa_info->enc_key[0];
+
+    if (saInfo.dir == NWAL_SA_DIR_INBOUND)
+    {
+        /* Inbound == RX */
+        globalDB.rx_sa[slot].saAppId =  netapi_secAddSA(netapi_handle,
+                        NETCP_CFG_NO_INTERFACE,
+                        &saInfo,
+                        &keyParams,
+                        NETAPI_SEC_SA_INFLOW,
+                        (NETCP_CFG_ROUTE_HANDLE_T)&route,
+                        &p_rx_inflow_mode_handle,
+                        &p_tx_inflow_mode_handle,
+                        NULL, &error);
+
+        if (error == NETAPI_ERR_OK)
+        {
+            *sa_handle = globalDB.rx_sa[slot].saAppId;
+            globalDB.rx_sa[slot].authMode = saInfo.authMode;
+            globalDB.rx_sa[slot].cipherMode = saInfo.cipherMode;
+            globalDB.rx_sa[slot].spi = saInfo.spi;
+        }
+        else
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                                "netapilib_ifAddSA: netapi_secAddSA returned error: %d.\n",
+                                 error);
+            return -1;
+        }
+    }
+    else
+    {
+        saInfo.esnLo = sa_info->esnlo + globalDB.oseq_offset;
+
+        /* OUTBOUND == TX */
+        globalDB.tx_sa[slot].saAppId = netapi_secAddSA(netapi_handle,
+                        NETCP_CFG_NO_INTERFACE,
+                        &saInfo,
+                        &keyParams,
+                        NETAPI_SEC_SA_INFLOW,
+                        (NETCP_CFG_ROUTE_HANDLE_T)NULL,
+                        &p_rx_inflow_mode_handle,
+                        &p_tx_inflow_mode_handle,
+                        NULL, &error);
+        if (error == NETAPI_ERR_OK)
+        {
+            *sa_handle = globalDB.tx_sa[slot].saAppId;
+            globalDB.tx_sa[slot].authMode = saInfo.authMode;
+            globalDB.tx_sa[slot].cipherMode = saInfo.cipherMode;
+            globalDB.tx_sa[slot].spi = saInfo.spi;
+        }
+        else
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                                "netapilib_ifAddSA: netapi_secAddSA returned error: %d.\n",
+                                 error);
+            return -1;
+        }
+    }
+    
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+    "netapilib_ifAddSA: Translation of SA successful, app_id: 0x%x\n", *sa_handle);
+
+    /* SA was created successfully. */
+    return 0;
+}
+
+/**************************************************************************
+ * FUNCTION PURPOSE: The function is used to translate the SA configuration
+ * parameters received from the IPSec Snopper and call the NETAPI function
+ * to delete a security association
+ ********************************************************************/
+int netapilib_ifDeleteSA (ipsecmgr_fp_handle_t sa_handle)
+{
+    int error = 0;
+    int slot = 0;
+
+    slot = findAppIdSlot(&globalDB.rx_sa[0],sa_handle, 1);
+
+    /* Determine if rx_sa or tx_sa is being deleted */
+    if (slot != -1)
+    {
+        pIpsecMgrSaStats->info_rx[slot].in_use = 0;
+        /* found rx SA, see if there is policy assoicated with rx SA
+           if so, then delete it first*/
+        if (globalDB.rx_sa[slot].spAppId)
+        {    
+            netapi_secDelRxPolicy(netapi_handle,
+                              (NETCP_CFG_IPSEC_POLICY_T) globalDB.rx_sa[slot].spAppId,
+                              &error);
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "netapilib_ifDeleteSA: SP deleted: sp_app_id: 0x%x, slot: %d, error: %d\n", 
+                globalDB.rx_sa[slot].spAppId, slot, error);
+        }
+            netapi_secDelSA(netapi_handle,
+                        NETCP_CFG_NO_INTERFACE,
+                        (NETCP_CFG_SA_T) sa_handle,
+                        &error);
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "netapilib_ifDeleteSA: SA deleted: sa_app_id: 0x%x, slot: %d, error: %d\n", 
+                sa_handle, slot, error);
+            
+        
+    }
+    else
+    {
+        /* not rx SA, check for tx_sa */
+        slot = findAppIdSlot(&globalDB.tx_sa[0], sa_handle, 1);
+    
+        if (slot != -1)
+        {
+            pIpsecMgrSaStats->info_tx[slot].in_use = 0;
+            /* found tx SA, delete it now */
+            netapi_secDelSA(netapi_handle,
+                        NETCP_CFG_NO_INTERFACE,
+                        (NETCP_CFG_SA_T) sa_handle,
+                        &error);
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+                "netapilib_ifDeleteSA: SA deleted: sa_app_id: 0x%x, slot: %d, error: %d\n", 
+                sa_handle, slot, error);
+        }
+        else
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifDeleteSA: sa_app_id 0x%x not found in internal list\n", 
+                sa_handle);
+            return -1;
+        }
+    }
+
+    return error;
+}
+
+/**************************************************************************
+ * FUNCTION PURPOSE: The function is used to translate the SP configuration
+ * parameters received from the IPSec Snopper and call the NETAPI function
+ * to create a security policy
+ ********************************************************************/
+int32_t netapilib_ifAddSP
+(
+    ipsecmgr_af_t           af,
+    ipsecmgr_selector_t     *sel,
+    ipsecmgr_dir_t          dir,
+    uint32_t                reqid,
+    ipsecmgr_fp_handle_t    sa_handle, 
+    ipsecmgr_policy_id_t    policy_id,
+    ipsecmgr_fp_handle_t    *sp_handle
+)
+{
+#ifdef ENABLE_ADD_POLICY
+#warning "ENABLE_ADD_POLICY"
+    NETCP_CFG_IPSEC_POLICY_T spAppIdIn;
+    int error, index, slot;
+    nwal_IpType ipType;
+    nwalIpAddr_t src_ip_addr;
+    nwalIpAddr_t dst_ip_addr;
+    nwalIpOpt_t ip_qualifiers;
+    NETCP_CFG_SA_T sa =(NETCP_CFG_SA_T)sa_handle;
+    NETCP_CFG_ROUTE_T  route;
+    NETCP_CFG_FLOW_T flow;
+    NETCP_CFG_PA_HANDLE_T pPaHandleOuterIP;
+    NETCP_CFG_PA_HANDLE_T pPaHandleInnerIP;
+    NETCP_CFG_SA_HANDLE_T pSaHandle;
+
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,"netapilib_ifAddSP: called\n");
+
+
+    if (dir == DIR_OUTBOUND)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "netapilib_ifAddSP: called for outbound SA, no RX policy required\n");
+        return 0;
+    }
+    slot = findAppIdSlot(&globalDB.rx_sa[0],sa_handle, 0);
+    if (slot == -1)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR, 
+            "netapilib_ifAddSA:, SA app_id not found\n");
+        return -1;
+    }
+
+
+
+    flow.dma_engine= 1;
+    flow.flowid = globalDB.flowId;
+    route.p_flow = &flow;
+    route.p_dest_q = globalDB.pktio_channel;
+
+
+    /* Get the IP protocol version. */
+    if (af == IPSECMGR_AF_IPV4)
+    {
+        ipType = nwal_IPV4;
+        /* Populate the source and destination IP addresses. */
+        for (index = 0; index < NWAL_IPV4_ADDR_SIZE; index++)
+        {
+            dst_ip_addr.ipv4[index] = sel->daddr.ipv4[index];
+            src_ip_addr.ipv4[index] = sel->saddr.ipv4[index];
+        }
+    }
+    else if (af == IPSECMGR_AF_IPV6)
+    { 
+        ipType = nwal_IPV6;
+        /* Populate the source and destination IP addresses. */
+        for (index = 0; index < NWAL_IPV6_ADDR_SIZE; index++)
+        {
+            dst_ip_addr.ipv6[index] = sel->daddr.ipv6[index];
+            src_ip_addr.ipv6[index] = sel->saddr.ipv6[index];
+        }
+    }
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+            "netapilib_ifAddSP: Address family (%d) is invalid\n", af);
+        return -1;
+    }
+
+    globalDB.rx_sa[slot].spAppId = netapi_secAddRxPolicy(netapi_handle,
+                                     (NETCP_CFG_SA_T) sa_handle,
+                                     ipType,
+                                     &src_ip_addr,
+                                     &dst_ip_addr,
+                                     NULL,
+                                     (NETCP_CFG_ROUTE_HANDLE_T)&route,
+                                     NULL,
+                                     &error);
+
+    if (error == NETAPI_ERR_OK)
+    {
+            *sp_handle = globalDB.rx_sa[slot].spAppId;
+    }
+    else
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                      "netapilib_ifAddSA: netapi_secAddRxPolicy returned error: %d.\n",
+                       error);
+        return -1;
+        }
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+    "netapilib_ifAddSA: Translation of SP successful, app_id: 0x%x\n", *sp_handle);
+
+#endif
+    return 0;
+}
+
+/**************************************************************************
+ * FUNCTION PURPOSE: The function is used to translate the SP configuration
+ * parameters received from the IPSec Snopper and call the NETAPI function
+ * to delete a security association
+ ********************************************************************/
+int32_t netapilib_ifDeleteSP
+(
+    ipsecmgr_fp_handle_t    sp_handle,
+    ipsecmgr_policy_id_t    policy_id,
+    ipsecmgr_dir_t          dir
+)
+{
+    /* Security Policy is deleted as part of deleting SA */
+    return 0;
+#if 0
+    int error =0;
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,"netapilib_ifDeleteSP: called\n");
+
+    if (dir == DIR_OUTBOUND)
+    {
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "netapilib_ifDeleteSP: called for outbound SA, no RX policy to delete\n");
+            return 0;
+    }
+    netapi_secDelRxPolicy(netapi_handle,
+                          (NETCP_CFG_IPSEC_POLICY_T) sp_handle,
+                          &error);
+                          
+    return 0;
+#endif
+}
+
+/**************************************************************************
+ * FUNCTION PURPOSE: The function is used to translate the SA configuration
+ * parameters received from the IPSec Snopper and retrieve SA context
+ * information for SA.
+ *************************************************************************/
+int netapilib_ifGetSACtx
+(
+    ipsecmgr_fp_handle_t    sa_handle,
+    ipsecmgr_sa_hw_ctx_t*   hw_ctx
+)
+{
+    uint32_t swInfo0 = 0;
+    uint32_t swInfo1 = 0;
+    nwalGlobCxtInfo_t info;
+    nwal_RetValue retVal;
+
+    memset(&info, 0, sizeof(nwalGlobCxtInfo_t));
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) netapi_handle;
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,"netapilib_ifGetSACtx: called\n");
+
+
+    if(netapip_netcpCfgGetSaInflowInfo(&netapi_get_global()->nwal_context,
+                                    (NETCP_CFG_SA_T) sa_handle,
+                                    &swInfo0,
+                                    &swInfo1))
+    {
+        hw_ctx->swinfo[0] = swInfo0;
+        hw_ctx->swinfo[1] = swInfo1;
+    }
+    hw_ctx->swinfo_sz = 2;
+
+ 
+    if(globalDB.sa_tx_flow == -1)
+    {
+       retVal = nwal_getGlobCxtInfo(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                      &info);
+        if (retVal != nwal_OK)
+        {
+            ipsecmgr_syslog_msg (SYSLOG_LEVEL_ERROR,
+                "netapilib_ifGetSACtx: nwal_getGlobCxtInfo returned error: 0x%x\n", retVal);
+            return -1;
+        }
+        hw_ctx->flow_id = info.rxSaPaFlowId;
+        ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "netapilib_ifGetSACtx: rxPaSaflowId: 0x%x, rxSaPaflowId: 0x%x\n",
+            info.rxPaSaFlowId,
+            info.rxSaPaFlowId);
+    }
+    else
+    {
+        hw_ctx->flow_id = globalDB.sa_tx_flow;
+    }
+
+    ipsecmgr_syslog_msg (SYSLOG_LEVEL_INFO,
+            "netapilib_ifGetSACtx: swInfo0: 0x%x, swInfo1: 0x%x, flowId: 0x%x\n",
+            hw_ctx->swinfo[0],
+            hw_ctx->swinfo[1],
+            hw_ctx->flow_id);
+
+   /* return success */
+    return 0;
+}
+
+
+
+
+
+
diff --git a/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.h b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.h
new file mode 100644
index 0000000..8784732
--- /dev/null
+++ b/ti/runtime/netapi/applications/ipsec_offload/ipsecmgr/src/netapilib_interface.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+#ifndef __FPLIB_INTERFACE_H__
+#define __FPLIB_INTERFACE_H__
+
+#include "ti/runtime/netapi/netapi.h"
+#include <netdb.h>
+
+
+#define IPSECMGR_MAX_SA 64
+/* Container for applicaion ID's for offloaded SA's */
+typedef struct {
+    int         in_use;
+    uint32_t    saAppId;
+    uint32_t    spAppId;
+    uint32_t            spi;
+    nwal_saAALG         authMode;       /**< Authentication Algorithm */
+    nwal_saEALG         cipherMode;     /**< Encryption Algorithm */
+} ipsecMgrAppId_T;
+
+typedef struct {
+    ipsecMgrAppId_T info_rx[IPSECMGR_MAX_SA];
+    ipsecMgrAppId_T info_tx[IPSECMGR_MAX_SA];
+    NETAPI_SA_STATS_T netapi_sa_stats_rx[IPSECMGR_MAX_SA];
+    NETAPI_SA_STATS_T netapi_sa_stats_tx[IPSECMGR_MAX_SA];
+} ipsecMgrShm_T;
+typedef struct {
+    int             flowId;
+    int             qNum;
+    PKTIO_HANDLE_T* pktio_channel;
+
+    /* list to store offloaded RX SA appIds and RX Policies */
+    ipsecMgrAppId_T rx_sa[IPSECMGR_MAX_SA];
+    /* list to store offloaded TX SA appIds */
+    ipsecMgrAppId_T tx_sa[IPSECMGR_MAX_SA];
+    uint32_t        oseq_offset; /* offset to outbound/egress sequence number */
+    int             sa_tx_flow;  /* flow SA to use to transmit packet */
+    int             ipc_id;      /* ipc_id to give name uniqueness to socket
+                                    connection with command shell */
+    int             masterType;  /* Specifies to run the daemon as NETAPI_SYS_MASTER or
+                                    NETAPI_PROC_MASTER */
+} ipsecMgrMcb_t;
+
+int netapilib_ifAddSA
+(
+    ipsecmgr_af_t           af,
+    ipsecmgr_sa_id_t        *sa_id,
+    ipsecmgr_sa_info_t      *sa_info,
+    ipsecmgr_sa_dscp_map_cfg_t *dscp_map_cfg,
+    ipsecmgr_ifname_t       *if_name,
+    ipsecmgr_sa_encap_tmpl_t *encap,
+    ipsecmgr_fp_handle_t    *sa_handle
+);
+
+int netapilib_ifAddSP
+(
+    ipsecmgr_af_t           af,
+    ipsecmgr_selector_t     *sel,
+    ipsecmgr_dir_t          dir,
+    uint32_t                reqid,
+    ipsecmgr_fp_handle_t    sa_handle,
+    ipsecmgr_policy_id_t    policy_id,
+    ipsecmgr_fp_handle_t    *sp_handle
+);
+
+int netapilib_ifDeleteSP
+(
+    ipsecmgr_fp_handle_t   sp_handle,
+    ipsecmgr_policy_id_t   policy_id,
+    ipsecmgr_dir_t         dir
+);
+
+int netapilib_ifDeleteSA
+(
+    ipsecmgr_fp_handle_t   sa_handle
+);
+
+int netapilib_ifGetSACtx
+(
+    ipsecmgr_fp_handle_t    sa_handle,
+    ipsecmgr_sa_hw_ctx_t    *hw_ctx
+);
+
+#endif
+
diff --git a/ti/runtime/netapi/build/Makefile b/ti/runtime/netapi/build/Makefile
new file mode 100755
index 0000000..87c6868
--- /dev/null
+++ b/ti/runtime/netapi/build/Makefile
@@ -0,0 +1,126 @@
+# Macro definitions referenced below
+#
+empty =
+space =$(empty) $(empty)
+
+# INCLUDE Directories
+QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
+SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
+CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+
+
+NETAPI_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+
+#HPLIB_INC_DIR = $(HPLIB_INSTALL_PATH)/ti/runtime/hplib
+
+HPLIB_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/runtime/hplib
+INCDIR := $(PDK_INSTALL_PATH);$(QMSS_INC_DIR);$(CPPI_INC_DIR);$(HPLIB_INC_DIR);$(NETAPI_INC_DIR)
+
+export PDK_VER ?= v3
+NETAPI_NAVIG_INIT_SRC=$(NETAPI_SRC_DIR)/src/pdk$(PDK_VER)
+
+ifeq ($(CPU), cortex-a8)
+        CFLAGS += -DCORTEX_A8
+endif
+
+export DEVICE?= k2h
+ifeq ($(PDK_VER),v3)
+QMSS_DEV_DIR = $(PDK_INSTALL_PATH)/ti/drv/qmss/device/$(DEVICE)/src
+CPPI_DEV_DIR = $(PDK_INSTALL_PATH)/ti/drv/cppi/device/$(DEVICE)/src
+endif
+ifeq ($(PDK_VER),v2)
+QMSS_DEV_DIR = $(PDK_INSTALL_PATH)/ti/drv/qmss/device
+CPPI_DEV_DIR = $(PDK_INSTALL_PATH)/ti/drv/cppi/device
+endif
+
+# Set NETAPI INSTALL PATH to Transport SDK for default
+export NETAPI_INSTALL_PATH ?= $(TRANS_SDK_INSTALL_PATH)
+
+NETAPI_DOCS_DIR := $(NETAPI_INSTALL_PATH)/ti/runtime/netapi/docs
+ 
+#NETAPI dirs
+OBJEXT = o
+INTERNALLINKDEFS =
+SRCDIR = ./src
+#VPATH=$(SRCDIR):$(NETAPI_NAVIG_INIT_SRC)
+VPATH=$(SRCDIR):./src/pdk$(PDK_VER)
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+#Cross tools
+#CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc -c
+#AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar -r
+
+
+#List the COMMONSRC Files
+COMMONSRCC = \
+    netapi.c \
+    netapi_sec.c \
+    netapi_init.c \
+    netapi_sched.c \
+    netcp_cfg.c \
+    pktio.c \
+    netapi_navig.c\
+
+CFLAGS+= $(DEBUG_FLAG) -I.  -I $(SRCDIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(TRANS_SDK_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(HPLIB_INC_DIR) -I$(QMSS_DEV_DIR) -I$(CPPI_DEV_DIR) -I$(NETAPI_NAVIG_INIT_SRC) -I$(SA_INSTALL_PATH) $(CSL_DEVICE)  -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DMAKEFILE_BUILD -DNWAL_ENABLE_SA -pthread -D _GNU_SOURCE
+
+
+
+INCS = -I$(strip $(subst ;, -I,$(subst $(space),\$(space),$(INCDIR))))
+all: lib
+
+lib: $(ARMV7LIBDIR)/libnetapi_$(DEVICE).a
+
+
+# Make Rule for the COMMONSRC Files
+COMMONSRCCOBJS = $(patsubst %.c, $(ARMV7OBJDIR)/%.$(OBJEXT), $(COMMONSRCC))
+COMMONSRCCOBJS_SO = $(patsubst %.c, $(ARMV7OBJDIR_SO)/%.$(OBJEXT), $(COMMONSRCC))
+
+$(COMMONSRCCOBJS): $(ARMV7OBJDIR)/%.$(OBJEXT): %.c
+        -@echo compiling $< ........
+        -@echo vpath = $(VPATH)
+        @mkdir -p $(ARMV7OBJDIR)
+        $(CC) -c $(CFLAGS) $(INCS)  $< -o $@
+
+$(COMMONSRCCOBJS_SO): $(ARMV7OBJDIR_SO)/%.$(OBJEXT): %.c
+        -@echo **** compiling this file $< ...
+        @mkdir -p $(ARMV7OBJDIR_SO)
+        $(CC) -c $(CFLAGS) -fPIC $(INCS)  $< -o $@
+
+$(ARMV7LIBDIR)/libnetapi_$(DEVICE).a: $(COMMONSRCCOBJS)
+        @mkdir -p $(ARMV7LIBDIR)
+        @echo archiving $? into $@ ...
+        @$(AR) -r $@ $?
+
+
+libnetapi_$(DEVICE).so: $(COMMONSRCCOBJS_SO)
+        -@echo archiving $? into $(ARMV7LIBDIR)/$@.1 ...
+        @$(CC) $(DEBUG_FLAG) -ggdb2 -Wl,-soname=$@.1 -shared -fPIC ${LDFLAGS} -o $@.1.0.0 $^
+        @ln -s $@.1.0.0 $@.1
+        @ln -s $@.1     $@
+        mkdir -p $(ARMV7LIBDIR)
+        @mv -f $@.1.0.0 $(ARMV7LIBDIR)/$@.1.0.0
+        @mv -f $@.1 $(ARMV7LIBDIR)/$@.1
+        @mv -f $@   $(ARMV7LIBDIR)/$@
+
+clean:
+        rm -f $(ARMV7OBJDIR)/*.o
+        rm -f $(ARMV7OBJDIR_SO)/*.o
+        rm -f $(ARMV7LIBDIR)/libnetapi_$(DEVICE).a
+        rm -f $(ARMV7LIBDIR)/libnetapi_$(DEVICE).so*
+
+doxygen:
+        rm -rf $(NETAPI_DOCS_DIR)/html
+        rm -rf $(NETAPI_DOCS_DIR)/latex
+        doxygen netapi_doxygen.cfg
+
+clean_doxygen:
+        rm -rf $(NETAPI_DOCS_DIR)/html
+        rm -rf $(NETAPI_DOCS_DIR)/latex
+
diff --git a/ti/runtime/netapi/build/netapi_doxygen.cfg b/ti/runtime/netapi/build/netapi_doxygen.cfg
new file mode 100755
index 0000000..9eff4f5
--- /dev/null
+++ b/ti/runtime/netapi/build/netapi_doxygen.cfg
@@ -0,0 +1,1555 @@
+# Doxyfile 1.6.3
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project
+#
+# All text after a hash (#) is considered a comment and will be ignored
+# The format is:
+#       TAG = value [value, ...]
+# For lists items can also be appended using:
+#       TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (" ")
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = netapi 
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ../docs/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = NO 
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses.
+# With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this tag.
+# The format is ext=language, where ext is a file extension, and language is one of
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen to replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penality.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will rougly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES 
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
+# doxygen. The layout file controls the global structure of the generated output files
+# in an output format independent way. The create the layout file that represents
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name
+# of the layout file.
+
+LAYOUT_FILE            =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = ../netapi.h ../netcp_cfg.h ../netapi_sec.h ../netapi_tune.h ../netapi_sched.h ../pktio.h ../netapi_types.h ../netapi_ver.h
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+
+FILE_PATTERNS          = *.h
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# is applied to all files.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range [1..20])
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header.
+
+HTML_HEADER            = ../docs/tiheader.htm
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            = ../docs/tifooter.htm
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
+# are set, an additional index file will be generated that can be used as input for
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
+# For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+#  plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# This tag can be used to set the number of enum values (range [1..20])
+# that doxygen will group on one line in the generated HTML documentation.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = NO
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be implemented using a PHP enabled web server instead of at the web client using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server based approach is that it scales better to large projects and allows full text search. The disadvances is that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# in the INCLUDE_PATH (see below) will be search if a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           = ..
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  = *.h
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
+# the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
+# powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# By default doxygen will write a font called FreeSans.ttf to the output
+# directory and reference it in all dot files that doxygen generates. This
+# font does not include all possible unicode characters however, so when you need
+# these (or just want a differently looking font) you can specify the font name
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are png, jpg, or gif
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to the search engine   
+#---------------------------------------------------------------------------
+SEARCHENGINE           = NO
diff --git a/ti/runtime/netapi/demo/build/Makefile b/ti/runtime/netapi/demo/build/Makefile
new file mode 100755
index 0000000..c85ee5b
--- /dev/null
+++ b/ti/runtime/netapi/demo/build/Makefile
@@ -0,0 +1,127 @@
+#
+empty =
+space =$(empty) $(empty)
+
+export ARMV7OBJDIR ?= ./obj
+export ARMV7BINDIR ?= ./bin
+export ARMV7LIBDIR ?= ./lib
+export ARMV7SALIBDIR ?= ./lib
+
+DPI_DEMO_SRC_DIR ?= $(PWD)
+# INCLUDE Directories
+SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
+QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
+CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+RM_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/rm
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+NETAPI_INC_DIR ?=  $(TRANS_SDK_INSTALL_PATH)
+HPLIB_INC_DIR ?=  $(HPLIB_INSTALL_PATH)
+NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
+PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
+
+
+ifndef NAVL_INSTALL_PATH
+ $(error  NAVL_INSTALL_PATH is undefined)
+else
+NAVL_INSTALL_PATH ?= /home/a0868410/git
+NAVL_LIB_DIR ?= $(NAVL_INSTALL_PATH)/navl/lib
+NAVL_INC_DIR ?= $(NAVL_INSTALL_PATH)
+endif
+
+#TRIE_OBJS=$(ARMV7OBJDIR)/netapi/test/trie.o
+
+NT_RM_OBJS = $(ARMV7OBJDIR)/netapi/utils/sockutils.o  $(ARMV7OBJDIR)/netapi/utils/netapi_util_rm.o
+
+DPI_DEMO_OBJS= $(ARMV7OBJDIR)/netapi/demo/src/transport_dpi_demo.o $(ARMV7OBJDIR)/netapi/demo/src/navl_wrapper.o $(ARMV7OBJDIR)/netapi/demo/src/navl_external_posix.o
+
+# Support Libraries used by dpi-demo 
+CSL_DEVICE ?= -DDEVICE_K2E -DNSS_GEN2
+QMSS_LIB = -lqmss
+CPPI_LIB = -lcppi
+PA_LIB = -lpa2
+NWAL_LIB = -lnwalsa_k2e
+SA_LIB = -lsa
+RM_LIB = -lrm
+PKTLIB_LIB = -lpktlib
+NETAPI_LIB =-lnetapi_k2e
+HP_LIB = -lhplib_k2e
+NAVL_LIB = -lnavl
+
+local_base=/usr/local
+LDFLAGS = -L. -L$(local_base)/lib
+
+LIBS = -static $(QMSS_LIB) $(CPPI_LIB) $(PA_LIB) $(PKTLIB_LIB) $(NETAPI_LIB) $(HP_LIB) $(SA_LIB) $(NWAL_LIB) $(RM_LIB) -Wl,-Bdynamic
+
+LIBS += $(NAVL_LIB) -lstdc++ -lgcc_s
+
+SYSTYPE:=$(shell uname)
+ifeq ($(SYSTYPE), Linux)
+LIBS += -ldl -lm
+else
+LIBS += -lexecinfo
+endif
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+INCLUDE = -I. -I$(local_base)/include -I../ -I$(HPLIB_INC_DIR) -I$(NETAPI_INC_DIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(RM_INC_DIR) -I$(NAVL_INC_DIR) $(CSL_DEVICE)
+
+CFLAGS += $(DEBUG_FLAG) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+# Linker options
+INTERNALLINKDEFS = -Wl,--start-group $(LIBS) -Wl,--end-group -lrt -pthread  -L$(ARMV7LIBDIR) -L$(ARMV7SALIBDIR) -L$(NAVL_LIB_DIR)
+
+EXE_NAME=transport_dpi_demo
+BIN_DIR = $(ARMV7BINDIR)/netapi/demo
+all: demo install
+
+demo: $(ARMV7BINDIR)/netapi/demo/.created $(BIN_DIR)/$(EXE_NAME)
+
+clean:  
+        rm -f $(ARMV7OBJDIR)/netapi/demo/src/*.o
+        rm -f $(ARMV7BINDIR)/netapi/demo/*
+        
+
+#$(ARMV7OBJDIR)/netapi/demo/src/%.o: %.c $(NETAPI_SRC_DIR)/demo/src/%.c $(ARMV7OBJDIR)/netapi/demo/src/.created
+$(ARMV7OBJDIR)/netapi/demo/src/%.o: $(NETAPI_SRC_DIR)/demo/src/%.c $(ARMV7OBJDIR)/netapi/demo/src/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS) $(INCLUDE) $< -o $@
+
+$(ARMV7OBJDIR)/netapi/demo/src/.created:
+        @mkdir -p $(ARMV7OBJDIR)/netapi/demo/src/
+
+$(ARMV7BINDIR)/netapi/demo/.created:
+        @mkdir -p $(ARMV7BINDIR)/netapi/demo/
+
+$(ARMV7BINDIR)/netapi/demo/$(EXE_NAME): $(NT_RM_OBJS) $(DPI_DEMO_OBJS)
+        $(CC) $(LDFLAGS) $(DPI_DEMO_OBJS) $(NT_RM_OBJS) $(INTERNALLINKDEFS) $(INCLUDE) -o $(BIN_DIR)/$(EXE_NAME)
+
+
+$(ARMV7OBJDIR)/netapi/utils/%.o: $(NETAPI_SRC_DIR)/utils/%.c $(ARMV7OBJDIR)/netapi/utils/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS) $(INCLUDE) $< -o $@
+
+$(ARMV7OBJDIR)/netapi/utils/.created:
+        @mkdir -p $(ARMV7OBJDIR)/netapi/utils/
+
+install:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(BIN_DIR)/$(EXE_NAME) $(INSTALL_BIN_BASE_DIR)/$(EXE_NAME)
+        install -d $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/transport_dpi_demo_setup.sh    $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/index.html               $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/dpicgi1.sh               $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/dpicgi2.sh               $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/dpicgi3.sh               $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/dpicgi4.sh               $(SYSCONFDIR)/transportnetlib
+        install -c -m 755 demo/demo_setup_files/dpicgi5.sh               $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/stats1.awk                      $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/stats2.awk                      $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/stats3.awk                      $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/stats4.awk                      $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/tilogo.gif                      $(SYSCONFDIR)/transportnetlib
+        install -c demo/demo_setup_files/titagline.gif                      $(SYSCONFDIR)/transportnetlib
diff --git a/ti/runtime/netapi/demo/demo_setup_files/dpicgi1.sh b/ti/runtime/netapi/demo/demo_setup_files/dpicgi1.sh
new file mode 100755
index 0000000..e817deb
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/dpicgi1.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#dump mac addresses from switch
+echo Content-type: text/html
+echo
+echo
+echo "<HTML>"
+echo "<HEAD>"
+echo "</HEAD>"
+echo "<BODY>"
+echo "<H2> MAC Addresses From Switch ALE </H2>"
+echo "<PRE>"
+cat /sys/devices/soc.0/24000000.netcp/ale_table | grep "touched" | grep "addr" | cut -d ' ' -f 10-
+echo "</PRE>"
+echo "<A href=\"\index.html\"> <p><u>RETURN</u></p> </A>"
+echo "</BODY>"
+echo "</HTML>"
\ No newline at end of file
diff --git a/ti/runtime/netapi/demo/demo_setup_files/dpicgi2.sh b/ti/runtime/netapi/demo/demo_setup_files/dpicgi2.sh
new file mode 100755
index 0000000..a749a35
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/dpicgi2.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+echo Content-type: text/html
+echo
+echo
+#dump proto seen stat
+#awk -f ../stats1.awk  ../stats2.txt
+/usr/bin/transport_dpi_demo stats | awk -f ../stats1.awk
diff --git a/ti/runtime/netapi/demo/demo_setup_files/dpicgi3.sh b/ti/runtime/netapi/demo/demo_setup_files/dpicgi3.sh
new file mode 100755
index 0000000..2df8654
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/dpicgi3.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+echo Content-type: text/html
+echo
+echo
+#dump proto cycles stats
+#awk -f ../stats2.awk  ../stats1.txt
+/usr/bin/transport_dpi_demo stats | awk -f ../stats2.awk
diff --git a/ti/runtime/netapi/demo/demo_setup_files/dpicgi4.sh b/ti/runtime/netapi/demo/demo_setup_files/dpicgi4.sh
new file mode 100755
index 0000000..5e487f9
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/dpicgi4.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo Content-type: text/html
+echo
+echo
+#dump mem stat
+/usr/bin/transport_dpi_demo stats | awk -f ../stats3.awk
diff --git a/ti/runtime/netapi/demo/demo_setup_files/dpicgi5.sh b/ti/runtime/netapi/demo/demo_setup_files/dpicgi5.sh
new file mode 100755
index 0000000..e98940f
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/dpicgi5.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+echo Content-type: text/html
+echo
+echo
+#dump  bridge stats
+/usr/bin/transport_dpi_demo stats | awk -f ../stats4.awk
diff --git a/ti/runtime/netapi/demo/demo_setup_files/index.html b/ti/runtime/netapi/demo/demo_setup_files/index.html
new file mode 100755
index 0000000..c228083
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/index.html
@@ -0,0 +1,26 @@
+<html>
+<script type="text/javascript">
+function  hello(msg) {
+       var msg= "this is the net_test_dpi home page";
+       document.open();
+       document.write(msg);
+       document.writeln("<A href=\"/index.html\"> <p><u>RETURN</u></p> </A>");
+       document.close();
+}
+</script>
+<head><title> NET_TEST_DPI </title></head>
+<body >
+<img src="tilogo.gif">
+<text> <p> Hi there. Welcome to the <b>Texas Instruments DPI</b> demo </p>
+<p>
+featuring <b> Procera Networks Deep Packet Inspection Library </b> and <b> Texas Instruments TransportNetLib </b>
+</text>
+<A href="cgi-bin/dpicgi1.sh"> <p>List of Mac Addresses</p> </A>
+<A href="cgi-bin/dpicgi5.sh"> <p>Packet Forwarding Stats</p> </A>
+<A href="cgi-bin/dpicgi2.sh"> <p>Protocols Seen</p> </A>
+<A href="cgi-bin/dpicgi3.sh"> <p>Cycles by Protocol</p> </A>
+<A href="cgi-bin/dpicgi4.sh"> <p>Memory Usage</p> </A>
+<img src="titagline.gif">
+</body>
+</html>
+
diff --git a/ti/runtime/netapi/demo/demo_setup_files/stats1.awk b/ti/runtime/netapi/demo/demo_setup_files/stats1.awk
new file mode 100644
index 0000000..e21232f
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/stats1.awk
@@ -0,0 +1,54 @@
+#--------------------------------------
+# awk script to process stats
+#  output from dpidemo and build
+#  web page
+#  stats1->  dump navl proto stats (part1)
+#_____________________________________
+
+
+BEGIN { state=0;
+        thread=1;
+        printf("<HTML>\n");
+        printf("</HEAD>\n");
+        printf("<BODY>\n");
+        printf("<H2> DPI Protocol Statistics </H2>\n");
+        
+ }
+
+$0 ~ "NAVL DPI stats"  {
+  if (state==0)
+  {
+  state=1;
+  printf("<p><b>  DPI Thread %d: </b> </p>\n", thread);
+  printf("<table>\n");
+  printf("<tr>\n");
+#  printf("<th> colspan="6" <b>Results</b> </th> </tr> \n");
+  }
+}
+ // {
+ if ((state==1)&&(NF>=8))
+ {
+    printf("<tr> ");
+    for(i=1;i<=6;i++) printf("<td> <b> %s </b> </td> ",$i);
+    printf("</tr> \n");
+ }
+ else if ((state==2) && (NF>=6))
+ {
+    printf("<tr> ");
+    for(i=1;i<=6;i++)  if (i==1) printf("<td> <b>%s</b> </td> ", $i); else  printf("<td> %s </td> ", $i);
+    printf("</tr> \n");
+ }
+}
+/--------/ { if (state==1) state=2}
+/packets captured/ {if (state==2) {state=0; thread+=1;  printf("</table>\n"); printf("%s\n\n",$0);}}
+
+
+
+END {
+ printf("</PRE>\n");
+ printf("<A href=\"\\index.html\"> <p><u> RETURN </u> </p> </A>\n");
+ printf("</BODY>\n");
+ printf("</HTML>\n");
+
+
+}
diff --git a/ti/runtime/netapi/demo/demo_setup_files/stats2.awk b/ti/runtime/netapi/demo/demo_setup_files/stats2.awk
new file mode 100644
index 0000000..9c9266b
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/stats2.awk
@@ -0,0 +1,56 @@
+#--------------------------------------
+# awk script to process stats
+#  output from dpidemo and build
+#  web page
+#  stats2->  dump navl proto stats (part2)
+#_____________________________________
+
+
+BEGIN { state=0;
+        thread=1;
+        printf("<HTML>\n");
+        printf("</HEAD>\n");
+        printf("<BODY>\n");
+        printf("<H2> DPI Cycle Statistics by Protocol </H2>\n");
+        
+ }
+
+$0 ~ "NAVL DPI stats"  {
+  if (state==0)
+  {
+  state=1;
+  printf("<p><b>  DPI Thread %d: </b> </p>\n", thread);
+  printf("<table>\n");
+  printf("<tr>\n");
+#  printf("<th> colspan="6" <b>Results</b> </th> </tr> \n");
+  }
+}
+ // {
+ if ((state==1)&&(NF>=8))
+ {
+    printf("<tr> ");
+    printf("<td> <b> %s </b> </td> ",$1);
+    for(i=7;i<=19;i++) printf("<td> <b> %s </b> </td> ",$i);
+    printf("</tr> \n");
+ }
+ else if ((state==2) && (NF>=6))
+ {
+    printf("<tr> ");
+    printf("<td> <b> %s </b> </td> ",$1);
+    for(i=7;i<=19;i++)   printf("<td> %s </td> ", $i);
+    printf("</tr> \n");
+ }
+}
+/--------/ { if (state==1) state=2}
+/packets captured/ {if (state==2) {state=0; thread+=1;  printf("</table>\n");}}
+
+
+
+END {
+ printf("</PRE>\n");
+ printf("<A href=\"\\index.html\"> <p><u> RETURN </u> </p> </A>\n");
+ printf("</BODY>\n");
+ printf("</HTML>\n");
+
+
+}
diff --git a/ti/runtime/netapi/demo/demo_setup_files/stats3.awk b/ti/runtime/netapi/demo/demo_setup_files/stats3.awk
new file mode 100644
index 0000000..fdc52e5
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/stats3.awk
@@ -0,0 +1,71 @@
+#--------------------------------------
+# awk script to process stats
+#  output from dpidemo and build
+#  web page
+#  stats3->  dump navl  mem stata
+#_____________________________________
+
+
+BEGIN { state=0;
+        thread=1;
+        printf("<HTML>\n");
+        printf("</HEAD>\n");
+        printf("<BODY>\n");
+ }
+
+ // {
+ if (state==1)
+ {
+    if ($0 ~"-------------") 
+    {
+    }
+    else if ($0 ~ "NAVL DPI")
+    {
+    }
+    else if (NF==1)
+    {
+       printf("<tr> ");
+       printf("<td> %s </td> ",$1);
+       printf("</tr> \n");
+    }
+    else if (NF==3)
+   {
+    printf("<tr> ");
+    printf("<td>  </td>  \n");
+    printf("<td>  </td>  \n");
+    for(i=1;i<=NF;i++) {
+      printf("<td> <b> %s </b> </td> ",$i);
+    }
+    printf("</tr> \n");
+   }
+
+
+    else
+    {
+    printf("<tr> ");
+    printf("<td>  </td>  \n");
+    for(i=1;i<=NF;i++) {
+      printf("<td> %s </td> ",$i);
+    }
+    printf("</tr> \n");
+   }
+}
+}
+/packets captured/ {
+        if (state==0) 
+        {
+        state=1; 
+        printf("<H2> DPI Memory Utilization Statistics Thread %d </H2>\n", thread);
+        printf("<table>\n");}
+}
+/NAVL DPI/ {if(state==1) {state=0; printf("</table>"); thread+=1;}}
+
+
+
+END {
+ printf("</table>\n");
+ printf("</PRE>\n");
+ printf("<A href=\"\\index.html\"> <p><u> RETURN </u> </p> </A>\n");
+ printf("</BODY>\n");
+ printf("</HTML>\n");
+}
diff --git a/ti/runtime/netapi/demo/demo_setup_files/stats4.awk b/ti/runtime/netapi/demo/demo_setup_files/stats4.awk
new file mode 100644
index 0000000..dd41c99
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/stats4.awk
@@ -0,0 +1,104 @@
+#--------------------------------------
+# awk script to process stats
+#  output from dpidemo and build
+#  web page
+#  stats3->  dump navl  mem stata
+#_____________________________________
+
+
+BEGIN { state=0;
+        printf("<HTML>\n");
+        printf("</HEAD>\n");
+        printf("<BODY>\n");
+        printf("<H2> Packet Summary : </H2>\n");
+        lookup["nops"]="Number DPI Operations"
+        lookup["nclass"]="Number Packets Classified";
+        lookup["#mallocs"]="Number Malloc calls";
+        lookup["#mbytes"]="Bytes Malloc'd";
+        lookup["n_err"]="Number of errors";
+        lookup["fops"]= "tbd";
+        lookup["mCycles"]= "Malloc Cycles";
+        lookup["fCycles"]= "tbd";
+        tx[2]=0;
+        
+ }
+/****stats/ {state=1;}
+/NAVL DPI/  {state=0;}
+
+/dpi stats:/ {
+
+  printf("<table>\n");
+  printf("<tr>\n");
+  printf("<td> <b> Statistic </b> </td> <td> <b> Value </b> </td>\n");
+  printf("</tr>\n");
+  for(i=1;i<=NF;i++)
+  {
+    #printf("index = %d for %s\n", index($i,"="), $i);
+    if (index($i,"=")!=0) 
+    {
+    split($i, val,"=");
+    if (val[1] ~ "cycle")
+    {
+       val[1]= $(i-1) " cycle/pkt"
+    }
+    else 
+    {
+       val[1] = lookup[val[1]];
+    }
+    printf("<tr><td>%s</td> <td> %d </td> </tr> \n",val[1],val[2]);
+    }
+  }
+ }
+ /busy_cycles/ { }
+ //  { if(state==1) {
+  for(i=1; i<=NF;i++) {
+    if ($i ~ "sb_rx=") {}
+    else if ($i ~ "sb_tx=") {}
+    else if ($i ~ "itx=") {}
+    else if ($i ~ "+tx=") {}
+    else if ($i ~ "min_rx=") {}
+    else if ($i ~ "sec_tx=") {}
+    else if ($i ~ "min_tx=") {}
+    else if ($i ~ "rx=")
+    {
+      split($i, rx , "=");
+    }
+    else if ($i ~ "tx=")
+    {
+      if (tx[2] == 0)
+      {
+         split($i, tx , "=");
+      }
+    }
+    else if ($i ~ "if")
+    {
+      if0 = $5;
+      if1 = $6;
+    }
+    else if ($i ~ "core")
+    {
+      rx1 = $4;
+      rx2 = $5;
+    }
+
+   }
+  }
+}
+
+
+END {
+printf("<tr><td>Thread 1 RX</td><td> %d </td> </tr> \n",rx1);
+printf("<tr><td>Thread 2 RX</td><td> %d </td> </tr> \n",rx2);
+printf("<tr><td>Interface 0 RX</td><td> %d </td> </tr> \n",if0);
+printf("<tr><td>Interface 1 RX</td><td> %d </td> </tr> \n",if1);
+printf("<tr><td>RX Total</td><td> %d </td> </tr> \n",rx[2]);
+printf("<tr><td>TX Total</td><td> %d </td> </tr> \n",tx[2]);
+printf("</table>\n\n");
+
+ printf("</PRE>\n");
+ printf("<A href=\"\\index.html\"> <p><u> RETURN </u> </p> </A>\n");
+ printf("</BODY>\n");
+ printf("</HTML>\n");
+
+
+}
diff --git a/ti/runtime/netapi/demo/demo_setup_files/tilogo.gif b/ti/runtime/netapi/demo/demo_setup_files/tilogo.gif
new file mode 100644
index 0000000..f2fab2d
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/tilogo.gif
diff --git a/ti/runtime/netapi/demo/demo_setup_files/titagline.gif b/ti/runtime/netapi/demo/demo_setup_files/titagline.gif
new file mode 100644
index 0000000..743a024
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/titagline.gif
diff --git a/ti/runtime/netapi/demo/demo_setup_files/transport_dpi_demo_setup.sh b/ti/runtime/netapi/demo/demo_setup_files/transport_dpi_demo_setup.sh
new file mode 100755
index 0000000..53098eb
--- /dev/null
+++ b/ti/runtime/netapi/demo/demo_setup_files/transport_dpi_demo_setup.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+export KERNEL_VER=$(uname -r)
+
+# configure thttpd to run cgi scripts
+sed -e 's|8080|8080 -c cgi-bin/*|g' -i /etc/init.d/thttpd
+# reload the thttpd server
+cd /etc/init.d
+./thttpd restart
+
+# start Resource Manager Server
+/usr/bin/rmServer.out /usr/bin/device/k2e/global-resource-list.dtb /usr/bin/device/k2e/policy_dsp_arm.dtb
+#copy over web files
+
+cp /etc/transportnetlib/dpi_demo/index.html /srv/www/index.html
+chmod -x /srv/www/index.html
+cp /etc/transportnetlib/dpi_demo/stats1.awk /srv/www/stats1.awk
+cp /etc/transportnetlib/dpi_demo/stats2.awk /srv/www/stats2.awk
+cp /etc/transportnetlib/dpi_demo/stats3.awk /srv/www/stats3.awk
+cp /etc/transportnetlib/dpi_demo/stats3.awk /srv/www/stats4.awk
+cp /etc/transportnetlib/dpi_demo/*.gif      /srv/www/
+cp /etc/transportnetlib/dpi_demo/dpicgi1.sh /srv/www/cgi-bin/dpicgi1.sh
+cp /etc/transportnetlib/dpi_demo/dpicgi2.sh /srv/www/cgi-bin/dpicgi2.sh
+cp /etc/transportnetlib/dpi_demo/dpicgi3.sh /srv/www/cgi-bin/dpicgi3.sh
+cp /etc/transportnetlib/dpi_demo/dpicgi4.sh /srv/www/cgi-bin/dpicgi4.sh
+cp /etc/transportnetlib/dpi_demo/dpicgi4.sh /srv/www/cgi-bin/dpicgi5.sh
+chmod +x /srv/www/cgi-bin/dpicfgi*.sh
+
+
+#install kernel module
+echo $KERNEL_VER
+insmod /lib/modules/$KERNEL_VER/extra/hplibmod.ko
+#
+# setup linux kernel bridge to handle broadcast packets
+ifconfig eth0 0.0.0.0
+#
+ifconfig eth1 0.0.0.0
+#create bridge
+brctl addbr br0
+#add i/fs to bridge
+brctl addif br0 eth0
+#
+brctl addif br0 eth1
+#
+dhclient br0
+#
+ifconfig br0
+# run transport_dpi_demo application
+cd /usr/bin
+./transport_dpi_demo
+
diff --git a/ti/runtime/netapi/demo/makefile_armv7 b/ti/runtime/netapi/demo/makefile_armv7
new file mode 100755
index 0000000..7be82df
--- /dev/null
+++ b/ti/runtime/netapi/demo/makefile_armv7
@@ -0,0 +1,65 @@
+#*******************************************************************************
+#* FILE PURPOSE: Top level makefile for Creating Component Libraries for ARM
+#* architectures
+#*******************************************************************************
+#* FILE NAME: makefile
+#*
+#* DESCRIPTION: Defines Compiler tools paths, libraries , Build Options 
+#*
+#*
+#*******************************************************************************
+#*
+# (Mandatory) Specify where various tools are installed.
+
+# Output for prebuilt generated libraries
+export ARMV7LIBDIR ?= ./lib
+
+#Enable the following to build for tci6614
+
+
+# ROOT Directory
+export ROOTDIR := ../../..
+
+
+# INCLUDE Directory
+export INCDIR := ../;$(PDK_INSTALL_PATH);$(ROOTDIR)
+
+# Common Macros used in make
+
+ifndef RM
+export RM = rm -f
+endif
+
+ifndef CP
+export CP = cp -p
+endif
+
+export MKDIR = mkdir -p
+
+ifndef RMDIR
+export RMDIR = rm -rf
+endif
+
+ifndef SED
+export SED = sed
+endif
+
+ifndef MAKE
+export MAKE = make
+endif
+
+
+# PHONY Targets
+.PHONY: all install 
+
+# all rule
+all: install 
+
+install:
+        install -d                           $(INSTALL_BIN_BASE_DIR)/plugins
+        $(CP) -r plugins/*                   $(INSTALL_INC_BASE_DIR)/plugins
+        install -d                           $(INSTALL_INC_BASE_DIR)/navl/include
+        $(CP) include/navl.h                 $(INSTALL_INC_BASE_DIR)/navl/include
+        install -d                           $(INSTALL_LIB_BASE_DIR)
+        $(CP) -rp lib/libnavl.so*            $(INSTALL_LIB_BASE_DIR)
+        
diff --git a/ti/runtime/netapi/demo/src/Makefile b/ti/runtime/netapi/demo/src/Makefile
new file mode 100755
index 0000000..aa84b3a
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/Makefile
@@ -0,0 +1,95 @@
+#
+empty =
+space =$(empty) $(empty)
+
+export ARMV7OBJDIR ?= ./obj
+export ARMV7BINDIR ?= ./bin
+export ARMV7LIBDIR ?= ./lib
+export ARMV7SALIBDIR ?= ./lib
+
+DPI_DEMO_SRC_DIR ?= $(PWD)
+# INCLUDE Directories
+SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
+QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
+CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+RM_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/rm
+#NETAPI_INC_DIR ?=  $(NETAPI_INSTALL_PATH)/ti/runtime/netapi
+NETAPI_INC_DIR ?=  $(NETAPI_INSTALL_PATH)
+#HPLIB_INC_DIR ?=  $(HPLIB_INSTALL_PATH)/ti/runtime/hplib
+HPLIB_INC_DIR ?=  $(HPLIB_INSTALL_PATH)
+NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
+PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
+NAVL_LIB_DIR ?= $(DPI_DEMO_SRC_DIR)/../lib
+# Set NETAPI INSTALL PATH to Transport SDK for default
+
+#NT_RM_OBJS = $(ARMV7OBJDIR)/netapi/utils/sockutils.o  $(ARMV7OBJDIR)/netapi/utils/netapi_util_rm.o
+
+#TRIE_OBJS=$(ARMV7OBJDIR)/netapi/test/trie.o
+
+
+DPI_DEMO_OBJS= $(ARMV7OBJDIR)/dpi_demo_git/src/dpi_demo.o $(ARMV7OBJDIR)/dpi_demo_git/src/navl_wrapper.o $(ARMV7OBJDIR)/dpi_demo_git/src/navl_external_posix.o
+
+# Support Libraries used by dpi-demo 
+CSL_DEVICE ?= -DDEVICE_K2E -DNSS_GEN2
+QMSS_LIB = -lqmss
+CPPI_LIB = -lcppi
+PA_LIB = -lpa2
+NWAL_LIB = -lnwalsa_k2e
+SA_LIB = -lsa
+RM_LIB = -lrm
+PKTLIB_LIB = -lpktlib
+NETAPI_LIB =-lnetapi_k2e
+HP_LIB = -lhplib_k2e
+NAVL_LIB = -lnavl
+
+local_base=/usr/local
+LDFLAGS = -L. -L$(local_base)/lib
+
+LIBS = -static $(QMSS_LIB) $(CPPI_LIB) $(PA_LIB) $(PKTLIB_LIB) $(NETAPI_LIB) $(HP_LIB) $(SA_LIB) $(NWAL_LIB) $(RM_LIB) -Wl,-Bdynamic
+
+LIBS += $(NAVL_LIB) -lstdc++ -lgcc_s
+EXE_EXTN =
+
+SYSTYPE:=$(shell uname)
+ifeq ($(SYSTYPE), Linux)
+LIBS += -ldl -lm
+else
+LIBS += -lexecinfo
+endif
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+INCLUDE = -I. -I$(local_base)/include -I../ -I$(HPLIB_INC_DIR) -I$(NETAPI_INC_DIR) -I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(RM_INC_DIR) $(CSL_DEVICE)
+
+CFLAGS += $(DEBUG_FLAG) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+# Linker options
+INTERNALLINKDEFS = -Wl,--start-group $(LIBS) -Wl,--end-group -lrt -pthread  -L$(ARMV7LIBDIR) -L$(ARMV7SALIBDIR) -L$(NAVL_LIB_DIR)
+
+all: tests 
+
+tests: $(ARMV7BINDIR)/dpi_demo_git/demo/.created $(ARMV7BINDIR)/dpi_demo_git/demo/dpi_demo_$(DEVICE)
+
+clean:  
+        rm -f $(ARMV7OBJDIR)/dpi_demo/demo/*.o
+        rm -f $(ARMV7BINDIR)/dpi_demo/demo/*
+
+$(ARMV7OBJDIR)/dpi_demo_git/src/%.o: %.c $(ARMV7OBJDIR)/dpi_demo_git/src/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS) $(INCLUDE) $<  -o $@
+
+$(ARMV7OBJDIR)/dpi_demo_git/src/.created:
+        @mkdir -p $(ARMV7OBJDIR)/dpi_demo_git/src/
+
+$(ARMV7BINDIR)/dpi_demo_git/demo/.created:
+        @mkdir -p $(ARMV7BINDIR)/dpi_demo_git/demo/
+
+$(ARMV7BINDIR)/dpi_demo_git/demo/dpi_demo_$(DEVICE): $(DPI_DEMO_OBJS)
+        echo 'test123'
+        #$(CC) $(LDFLAGS) $(DPI_DEMO_OBJS) $(INTERNALLINKDEFS) $(INCLUDE) -rdynamic ../lib/libnavl.so -o $(ARMV7BINDIR)/dpi_demo_git/demo/dpi_demo_$(DEVICE)$(EXE_EXTN)
+        $(CC) $(LDFLAGS) $(DPI_DEMO_OBJS) $(INTERNALLINKDEFS) $(INCLUDE) -o $(ARMV7BINDIR)/dpi_demo_git/demo/dpi_demo_$(DEVICE)$(EXE_EXTN)
diff --git a/ti/runtime/netapi/demo/src/navl_external_posix.c b/ti/runtime/netapi/demo/src/navl_external_posix.c
new file mode 100755
index 0000000..8ee00ab
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/navl_external_posix.c
@@ -0,0 +1,119 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+#include <arpa/inet.h>
+#include <sys/time.h>
+#include <math.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include "navl/navl.h"
+#include "navl_wrapper.h"
+extern navl_global_dpi_stats *pDpiStats;
+
+
+void* our_malloc(size_t n)
+{
+    pDpiStats->malloc_inst+=1;
+    pDpiStats->malloc_bytes+= n;
+    return (malloc(n));
+}
+int null_log_message(const char *level, const char *func, const char *format, ... )
+{
+    return 0;
+}
+
+int printf_log_message(const char *level, const char *func, const char *format, ... )
+{
+    int res = 0;
+    char buf[4096];
+    va_list va;
+    va_start(va, format);
+
+    res = snprintf(buf, 4096, "%s: %s: ", level, func);
+    res += vsnprintf(buf + res, 4096 - res, format, va);
+        navl_diag_printf(buf);
+    va_end(va);
+    return res;
+}
+
+void bind_navl_externals()
+{
+    /* memory allocation */
+    navl_malloc_local = our_malloc;
+    navl_free_local = free;
+    navl_malloc_shared = our_malloc;
+    navl_free_shared = free;
+
+    /* ctype */
+    navl_islower = islower;
+    navl_isupper = isupper;
+    navl_tolower = tolower;
+    navl_toupper = toupper;
+    navl_isalnum = isalnum;
+    navl_isspace = isspace;
+    navl_isdigit = isdigit;
+
+    /* string functions */
+    navl_atoi = atoi;
+    navl_memcpy = memcpy;
+    navl_memcmp = memcmp;
+    navl_memset = memset;
+    navl_strcasecmp = strcasecmp;
+    navl_strchr = (const char* (*)(const char*, int))strchr;
+    navl_strrchr = (const char* (*)(const char*, int))strrchr;
+    navl_strcmp = strcmp;
+    navl_strncmp = strncmp;
+    navl_strcpy = strcpy;
+    navl_strncpy = strncpy;
+    navl_strerror = strerror;
+    navl_strftime = (size_t (*)(char*, size_t, const char*, const struct navl_tm*))strftime;
+    navl_strlen = strlen;
+    navl_strpbrk = (const char* (*)(const char*, const char*))strpbrk;
+    navl_strstr = (const char* (*)(const char*, const char*))strstr;
+    navl_strtol = strtol;
+
+    /* input/output */
+    navl_printf = printf;
+    navl_sprintf = sprintf;
+    navl_snprintf = snprintf;
+    navl_sscanf = sscanf;
+    navl_putchar = putchar;
+    navl_puts = puts;
+    navl_diag_printf = printf;
+
+    /* time */
+    navl_gettimeofday = (int (*)(struct navl_timeval*, void*))gettimeofday;
+    navl_mktime = (navl_time_t (*)(struct navl_tm*))mktime;
+
+    /* math */
+    navl_log = log;
+    navl_fabs = fabs;
+
+#if 0
+    /* network */
+#ifndef __mips__
+    navl_htonl = htonl;
+    navl_htons = htons;
+    navl_ntohl = ntohl;
+    navl_ntohs = ntohs;
+#endif
+#endif
+    /* system */
+    navl_abort = abort;
+    navl_get_thread_id = (unsigned long (*)(void))pthread_self;
+
+    /* navl specific */
+#ifdef DEBUG
+    navl_log_message = printf_log_message;
+#else
+    navl_log_message = null_log_message;
+#endif
+}
+
diff --git a/ti/runtime/netapi/demo/src/navl_wrapper.c b/ti/runtime/netapi/demo/src/navl_wrapper.c
new file mode 100755
index 0000000..8e26cc4
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/navl_wrapper.c
@@ -0,0 +1,938 @@
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <getopt.h>
+#include <errno.h>
+#include <assert.h>
+#include <stdarg.h>
+#include "ti/runtime/hplib/hplib.h"
+#include "ti/runtime/netapi/netapi_types.h"
+#include "navl_wrapper.h"
+/* timing */
+
+#define netapi_timing_start hplib_mUtilGetPmuCCNT
+
+navl_wrapper_cfg_info_t *pNavlCfg;
+navl_global_dpi_stats *pDpiStats;
+void* pShmBase;
+void *pShmEntry;
+
+//int free_inst=0;
+
+static unsigned long long timing=0LL;
+
+static char last_url[256];
+int class=0;
+void clear_pkt_stats();
+void navl_clear_stats(void)
+{
+    memset(pDpiStats, 0, sizeof(navl_global_dpi_stats));
+    pDpiStats->min_time=100000000;
+    clear_pkt_stats();
+}
+void navl_return_stats(int * Pn_ops, int * Pn_class, unsigned long * Pmin_time, unsigned long * Pmax_time, unsigned long long *Ptiming, int * Pmalloc_inst, int *Pmalloc_bytes, int * Pn_err, int *Pfree_inst, unsigned long *Pmalloc_cycles, unsigned long *Pfree_cycles)
+{
+    *Pn_ops=pDpiStats->n_ops;
+    *Pn_class=pDpiStats->n_class;
+    *Pmin_time=pDpiStats->min_time;
+    *Pmax_time=pDpiStats->max_time;
+    *Ptiming=timing;
+    *Pmalloc_inst = pDpiStats->malloc_inst;
+    *Pmalloc_bytes= pDpiStats->malloc_bytes;
+    *Pn_err=pDpiStats->n_err;
+    *Pfree_inst = pDpiStats->free_inst; 
+    *Pmalloc_cycles= pDpiStats->malloc_inst ? pDpiStats->malloc_cycles/pDpiStats->malloc_inst: 0;
+    *Pfree_cycles= pDpiStats->free_inst? pDpiStats->free_cycles/pDpiStats->free_inst : 0;
+}
+
+//#define MAX_BIN 10
+static long bins[MAX_BIN]={10000, 12500, 15000,17500,20000, 25000,30000,35000,40000,50000};
+static char* binStr[MAX_BIN]={"10K", "12.5K", "15K","17.5K","20K","25K","30K","35K","40K","50K"};
+
+void add2bin(long cycles, long p_bins[])
+{
+    int i;
+    for(i=0;i<MAX_BIN-1;i++)
+      if (cycles<bins[i]) {p_bins[i]+=1;return;}
+     p_bins[MAX_BIN-1] += 1; //max
+}
+
+
+
+navl_mcb_t *g_reader = NULL;
+const char *g_exename = NULL;
+
+static int  navl_wrapper_init(int argc, char *argv[]);
+static void *navl_wrapper_malloc(size_t);
+static void  navl_wrapper_free(void *);
+static int   navl_wrapper_log_message(const char *level, const char *func, const char *format, ...);
+
+static int navl_classify_callback(navl_handle_t handle, navl_result_t result, navl_state_t state, navl_conn_t conn, void *arg, int error);
+
+static void  navl_wrapper_mem_stat_print(int threadId);
+
+/* external definitions */
+void bind_navl_externals();
+
+void navl_set_verbose(void)
+{
+    g_reader->option_verbose=!g_reader->option_verbose;
+    printf(">**DPI Now in %s mode\n",g_reader->option_verbose?"verbose":"nonverbose");
+}
+void navl_dump_conn_info()
+{
+navl_diag(g_reader->navl, "TCP", NULL);
+}
+
+
+#define navl_wrapper_error() \
+do { \
+    fprintf(stderr, "%s failed in %s:%u", g_exename, __FUNCTION__, __LINE__); \
+    if (g_reader) { \
+    if (g_reader->error_navl) \
+    fprintf(stderr, " with navl error %s", get_error_string(navl_error_get(g_reader->navl))); \
+    } \
+    fprintf(stderr, "\n"); \
+} while (0)
+
+int navl_setup(void)
+{
+    return (navl_wrapper_init(0, NULL));
+}
+
+
+static const char *
+get_state_string(navl_state_t state)
+{
+switch (state)
+    {
+        case NAVL_STATE_INSPECTING:
+            return "INSPECTING";
+        case NAVL_STATE_MONITORING:
+            return "MONITORING";
+        case NAVL_STATE_CLASSIFIED:
+            return "CLASSIFIED";
+        case NAVL_STATE_TERMINATED:
+            return "TERMINATED";
+        default:
+            return "UNKNOWN";
+    }
+}
+
+static const char *
+get_confidence_string(int confidence)
+{
+    switch (confidence)
+    {
+        case 50:
+            return "PORT";
+        case 100:
+            return "DPI";
+        default:
+            return "NONE";
+    }
+}
+
+static const char *
+get_error_string(int error)
+{
+    switch (error)
+    {
+        case 0:
+            return "None";
+        case ENOMEM:
+            return "No memory available";
+        case EPROTO:
+            return "Protocol error";
+        case ENOTCONN:
+            return "No connection allocated";
+        case EEXIST:
+            return "Object exists";
+        case EINVAL:
+            return "Invalid parameter";
+        case ECANCELED:
+            return "Operation cancelled";
+        case ENOENT:
+            return "No such file or directory";
+        case EPROTONOSUPPORT:
+            return "Protocol not supported";
+        default:
+            return "Unknown";
+    }
+}
+
+static int
+navl_wrapper_init(int argc, char *argv[])
+{
+    static navl_mcb_t reader;
+
+    int ret;
+    int i,j;
+
+    g_reader = &reader;
+
+    g_reader->navl = -1;
+
+    g_reader->config_capfile = NULL;
+    g_reader->config_plugins = "plugins";
+    g_reader->config_num_proto = 0;
+    g_reader->config_conn_id_attr = 0;
+    g_reader->config_http_attr = 0;
+    g_reader->config_num_memctx = NUM_MEM_CTX;
+    g_reader->config_num_memobj = NUM_MEM_OBJ;
+
+    g_reader->option_dpi = 1;
+    g_reader->option_simple = 0;
+    g_reader->option_track_memory = 1;
+    g_reader->option_limit_memory = 0;
+    g_reader->option_realtime_mode = 1;
+    g_reader->option_verbose = 0;
+
+    g_reader->error_navl = 0;
+
+    for(j=0;j< NUM_FP_PROCS;j++)
+        g_reader->stats_pkt[j] = NULL;
+
+    g_reader->stats_conns = 0;
+
+    g_reader->running = 1;
+    g_reader->alloc_curr = 0;
+    g_reader->alloc_peak = 0;
+
+    g_exename = "dpi_demo";
+
+
+    /* allocate segment for shared memory for packet stats */
+     /* allocate packet statistics */
+    pShmBase = hplib_shmOpen();
+    if (pShmBase)
+    {
+        pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+        pNavlCfg =  (navl_wrapper_cfg_info_t*)pShmEntry;
+        memset(pNavlCfg,
+               0,
+               sizeof(navl_wrapper_pkt_stat_t) * MAX_PROTOCOLS *NUM_FP_PROCS+ sizeof(navl_wrapper_cfg_info_t));
+        pNavlCfg =  (navl_wrapper_cfg_info_t*)pShmEntry;
+        pNavlCfg->num_protocols = g_reader->config_num_proto;
+        g_reader->stats_pkt[0] = pShmEntry + sizeof(navl_wrapper_cfg_info_t);
+
+        g_reader->stats_pkt[1] = pShmEntry + sizeof(navl_wrapper_cfg_info_t) +
+                (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS); 
+
+        for (j = 0; j < NUM_FP_PROCS; j++)
+        {
+            for(i=0;i< MAX_PROTOCOLS;i++)
+            {
+                g_reader->stats_pkt[j][i].cycles_min=10000000;
+                g_reader->stats_pkt[j][i].cycles_max=0;
+
+            }
+        }
+        pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
+        pDpiStats = (navl_global_dpi_stats*) pShmEntry;
+
+        pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_3);
+        g_reader->stats_mem = (navl_wrapper_mem_stats_t*) pShmEntry;
+    }
+    else
+    {
+        printf("navl_wrapper_init: hplib_shmOpen failure\n");
+        return NETAPI_ERR_NOMEM;
+    }
+    
+
+    /* EXTERNAL BINDINGS GO HERE */
+    {
+        /* Bind the platform specific functions. */
+        bind_navl_externals();
+
+        /* Private overrides for this example application. */
+        navl_log_message = navl_wrapper_log_message;
+        if (g_reader->option_track_memory)
+        {
+            navl_malloc_local = navl_wrapper_malloc;
+            navl_free_local = navl_wrapper_free;
+            navl_malloc_shared = navl_wrapper_malloc;
+            navl_free_shared = navl_wrapper_free;
+        }
+    }
+
+    /* open the navl library */
+    if ((g_reader->navl = navl_open(g_reader->config_plugins)) == -1)
+        navl_wrapper_error();
+
+    /* set logging level to "error | fatal" */
+    if (navl_config_set(g_reader->navl, "system.loglevel", "48") == -1)
+        navl_wrapper_error();
+
+    /* determine the max protocol index */
+    if ((ret = navl_proto_max_index(g_reader->navl)) == -1)
+    {
+        printf("navl_proto_max_index error\n");
+        navl_wrapper_error();
+    }
+
+    /* the number of protocols is the max + 1 */
+    g_reader->config_num_proto = (ret + 1);
+    pNavlCfg->num_protocols = g_reader->config_num_proto;
+
+    return NETAPI_ERR_OK;
+}
+
+//per thread init. Call this in worker thread context
+int navl_per_thread_init(uint32_t thread_num)
+{
+    int  ret;
+    int c;
+
+     /* initialize this thread for classification */
+    if (navl_init(g_reader->navl))
+    {
+        printf("navl_init error\n");
+        navl_wrapper_error();
+    }
+#if 0
+        /* enable connection tracking */
+        if (navl_attr_enable(g_reader->navl, "conn.id", 1) == -1)
+                navl_wrapper_error();
+
+#ifdef HTTP_ATTRIB
+        /* enable http url */
+        if (navl_attr_enable(g_reader->navl, "http.request.url",1) == -1)
+                navl_wrapper_error();
+#endif
+
+        /* lookup the key for conn.id */
+        if ((g_reader->config_conn_id_attr = navl_attr_key_get(g_reader->navl, "conn.id")) == -1)
+                navl_wrapper_error();
+#ifdef HTTP_ATTRIB
+        /* lookup the key for http.request.host */
+        if ((g_reader->config_http_attr = navl_attr_key_get(g_reader->navl, "http.request.url")) == -1)
+                navl_wrapper_error();
+#endif
+#endif
+    /* simulated realtime */
+    if (g_reader->option_realtime_mode == 2)
+        navl_clock_set_mode(g_reader->navl, 1);
+
+
+#if 0
+    /* determine the max protocol index */
+    if ((ret = navl_proto_max_index(g_reader->navl)) == -1)
+    {
+        printf("navl_proto_max_index error\n");
+        navl_wrapper_error();
+    }
+
+    /* the number of protocols is the max + 1 */
+    g_reader->config_num_proto = (ret + 1);
+#endif
+
+
+    /* now fetch all the protocol name ahead of time do we don't have to lookup them up on each packet */
+    for (ret = 0; ret != g_reader->config_num_proto; ret++)
+        navl_proto_get_name(g_reader->navl, ret,
+                            g_reader->stats_pkt[thread_num-1][ret].name,
+                            sizeof(g_reader->stats_pkt[thread_num-1][ret].name));
+
+
+ /* fetch all the memory tag names */
+    for (c = 0; c < NUM_MEM_CTX; c++)
+        navl_memory_ctx_name(g_reader->navl, c, g_reader->stats_mem->ctx_name[thread_num-1][c],
+                            sizeof(g_reader->stats_mem->ctx_name[thread_num-1][c]));
+        //navl_memory_ctx_name(g_reader->navl, c, g_reader->ctx_name[c], sizeof(g_reader->ctx_name[c]));
+    for (c = 0; c < NUM_MEM_OBJ; c++)
+        navl_memory_obj_name(g_reader->navl, c, g_reader->stats_mem->obj_name[thread_num-1][c],
+                            sizeof(g_reader->stats_mem->obj_name[thread_num-1][c]));
+
+        //navl_memory_obj_name(g_reader->navl, c, g_reader->obj_name[c], sizeof(g_reader->obj_name[c]));
+
+    return 1;
+}
+
+
+static uint64_t
+msec_time(struct timeval *tv)
+{
+    return ((uint64_t)tv->tv_sec * 1000) + (tv->tv_usec / 1000);
+}
+
+static void
+msec_delay(uint64_t msecs)
+{
+    struct timeval tv = { msecs / 1000, (msecs % 1000) * 1000 };
+    select(0, 0, 0, 0, &tv);
+}
+
+#if 1
+typedef struct
+{
+    const uint8_t *data;
+    uint32_t       size;
+    uint32_t       sequence;
+    int32_t        appidx;
+    uint64_t       connid;
+} navl_wrapper_packet_t;
+#else
+typedef struct
+{
+        const uint8_t    *data;
+        uint32_t          size;
+        uint32_t          sequence;
+        int32_t           appidx;
+        int32_t           num_cb;
+} navl_wrapper_packet_t;
+#endif
+
+
+#if 1
+static int
+navl_classify_callback(navl_handle_t handle,
+                            navl_result_t result,
+                            navl_state_t state,
+                            navl_conn_t conn,
+                            void *arg,
+                            int error)
+{
+    int idx, protoid = 0, confidence = 0;
+    char buf[256] = {0};
+    navl_iterator_t it;
+    navl_wrapper_packet_t *packet = (navl_wrapper_packet_t *)arg;
+    int threadId =Osal_nwalGetProcId();
+
+    packet->appidx = navl_app_get(g_reader->navl, result, &confidence);
+    if((state==NAVL_STATE_CLASSIFIED) ||
+       (state==NAVL_STATE_TERMINATED) ||
+       (state==NAVL_STATE_MONITORING))
+    {
+        pDpiStats->n_class+=1;
+        class =1;
+    }
+    else
+        class=0;
+#if 0
+    if (navl_proto_find_index(g_reader->navl, "HTTP") == packet->appidx)
+    {
+        it = navl_proto_find(g_reader->navl, result, navl_proto_find_index(g_reader->navl, "HTTP"));
+        if (navl_proto_valid(g_reader->navl, it))
+            navl_attr_get(g_reader->navl,
+            it, 
+            g_reader->config_http_attr, 
+            &last_url,
+            sizeof(last_url));
+    }
+#endif
+    if (g_reader->option_verbose)
+    {
+        /* Build the stack string */
+        for (idx = 0, it = navl_proto_first(g_reader->navl, result); navl_proto_valid(g_reader->navl, it); navl_proto_next(g_reader->navl, it))
+        {
+            protoid = navl_proto_get_index(g_reader->navl, it);
+            if (!packet->connid)
+            {
+                if (navl_proto_find_index(g_reader->navl, "IP") == protoid)
+                {
+#if 0
+                    navl_attr_get(g_reader->navl, it, g_reader->config_conn_id_attr, &packet->connid, sizeof(packet->connid));
+                    if (packet->connid > g_reader->stats_conns)
+                    g_reader->stats_conns = packet->connid;
+#endif
+                }
+            }
+            idx += sprintf(&buf[idx], "/%s", g_reader->stats_pkt[threadId-1][protoid].name);
+        }
+        printf(" Pkt: %u (%u bytes), Conn: %" PRIu64 ", App: %s (%s), State: %s, Stack: %s, Error: %s\n", packet->sequence
+        , packet->size, packet->connid, g_reader->stats_pkt[threadId-1][packet->appidx].name
+        , get_confidence_string(confidence), get_state_string(state), buf, get_error_string(error));
+    }
+
+    /* Continue tracking the flow */
+    return 0;
+}
+#else
+static int
+navl_classify_callback(navl_handle_t handle,
+                            navl_result_t result,
+                            navl_state_t state,
+                            navl_conn_t conn,
+                            void *arg,
+                            int error)
+{
+        int idx, protoid = 0, confidence = 0;
+        char buf[256] = {0};
+        navl_iterator_t it;
+        navl_conn_id_t conn_id = navl_conn_id_get(handle, conn);
+        navl_wrapper_packet_t *packet = (navl_wrapper_packet_t *)arg;
+
+        /* Always display the outer packet; optionally display encapsulated data */
+        if (!packet->num_cb || g_reader->option_tunnel)
+        {
+                packet->appidx = navl_app_get(g_reader->navl, result, &confidence);
+
+                if (g_reader->option_verbose)
+                {
+                        if (conn_id > g_reader->stats_conns)
+                                g_reader->stats_conns = conn_id;
+
+                        /* Build the stack string */
+                        for (idx = 0, it = navl_proto_first(g_reader->navl, result); navl_proto_valid(g_reader->navl, it); navl_proto_next(g_reader->navl, it))
+                        {
+                                protoid = navl_proto_get_index(g_reader->navl, it);
+                                idx += sprintf(&buf[idx], "/%s", g_reader->stats_pkt[fp_thread][protoid].name);
+                        }
+
+                        printf(" Pkt: %u (%u bytes), Conn: %" PRIu64 ", App: %s (%s), State: %s, Stack: %s, Error: %s\n"
+                                , packet->sequence, packet->size, conn_id, g_reader->stats_pkt[fp_thread][packet->appidx].name
+                                , get_confidence_string(confidence), get_state_string(state), buf, get_error_string(error));
+                }
+        }
+
+        packet->num_cb++;
+
+        /* Continue tracking the flow */
+        return 0;
+}
+#endif
+
+//process the packet
+__thread navl_wrapper_packet_t packet = { NULL, 0, 0 };
+int navl_process_pkt(unsigned char *p_pkt, int len)
+{
+    volatile unsigned long v1;
+    volatile unsigned long v2;
+    unsigned long temp=0;
+    uint64_t last = 0;
+    uint64_t next = 0;
+    unsigned long long mf1;
+    unsigned long long mf2;
+    int threadId =Osal_nwalGetProcId();
+    mf1= pDpiStats->malloc_cycles+pDpiStats->free_cycles;
+    
+    v1 = netapi_timing_start();
+    
+/* update the current packet */
+    packet.sequence++;
+    packet.size = len;
+    packet.appidx = 0;
+    //packet.connid = 0;
+    packet.data=p_pkt;
+
+    /* "real" realtime */
+    if (g_reader->option_realtime_mode == 1)
+    {
+        //next = msec_time(0LL);//dal -> get ts here
+        next=0LL;
+        if (last)
+        msec_delay(next - last);
+        last = next;
+    }
+    if (navl_classify(g_reader->navl,
+                      NAVL_ENCAP_ETH,
+                      packet.data,
+                      packet.size,
+                      NULL,
+                      0,
+                      navl_classify_callback,
+                      &packet) == -1)
+    printf(" Pkt: %u (%u bytes), Error: %s\n", packet.sequence,
+                                               packet.size,
+                get_error_string(navl_error_get(g_reader->navl)));
+
+    /* Update the stats. If classification was not enabled, then the appidx will be 0 and all packets
+     * captured will be accumulated there */
+    g_reader->stats_pkt[threadId-1][packet.appidx].packets++;
+    g_reader->stats_pkt[threadId-1][packet.appidx].bytes += packet.size;
+    if(class)
+        g_reader->stats_pkt[threadId-1][packet.appidx].class++;
+    //update timing
+    v2 = netapi_timing_start();
+    temp=v2-v1;
+    mf2= pDpiStats->malloc_cycles + pDpiStats->free_cycles;
+    timing+= (unsigned long long) temp;
+    g_reader->stats_pkt[threadId-1][packet.appidx].cycles += (unsigned long long) temp;
+    g_reader->stats_pkt[threadId-1][packet.appidx].cycles_nomem += ((unsigned long long) temp - (mf2-mf1));
+
+    if (g_reader->stats_pkt[threadId-1][packet.appidx].cycles_min > temp)
+        g_reader->stats_pkt[threadId-1][packet.appidx].cycles_min = temp;
+
+    if (g_reader->stats_pkt[threadId-1][packet.appidx].cycles_max  < temp)
+    {
+        g_reader->stats_pkt[threadId-1][packet.appidx].cycles_max = temp;
+
+    }
+    
+
+    add2bin((temp - (unsigned long)(mf2-mf1)),&g_reader->stats_pkt[threadId-1][packet.appidx].bin_cycles[0]); 
+    pDpiStats->n_ops+=1;
+    if (temp > pDpiStats->max_time) pDpiStats->max_time = temp;
+    if (temp< pDpiStats->min_time) pDpiStats->min_time = temp;
+    return 1;
+}
+
+int navl_done(void)
+{
+    navl_fini(g_reader->navl);
+    navl_close(g_reader->navl);
+    return 1;
+}
+
+void navl_results(int fp_thread)
+{
+    int idx;
+    int i;
+    uint64_t total_packets, total_bytes;
+    void* pShmEntry;
+
+    total_packets = 0;
+    total_bytes = 0;
+
+    if (g_reader->option_dpi)
+    {
+        printf("\n NAVL DPI stats for CORE ID %d\n", fp_thread + 1);
+        printf("\n AppProto    Packets  Class   Bytes        Cycles/Pkt      Cyclesnomem/Pkt  (min)  (max) ");
+        for(i=0;i<MAX_BIN;i++)
+            printf("<%s ",binStr[i]);
+        printf("\n ----------------------------------------------------------------------------------------------------------------------------------------------------\n");
+    }
+
+    //for (idx = 0; idx < g_reader->config_num_proto; idx++)
+    for (idx = 0; idx < pNavlCfg->num_protocols; idx++)
+    {
+        if (g_reader->option_dpi)
+        {
+            if (g_reader->stats_pkt[fp_thread][idx].packets)
+            {
+                /* We need to provide protocol definitions */   
+                printf(" %-12s%-12" PRIu64 " %" PRIu64 " %" PRIu64 "      %" PRIu64 "       %" PRIu64 "    %ld    %ld    " , 
+                        g_reader->stats_pkt[fp_thread][idx].name,
+                        g_reader->stats_pkt[fp_thread][idx].packets, 
+                        g_reader->stats_pkt[fp_thread][idx].class, 
+                        g_reader->stats_pkt[fp_thread][idx].bytes,
+                        g_reader->stats_pkt[fp_thread][idx].cycles/g_reader->stats_pkt[fp_thread][idx].packets, 
+                        g_reader->stats_pkt[fp_thread][idx].cycles_nomem/g_reader->stats_pkt[fp_thread][idx].packets,
+                        g_reader->stats_pkt[fp_thread][idx].cycles_min,
+                        g_reader->stats_pkt[fp_thread][idx].cycles_max);
+                for(i=0;i<MAX_BIN;i++) printf("%ld ",g_reader->stats_pkt[fp_thread][idx].bin_cycles[i]);
+                printf("\n");
+            }
+        }
+
+        total_packets += g_reader->stats_pkt[fp_thread][idx].packets;
+        total_bytes += g_reader->stats_pkt[fp_thread][idx].bytes;
+    }
+
+    if (!total_packets)
+        printf("\n No packets captured.\n");
+    else
+        printf("\n %" PRIu64 " packets captured (%" PRIu64 " bytes)\n", total_packets, total_bytes);
+
+    if (g_reader->stats_conns)
+        printf(" %" PRIu64 " connections tracked\n", g_reader->stats_conns);
+
+    printf("\n");
+    if (g_reader->option_track_memory)
+        navl_wrapper_mem_stat_print(fp_thread);
+
+
+    if (pNavlCfg->alloc_curr != 0)
+        printf("Bytes not freed: %" PRIi64 "\n", pNavlCfg->alloc_curr);
+
+    if (g_reader->alloc_peak != 0)
+           printf("Peak allocated: %" PRIi64 "\n", g_reader->alloc_peak);
+
+    printf("attr test: last http utl= %s\n",last_url);
+}
+
+static void 
+navl_wrapper_mem_stat_print(int threadId)
+{
+    int i, j;
+    navl_wrapper_stat_t *stat;
+    char *name;
+
+    printf("                                          Curr      Peak      Fail   \n");
+    printf("-----------------------------------------------------------------------");
+
+    for (i = 0; i < NUM_MEM_CTX; i++)
+    {
+        stat = &g_reader->stats_mem->mstats[threadId][i][0];
+        if (stat->peak == 0)
+        continue;
+
+        printf("\n\t%s\n", g_reader->stats_mem->ctx_name[threadId][i]);
+        //printf("\n\t%s\n", g_reader->ctx_name[i]);
+
+        for (j = NUM_MEM_OBJ - 1; j >= 0; j--)
+        {
+            navl_wrapper_stat_t *stat = &g_reader->stats_mem->mstats[threadId][i][j];
+            if (stat->peak == 0)
+            continue;
+            name = j ? g_reader->stats_mem->obj_name[threadId][j] : (char *)"other";
+
+            //name = j ? g_reader->obj_name[j] : (char *)"other";
+
+            if (stat->peak || stat->fail)
+            printf("\t\t%-20s%10" PRIu64 "%10" PRIu64 "%10" PRIu64 "\n", name, stat->curr, stat->peak, stat->fail);
+        }
+    }
+    printf("\n\n");
+}
+
+
+void navl_results2(int fp_thread)
+{
+    int idx;
+    int i,j;
+    uint64_t total_packets, total_bytes;
+    void* pShmEntry;
+    void* pShmBase;
+    void* pTemp;
+    navl_wrapper_cfg_info_t *pNavlCfg;
+    navl_wrapper_pkt_stat_t *pStats1;
+    navl_wrapper_pkt_stat_t *pStats2;
+    navl_mcb_t g_reader;
+    navl_wrapper_stat_t *stat;
+    char *name;
+
+    pShmBase = hplib_shmOpen();
+    if (pShmBase)
+    {
+        pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+        pNavlCfg =  (navl_wrapper_cfg_info_t*)pTemp;
+    
+        g_reader.stats_pkt[0] = pTemp + sizeof(navl_wrapper_cfg_info_t);
+    
+    
+        g_reader.stats_pkt[1] = pTemp + sizeof(navl_wrapper_cfg_info_t) +
+                (sizeof(navl_wrapper_pkt_stat_t)*pNavlCfg->num_protocols);
+
+        pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_3);
+        g_reader.stats_mem = (navl_wrapper_mem_stats_t*) pTemp;
+    }
+    total_packets = 0;
+    total_bytes = 0;
+
+    //if (g_reader->option_dpi)
+    {
+        printf("\n NAVL DPI stats for CORE ID %d\n", fp_thread);
+        printf("\n AppProto    Packets  Class   Bytes        Cycles/Pkt      Cyclesnomem/Pkt  (min)  (max) ");
+        for(i=0;i<MAX_BIN;i++)
+            printf("<%s ",binStr[i]);
+        printf("\n ----------------------------------------------------------------------------------------------------------------------------------------------------\n");
+    }
+
+    //for (idx = 0; idx < g_reader->config_num_proto; idx++)
+    for (idx = 0; idx < pNavlCfg->num_protocols; idx++)
+    {
+        //if (g_reader->option_dpi)
+        {
+            if (g_reader.stats_pkt[fp_thread][idx].packets)
+            {
+                /* We need to provide protocol definitions */   
+                printf(" %-12s%-12" PRIu64 " %" PRIu64 " %" PRIu64 "      %" PRIu64 "       %" PRIu64 "    %ld    %ld    " , 
+                        g_reader.stats_pkt[fp_thread][idx].name,
+                        g_reader.stats_pkt[fp_thread][idx].packets, 
+                        g_reader.stats_pkt[fp_thread][idx].class, 
+                        g_reader.stats_pkt[fp_thread][idx].bytes,
+                        g_reader.stats_pkt[fp_thread][idx].cycles/g_reader.stats_pkt[fp_thread][idx].packets, 
+                        g_reader.stats_pkt[fp_thread][idx].cycles_nomem/g_reader.stats_pkt[fp_thread][idx].packets,
+                        g_reader.stats_pkt[fp_thread][idx].cycles_min,
+                        g_reader.stats_pkt[fp_thread][idx].cycles_max);
+                for(i=0;i<MAX_BIN;i++) printf("%ld ",g_reader.stats_pkt[fp_thread][idx].bin_cycles[i]);
+                printf("\n");
+            }
+        }
+
+        total_packets += g_reader.stats_pkt[fp_thread][idx].packets;
+        total_bytes += g_reader.stats_pkt[fp_thread][idx].bytes;
+    }
+
+    if (!total_packets)
+        printf("\n No packets captured.\n");
+    else
+        printf("\n %" PRIu64 " packets captured (%" PRIu64 " bytes)\n", total_packets, total_bytes);
+
+
+    printf("\n");
+    //if (g_reader.option_track_memory)
+    printf("                                          Curr      Peak      Fail   \n");
+    printf("-----------------------------------------------------------------------");
+
+    for (i = 0; i < NUM_MEM_CTX; i++)
+    {
+        stat = &g_reader.stats_mem->mstats[fp_thread][i][0];
+        if (stat->peak == 0)
+        continue;
+
+        printf("\n\t%s\n", g_reader.stats_mem->ctx_name[fp_thread][i]);
+        //printf("\n\t%s\n", g_reader->ctx_name[i]);
+
+        for (j = NUM_MEM_OBJ - 1; j >= 0; j--)
+        {
+            navl_wrapper_stat_t *stat = &g_reader.stats_mem->mstats[fp_thread][i][j];
+            if (stat->peak == 0)
+            continue;
+            name = j ? g_reader.stats_mem->obj_name[fp_thread][j] : (char *)"other";
+
+            //name = j ? g_reader->obj_name[j] : (char *)"other";
+
+            if (stat->peak || stat->fail)
+            printf("\t\t%-20s%10" PRIu64 "%10" PRIu64 "%10" PRIu64 "\n", name, stat->curr, stat->peak, stat->fail);
+        }
+    }
+    printf("\n\n");
+
+#if 0
+    if (g_reader.stats_conns)
+        printf(" %" PRIu64 " connections tracked\n", g_reader.stats_conns);
+
+    if (pNavlCfg->alloc_curr != 0)
+        printf("Bytes not freed: %" PRIi64 "\n", pNavlCfg->alloc_curr);
+
+    if (g_reader.alloc_peak != 0)
+           printf("Peak allocated: %" PRIi64 "\n", g_reader.alloc_peak);
+
+    printf("attr test: last http utl= %s\n",last_url);
+#endif
+}
+
+
+
+/* Private memory stamp type for tracking memory with navl_wrapper_malloc/free */
+typedef struct
+{
+    size_t      size;       /* size of allocation */
+    short       ctx_tag;    /* ctx axis */
+    short       obj_tag;    /* obj axis */
+    char        mem[0];
+} memstamp_t;
+
+static void *navl_wrapper_malloc(size_t size)
+{
+    navl_handle_t handle;
+    navl_wrapper_stat_t *stat_mem;
+    int tag;
+    int ctx_tag, obj_tag;
+    unsigned long t1;
+    unsigned long t2;
+   int threadId =Osal_nwalGetProcId();
+    pDpiStats->malloc_inst+=1;
+    pDpiStats->malloc_bytes+=size;
+    t1=netapi_timing_start();
+
+    assert(size);
+
+    /* In this context, the handle should be read using navl_handle_get() since
+     * the application cached handle (in this case g_reader->navl) will not be set
+     * until navl_open() returns. For this simple test we just assert that the handle
+     * is infact valid. */
+    handle = navl_handle_get();
+    assert(handle != 0);
+
+    /* Fetch the tags associated with this allocation. They will be used below to record
+     * statistics about allocations within the library on 2 axis. The upper 16 bits contain
+     * a memory obj tag and the lower 16 bits contain the allocation context tag. These
+     * tags are indices, the upper of which is available through navl_memory_ctx_num()
+     * and navl_memory_obj_num() resp. They are generated dynamically and may differ  between
+     * configurations. These total number of indices are available ONLY AFTER navl_open() 
+     * returns.
+     */
+    tag = navl_memory_tag_get(handle);
+    obj_tag = (tag >> 16);
+    ctx_tag = (tag & 0x0000FFFF);
+
+    /* You could do something better here and reallocate the matrix */
+    if (ctx_tag >= g_reader->config_num_memctx || obj_tag >= g_reader->config_num_memobj)
+    {
+        assert(0);
+        return NULL;
+    }
+
+    stat_mem = &g_reader->stats_mem->mstats[threadId][ctx_tag][obj_tag];
+
+    /* check limits */
+    if (!g_reader->option_limit_memory || (pNavlCfg->alloc_curr + size < g_reader->option_limit_memory))
+    {
+        memstamp_t *ptr = (memstamp_t *)malloc(size + sizeof(memstamp_t));
+        if (ptr)
+        {
+            /* track peak values */
+            if ((pNavlCfg->alloc_curr += size) > g_reader->alloc_peak)
+            g_reader->alloc_peak = pNavlCfg->alloc_curr;
+
+            if ((stat_mem->curr += size) > stat_mem->peak)
+            stat_mem->peak = stat_mem->curr;
+
+            ptr->size = size;
+            ptr->ctx_tag = ctx_tag;
+            ptr->obj_tag = obj_tag;
+            t2=netapi_timing_start();
+            pDpiStats->malloc_cycles += (unsigned long long)  (t2-t1);
+            return ptr->mem;
+        }
+    }
+    stat_mem->fail += size;
+    return NULL;
+}
+
+static void 
+navl_wrapper_free(void *p)
+{
+    unsigned long t1;
+    unsigned long t2;
+    int threadId =Osal_nwalGetProcId();
+    pDpiStats->free_inst += 1;
+    t1=netapi_timing_start();
+    if (!p)
+        return;
+
+    memstamp_t *ptr = (memstamp_t *)((char *)p - offsetof(memstamp_t, mem));
+    navl_wrapper_stat_t *stat_mem = &g_reader->stats_mem->mstats[threadId][ptr->ctx_tag][ptr->obj_tag];
+
+    assert(p == ptr->mem);
+
+    stat_mem->curr -= ptr->size;
+    pNavlCfg->alloc_curr -= ptr->size;
+
+    free(ptr);
+    t2=netapi_timing_start();
+    pDpiStats->free_cycles += (unsigned long long)  (t2-t1);
+}
+
+static int
+navl_wrapper_log_message(const char *level, const char *func, const char *format, ... )
+{
+    int res = 0;
+    char buf[4096];
+    va_list va;
+    va_start(va, format);
+
+    res = snprintf(buf, 4096, "%s: %s: ", level, func);
+    res += vsnprintf(buf + res, 4096 - res, format, va);
+    printf("%s\n", buf);
+    va_end(va);
+    return res;
+}
+
+//clear stats
+void clear_pkt_stats()
+{
+    int ret, i;
+    
+
+    for (i=0;i < NUM_FP_PROCS;i++)
+    {
+        memset(g_reader->stats_pkt[i], 0, (sizeof(navl_wrapper_pkt_stat_t)*MAX_PROTOCOLS));
+        /* now fetch all the protocol name ahead of time do we don't have to lookup them up on each packet */
+        for (ret = 0; ret != MAX_PROTOCOLS; ret++)
+        {
+            g_reader->stats_pkt[i][ret].cycles_min=10000000;
+            navl_proto_get_name(g_reader->navl, ret,
+                            g_reader->stats_pkt[i][ret].name,
+                            sizeof(g_reader->stats_pkt[i][ret].name));
+        }
+    }
+}
diff --git a/ti/runtime/netapi/demo/src/navl_wrapper.h b/ti/runtime/netapi/demo/src/navl_wrapper.h
new file mode 100755
index 0000000..aba6f8e
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/navl_wrapper.h
@@ -0,0 +1,198 @@
+/******************************************************************************
+ * FILE PURPOSE:  User space access to transport resources on SOC
+ ******************************************************************************
+ * FILE NAME:   navl_wrapper.h
+ *
+ * DESCRIPTION: NAVL Wrapper definitions and data structures
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2014
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+/**
+ *   @file  netapi.h
+ *
+ *   path  ti/runtime/netapi/demo/src/navl_wrapper.h
+ *
+ *   @brief  
+ *
+ */
+
+
+
+#ifndef __NAVL_WRAPPER_H
+#define __NAVL_WRAPPER_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+#include <navl/navl.h>
+
+#define NUM_PROCS 3
+
+#define NUM_FP_PROCS 2
+
+#define MAX_PROTOCOLS 1500
+#define NUM_MEM_CTX 50
+#define NUM_MEM_OBJ 50
+
+#define MAX_BIN 10
+typedef struct 
+{
+    uint32_t num_threads;
+    uint32_t num_protocols;
+    uint32_t enable_dpi;
+    int64_t alloc_curr;
+} navl_wrapper_cfg_info_t;
+
+
+
+
+typedef struct
+{
+unsigned long n_ops;
+unsigned long n_class;
+unsigned long min_time;
+unsigned long max_time;
+unsigned long long tot;
+unsigned long m_op;
+unsigned long m_bytes;
+unsigned long n_err;
+unsigned long f_op;
+unsigned long m_cycles;
+unsigned long f_cycles;
+unsigned long long malloc_cycles;
+unsigned long long free_cycles;
+int malloc_inst;
+int malloc_bytes;
+int free_inst;
+} navl_global_dpi_stats;
+
+
+
+
+/* for tracking packet stats */
+typedef struct
+{
+    uint64_t packets;
+    uint64_t bytes;
+    char name[9];
+    uint64_t cycles;
+    uint64_t cycles_nomem;
+    unsigned long cycles_max;
+    unsigned long cycles_min;
+    uint64_t class; //# packets classified
+    long bin_cycles[MAX_BIN];
+    uint32_t pad[3];
+} navl_wrapper_pkt_stat_t;
+
+
+
+/* for tracking packets per thread/core basis */
+typedef struct 
+{
+    navl_wrapper_cfg_info_t     navl_cfg;
+    navl_wrapper_pkt_stat_t     stats_pkt[NUM_FP_PROCS];
+} navl_wrapper_shm_pkt_stats_t;
+
+
+
+
+/* for tracking memory stats */
+typedef struct
+{
+    int64_t curr;
+    int64_t peak;
+    int64_t fail;
+} navl_wrapper_stat_t;
+
+typedef struct 
+{
+    navl_wrapper_stat_t mstats[NUM_FP_PROCS][NUM_MEM_CTX][NUM_MEM_OBJ];
+    char                    ctx_name[NUM_FP_PROCS][NUM_MEM_CTX][64];
+    char                    obj_name[NUM_FP_PROCS][NUM_MEM_OBJ][64];
+} navl_wrapper_mem_stats_t;
+
+
+
+/* instance variables */
+typedef struct {
+/* handles */
+    navl_handle_t           navl;
+
+    /* configuration */
+    const char             *config_capfile;
+    const char             *config_plugins;
+    int                     config_num_proto;
+    int                     config_conn_id_attr;
+    int                     config_http_attr;
+    int                     config_num_memctx;
+    int                     config_num_memobj;
+
+    /* options */
+    int                     option_dpi;
+    int                     option_simple;
+    int                     option_track_memory;
+    int                     option_limit_memory;
+    int                     option_tunnel;
+    int                     option_realtime_mode;
+    int                     option_verbose;
+
+    /* diagnostics */
+    int                     error_navl;
+
+    /* statistics */
+//#define NUM_MEM_CTX 50
+//#define NUM_MEM_OBJ 50
+    navl_wrapper_mem_stats_t    *stats_mem;
+    //char                    ctx_name[NUM_MEM_CTX][64];
+    //char                    obj_name[NUM_MEM_OBJ][64];
+    navl_wrapper_pkt_stat_t *stats_pkt[NUM_FP_PROCS];
+    uint64_t                stats_conns;
+
+    /* misc vars */
+    int                     running;
+    int64_t                 alloc_curr;
+    int64_t                 alloc_peak;
+} navl_mcb_t;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/demo/src/transport_dpi_demo.c b/ti/runtime/netapi/demo/src/transport_dpi_demo.c
new file mode 100755
index 0000000..0a887ef
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/transport_dpi_demo.c
@@ -0,0 +1,1093 @@
+/******************************************
+ * File: nt_bench.c   
+ * Purpose:  benchmarks for NT.
+ **************************************************************
+ * FILE:  nt_bench.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application : benchmarks
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sched.h>
+
+//#include "trie.h"
+#include <ti/runtime/netapi/netapi.h>
+#include <ti/runtime/hplib/hplib.h>
+#include "ti/runtime/netapi/pktio.h"
+#include "transport_dpi_demo.h"
+#include "navl_wrapper.h"
+//#include "ti/runtime/netapi/test/net_test.h"
+#include <ti/drv/sa/salld.h>
+
+#include <ti/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+extern NETCP_CFG_EXCEPTION_PKT_T expPkt_appid;
+
+
+#define netapi_timing_start hplib_mUtilGetPmuCCNT
+
+navl_wrapper_cfg_info_t *pNavlCfg;
+navl_wrapper_pkt_stat_t *pStats1;
+navl_wrapper_pkt_stat_t *pStats2;
+navl_global_dpi_stats *pGlobDpiStats;
+navl_wrapper_mem_stats_t *pNavlMemStats;
+
+
+void* pTemp;
+
+
+STATS_T stats;
+paSysStats_t netcp_stats;
+//struct dpi_stats dpis;
+
+#define VDPI
+#ifdef VDPI
+static int DPI=0;  //1 to enable
+static int DUMP_DPI_CONN=0;
+#endif
+
+
+void* pShmBase;
+void *pShmEntry;
+
+
+
+static int scnt=0;
+volatile static int QUIT=0;
+static int XMIT=0;
+static int CAP=0;
+volatile int RESET=0; //to reset stats
+static int NTH=1;
+volatile static int PKTGEN=0;
+int pkt_len=64;
+
+
+
+NETCP_CFG_MACIF_T mac[NUM_PROCS];
+NETCP_CFG_MACIF_T mac0;
+NETCP_CFG_MACIF_T mac1;
+
+hplib_spinLock_T dpi_demo_thread_lock;
+
+
+static char usage[] = "usage: %s -s \n";
+
+
+
+
+//int procs =2; 
+
+#define HPLIB_THREADID 0  // for main: HPLIB THREAD INSTANCE
+//__thread int our_core;
+static unsigned char dummy_mac[]={0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x01,0x02,0x03,0x04,0x05,0x08,0x00};
+
+void house(NETAPI_SCHED_HANDLE_T *s);
+void our_stats_cb_mt(NETAPI_T h, paSysStats_t* pPaStats);
+void our_stats_cb(NETAPI_T h, paSysStats_t* pPaStats);
+
+//sig handler
+void netTest_utilMySig(int x)
+{
+  QUIT=1;
+  scnt+=1;
+  printf(">net_test_dpi: recv'd signal %d cnt=%d\n",x,scnt);
+  if (scnt > 10) {printf(">dpi-demo: WARNING EXITING WITH PROPER SHUTDOWN LUTS LEFT ACTIVE\n");exit(1);}
+
+}
+
+
+void recv_cb_bridge(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+
+/*************debug********************/
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+   printf("--------dump of descriptor %d %x\n", n, (int) p);
+   printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("-----------------------------\n");
+}
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r)
+{
+   printf("--------dump of header %d %x appID=%x flag1=%x\n", n, (int) p,a,r);
+   printf("> %0x %0x %0x %0x %0x %0x %0x %0x\n",
+          ntohl(p[0]),ntohl(p[1]),ntohl(p[2]),ntohl(p[3]),
+          ntohl(p[4]),ntohl(p[5]),ntohl(p[6]),ntohl(p[7]) );
+#if 0
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[16],p[17],p[18],p[19],p[20],p[21],p[22],p[23]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[24],p[25],p[26],p[27],p[28],p[29],p[30],p[31]);
+#endif
+   printf("-----------------------------\n");
+}
+/*****************************************/
+
+void house(NETAPI_SCHED_HANDLE_T * s)
+{
+    int err;
+    NETAPI_SCHED_SHUTDOWN_T sched_shutdown;
+    int coreid;  //who we are
+    NETAPI_T nh= netapi_schedGetHandle(s);
+    coreid=(int) netapi_getCookie(nh);
+    
+    if (QUIT)
+    {
+        sched_shutdown.shutdown_type = NETAPI_SCHED_SHUTDOWN_NOW;
+        netapi_schedClose(s,&sched_shutdown,&err); 
+        return;
+    }
+
+
+#ifdef VDPI
+    if (DUMP_DPI_CONN )
+        navl_dump_conn_info();
+#endif
+
+
+    /* only slow path threads get netcp stats, this needs to be set in cookie
+       during slow path thread creation*/
+    if (coreid & SP_THREAD_MASK)
+    {
+        netapi_netcpCfgReqStats(nh, our_stats_cb_mt, 0,&err);
+    }
+
+}
+
+unsigned long long CALIB=0;
+unsigned long long calibrate_idle(void)
+{
+    volatile unsigned long long  at1;
+    volatile unsigned long long  at2;
+    volatile unsigned long pt1;
+    volatile unsigned long pt2;
+    unsigned long long calib;
+    at1 = hplib_mUtilGetTimestamp();
+    pt1=netapi_timing_start();
+    for(;;)
+    {
+       pt2=netapi_timing_start()   ;
+       if ((pt2-pt1) >= 100000) break;
+    }
+    at2 = hplib_mUtilGetTimestamp();
+    
+    calib = ((unsigned long long) (pt2-pt1))/(at2-at1);
+    printf("calibrate:   arm time=%lld  -> arm cycles=%d calib=%lld\n", at2-at1, pt2-pt1, calib);
+    
+    return calib;
+}
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+TUNE_NETAPI_PERM_MEM_SZ,
+128,  //start of packet offset for hw to place data on rx for default flow
+TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+64, //#descriptors w/o buffers in default heap
+TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+128,       //tail room
+256,      //extra room
+0,
+NULL
+};
+
+Pktlib_HeapHandle OurHeap;     //default heap, used by producer
+PKTIO_HANDLE_T * netcp_rx_chan;
+PKTIO_HANDLE_T * netcp_rx_chan2;
+PKTIO_HANDLE_T * netcp_tx_chan;
+
+PKTIO_CFG_T our_chan_cfg={PKTIO_RX_TX, PKTIO_LOCAL, PKTIO_Q_ANY, 8};
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_rx_cfg2={PKTIO_RX, (PKTIO_GLOBAL|PKTIO_PKT), PKTIO_Q_ANY, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+NETAPI_T netapi_handle;
+NETAPI_SCHED_HANDLE_T * our_sched;
+NETAPI_SCHED_HANDLE_T * scheduler[TUNE_NETAPI_NUM_CORES];
+NETAPI_SCHED_CONFIG_T our_sched_cfg={
+  NETAPI_SCHED_DURATION|NETAPI_SCHED_CBV, 0, house, 5000000  //every 5000000 poll loops
+};
+
+NETCP_CFG_IP_T ip_rule0;
+NETCP_CFG_IP_T ip_rule1;
+
+
+PKTIO_CFG_T direct_to_cpsw_cfg={PKTIO_TX, PKTIO_GLOBAL, 648, 8};
+PKTIO_HANDLE_T * cpsw_tx_chan;
+
+PKTIO_CONTROL_T zap_channel_control={PKTIO_CLEAR, NULL};
+PKTIO_CONTROL_T poll_cannel_control={PKTIO_SET_POLL_FLAGS, NULL, nwal_POLL_DEFAULT_GLOB_PKT_Q};
+
+//template for fast path
+nwalTxPktInfo_t txPktInfoNoCrypto =
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    0,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                              /* etherLenOffBytes */
+    MAC_HEADER_LEN,         /* ipOffBytes */
+    MAC_HEADER_LEN + IP_HEADER_LEN,                                        /* l4OffBytes */
+    UDP_HEADER_LEN,                                                             /* l4HdrLen */
+    0,                                                                         /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+NETCP_CFG_ROUTE_T  test_route=
+{
+0,
+NULL,
+NULL,
+0,
+0,
+0,
+1
+};
+
+NETCP_CFG_FLOW_HANDLE_T kernelFlow22;
+NETCP_CFG_FLOW_HANDLE_T kernelFlow23;
+
+/*************************END NETAPI OBJECTS***********************/
+
+static unsigned char all_mac[]={0,0,0,0,0,0};
+nwalIpAddr_t all_ip={0,0 , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+
+static unsigned char all_dest[]={0xff,0xff,0xff,0xff,0xff,0xff};
+
+
+
+
+static unsigned long last_header[32/sizeof(unsigned long)];
+static unsigned long last_desc[64/sizeof(unsigned long)];
+
+//stats
+#define MAX_CORE 4
+int pkt_rx[MAX_CORE]; 
+int pkt_tx[MAX_CORE]; 
+unsigned long long pkt_rx_cycles[MAX_CORE]={0L};
+unsigned long long pkt_tx_cycles[MAX_CORE]={0L};
+unsigned long long pkt_cb_cycles[MAX_CORE]={0L};
+unsigned long long idle_cycles[MAX_CORE]={0L};
+volatile unsigned long long start_time[MAX_CORE];
+unsigned long long end_time[MAX_CORE];
+unsigned long long pkt_stall[MAX_CORE]={0L};
+//*********************************
+// packet generator
+//*********************************
+void gen_pkts(int np, int out_port);
+
+/******************************************************
+ * stats callback
+ *******************************************************/
+void our_stats_cb_mt(NETAPI_T h, paSysStats_t* pPaStats)
+{
+  stats.n_stats_cb +=1;
+  if(pPaStats) memcpy(&netcp_stats,pPaStats, sizeof(paSysStats_t));
+}
+
+void our_stats_cb(NETAPI_T h, paSysStats_t* pPaStats)
+{
+    uint32_t numFreeDataPackets;
+    uint32_t            numZeroBufferPackets;
+    uint32_t            numPacketsinGarbage;
+    Pktlib_HeapStats    pktLibHeapStats;
+    int i,j;
+    unsigned long long bcpp;
+    unsigned long long bcpp_noc;
+    unsigned long long bcpp_app;
+    unsigned long long bcpp_tx;
+    unsigned long long npL;
+    unsigned long long cyclesL;
+    unsigned long long ccyclesL; //cache cycles
+    unsigned long long tmp_npL[TUNE_NETAPI_NUM_CORES];
+    unsigned long long tmp_cyclesL[TUNE_NETAPI_NUM_CORES];
+    unsigned long long tmp_ccyclesL[TUNE_NETAPI_NUM_CORES]; //cache cycles
+    NETAPI_SA_STATS_T netapi_sa_stats;
+
+    printf(">*****stats @ %lld (#cbs%d) \n", hplib_mUtilGetTimestamp(),stats.n_stats_cb);
+    //printf("netcp_tx_handle check %x\n", netcp_tx_chan->back);
+    printf(">itx=%d rx=%d tx=%d bad=%d slow=%d \n>rx_class0=%d rx_class1=%d rx_class2=%d  secRx=%d  secPRX=%d sb_rx=%d sb_tx=%d auth_ok=%d sec_tx=%d  min_rx=%d min_tx=%d ip=%d\n",
+             stats.itx, stats.rx, stats.tx, stats.n_bad, stats.n_new, 
+             stats.n_class0_rx, stats.n_class1_rx, 
+             stats.n_class2_rx, stats.sec_rx, stats.secp_rx, stats.sb_rx, stats.sb_tx, stats.n_auth_ok,
+             stats.sec_tx, stats.rx_min, stats.tx_min, stats.ip);
+    printf(">if rx stats:  %d %d %d\n",stats.if_rx[0],stats.if_rx[1],stats.if_rx[2]);
+
+
+    printf(">core rx stats:  %d %d %d\n",stats.core_rx[1],stats.core_rx[2],stats.core_rx[3]);
+
+
+    for (j= 1;j < NUM_PROCS;j++)
+    {
+        tmp_npL[j]=0LL; tmp_cyclesL[j]=0LL; tmp_ccyclesL[j]=0LL;
+        netapi_schedGetStats(scheduler[j],&tmp_npL[j],&tmp_cyclesL[j],&tmp_ccyclesL[j]);
+        npL += tmp_npL[j];
+        cyclesL += tmp_cyclesL[j];
+        ccyclesL += tmp_ccyclesL[j];
+    }
+
+    if (npL && stats.rx)
+    {
+        bcpp = cyclesL/npL; 
+        bcpp_noc = (cyclesL-ccyclesL)/npL; 
+        bcpp_app = (stats.app_cycles-stats.tx_cache_cycles)/stats.rx;
+    }
+    else {bcpp = bcpp_noc=bcpp_app=0L;}
+    if (stats.tx)
+    {
+        bcpp_tx = (stats.send_cycles-stats.tx_cache_cycles)/stats.tx;
+    }
+    else
+    {
+        bcpp_tx = 0L;
+    }
+    printf(">         ++ busy cycles pp=%lld (%lld wo cache ops) (app+tx= %lld) (tx= %lld) ++\n",
+         bcpp,bcpp_noc,bcpp_app, bcpp_tx);
+
+
+#ifdef VDPI
+    navl_return_stats(
+    &pGlobDpiStats->n_ops,
+    &pGlobDpiStats->n_class,
+    &pGlobDpiStats->min_time,
+    &pGlobDpiStats->max_time,
+    &pGlobDpiStats->tot,
+    &pGlobDpiStats->m_op,
+    &pGlobDpiStats->m_bytes,
+    &pGlobDpiStats->n_err,
+    &pGlobDpiStats->f_op,
+    &pGlobDpiStats->m_cycles,
+    &pGlobDpiStats->f_cycles);
+
+    printf("dpi stats:  nops=%d nclass=%d min cycle=%d max  cycle=%d ave cycle=%lld #mallocs=%d #mbytes=%d n_err=%d fops=%d mCycles=%d fCycles=%d\n",
+    pGlobDpiStats->n_ops,
+    pGlobDpiStats->n_class,
+    pGlobDpiStats->min_time,
+    pGlobDpiStats->max_time,
+    pGlobDpiStats->n_ops? pGlobDpiStats->tot/pGlobDpiStats->n_ops : 0,
+    pGlobDpiStats->m_op,
+    pGlobDpiStats->m_bytes,
+    pGlobDpiStats->n_err,
+    pGlobDpiStats->f_op, pGlobDpiStats->m_cycles, pGlobDpiStats->f_cycles);
+    for(i=0; i< NUM_FP_PROCS;i++)
+    {
+        navl_results(i);
+    }
+#endif
+    if(pPaStats)
+    {
+        printf("C1 number of packets:           %d\n", pPaStats->classify1.nPackets);
+        printf("C1 number IPv4 packets:         %d\n", pPaStats->classify1.nIpv4Packets);
+        printf("C1 number IPv6 packets:        %d\n", pPaStats->classify1.nIpv6Packets);
+        printf("C1 number Custom packets:        %d\n", pPaStats->classify1.nCustomPackets);
+        printf("C1 number SRIO packets:        %d\n", pPaStats->classify1.nSrioPackets);
+        printf("C1 number LLC/SNAP Fail packets:        %d\n", pPaStats->classify1.nLlcSnapFail);
+        printf("C1 number table matched:        %d\n", pPaStats->classify1.nTableMatch);
+        printf("C1 number failed table matched: %d\n", pPaStats->classify1.nNoTableMatch);
+        printf("C1 number IP Fragmented packets: %d\n", pPaStats->classify1.nIpFrag);
+        printf("C1 number IP Depth Overflow: %d\n", pPaStats->classify1.nIpDepthOverflow);
+        printf("C1 number VLAN Depth Overflow: %d\n", pPaStats->classify1.nVlanDepthOverflow);
+        printf("C1 number GRE Depth Overflow: %d\n", pPaStats->classify1.nGreDepthOverflow);
+        printf("C1 number MPLS Packets: %d\n", pPaStats->classify1.nMplsPackets);
+        printf("C1 number of parse fail:        %d\n",pPaStats->classify1.nParseFail);
+        printf("C1 number of Invalid IPv6 Opt:  %d\n", pPaStats->classify1.nInvalidIPv6Opt);
+        printf("C1 number of TX IP Fragments:  %d\n", pPaStats->classify1.nTxIpFrag);
+        printf("C1 number of silent discard:    %d\n",pPaStats->classify1.nSilentDiscard);
+        printf("C1 number of invalid control:   %d\n", pPaStats->classify1.nInvalidControl);
+        printf("C1 number of invalid states:    %d\n",pPaStats->classify1.nInvalidState);
+        printf("C1 number of system fails:      %d\n",pPaStats->classify1.nSystemFail);
+        printf("C2 number Packets  :           %d\n",pPaStats->classify2.nPackets);
+        printf("C2 number udp           :      %d\n",pPaStats->classify2.nUdp);
+        printf("C2 number tcp           :      %d\n",pPaStats->classify2.nTcp);
+        printf("C2 number Custom       :      %d\n",pPaStats->classify2.nCustom);
+        printf("C2 number silent drop   :      %d\n",pPaStats->classify2.nSilentDiscard);
+        printf("C2 number invalid cntrl :      %d\n\n",pPaStats->classify2.nInvalidControl);
+        printf("C2 number Modify Stats Cmd Fail :      %d\n\n",pPaStats->modify.nCommandFail);
+    }
+    Pktlib_getHeapStats(OurHeap, &pktLibHeapStats);
+
+    printf("main heap stats>  #free=%d #zb=%d #garbage=%d\n", pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets, pktLibHeapStats.numPacketsinGarbage);
+    printf("               >  #dataBufThreshStatus=%d #dataBufStarvCounter=%d #zBufThreshStatus=%d #zBufStarvCounter=%d \n", 
+                        pktLibHeapStats.dataBufferThresholdStatus,pktLibHeapStats.dataBufferStarvationCounter,
+                        pktLibHeapStats.zeroDataBufferThresholdStatus, pktLibHeapStats.zeroDataBufferStarvationCounter);
+}
+
+NETAPI_T worker_nh[MAX_NUM_CORES];
+
+void slow_path_thread(uint32_t index)
+{
+    int err, i;;
+    uint32_t thread_num;
+    cpu_set_t cpu_set;
+
+    /* index being passed in is the core we want to run the thread on */
+    thread_num = index;
+    printf("slow_path_thread, mypid: %d, core_id %d\n", gettid(), thread_num);
+
+    CPU_ZERO( &cpu_set);
+    for (i = 0; i < 1;i++)
+    {
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+    worker_nh[thread_num] = netapi_init(NETAPI_CORE_MASTER,NULL);
+
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("slow_path_thread: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    netapi_setCookie(worker_nh[thread_num],(void*)(thread_num | SP_THREAD_MASK));
+
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],&our_sched_cfg, &err);
+    if (!scheduler[thread_num]) 
+    {
+        printf("sched create failed for core%d\n",thread_num);
+        goto ERR_slow_path_thread;
+    }
+    scheduler[thread_num]->config.yield = TRUE;
+    scheduler[thread_num]->config.pollGarbageQ = TRUE;
+    scheduler[thread_num]->config.pollCtrlQ = TRUE;
+    printf("Slow Path thread: %d setup complete, running on ARM CORE: %d\n",
+    index,index);
+
+
+    netapi_schedRun(scheduler[thread_num], &err);
+
+ERR_slow_path_thread:
+    printf("slow_path_thread: calling netapi_shutdown\n");
+    netapi_shutdown(worker_nh[thread_num]);
+}
+
+
+void fast_path_thread(uint32_t index)
+{
+    int err, i;
+    PKTIO_HANDLE_T *rx_chan;
+    PKTIO_HANDLE_T *sb_rx_chan;
+    uint32_t thread_num;
+    int navlHandle;
+
+
+    cpu_set_t cpu_set;
+
+    CPU_ZERO( &cpu_set);
+    thread_num = index;
+    printf("fast_path_thread: core %d\n", index);
+
+
+    CPU_SET( thread_num, &cpu_set);
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+
+
+    hplib_mSpinLockLock(&dpi_demo_thread_lock);
+    worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,NULL);
+    
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("fast_path_thread: netapi_init failure, exiting\n");
+        hplib_mSpinLockUnlock(&dpi_demo_thread_lock);
+        exit(1);
+    }
+    else
+    {
+#ifdef VDPI
+            navlHandle = navl_per_thread_init(thread_num);
+#endif
+    }
+    hplib_mSpinLockUnlock(&dpi_demo_thread_lock);
+
+
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("fast_path_thread: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    
+    /* open netcp default RX channels*/
+    rx_chan = netapi_pktioOpen(worker_nh[thread_num], NETCP_RX, (PKTIO_CB) recv_cb_bridge, &netcp_rx_cfg,  &err);
+
+
+    netapi_setCookie(worker_nh[thread_num],(void*)thread_num);
+    
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],
+                                            &our_sched_cfg,
+                                            &err);
+    if (!scheduler[thread_num]) 
+        {
+        printf("sched create failed for core%d\n",thread_num);
+        goto ERR_fast_path_thread;
+        //exit(1);
+    }
+
+ 
+    scheduler[thread_num]->config.yield = FALSE;
+    scheduler[thread_num]->config.pollGarbageQ = FALSE;
+    scheduler[thread_num]->config.pollCtrlQ = FALSE;
+   /* Entry point to scheduler */
+
+
+    printf("Fast Path thread: %d setup complete, running on ARM CORE: %d\n",
+    index,index);
+    netapi_schedRun(scheduler[thread_num], &err);
+
+ERR_fast_path_thread:
+#ifdef VDPI
+        navl_fini(navlHandle);
+#endif
+    netapi_pktioClose(rx_chan, &err);
+
+    printf("fast_path_thread: calling netapi_shutdown\n");
+    netapi_shutdown(worker_nh[thread_num]);
+}
+
+
+/******************************
+* main program
+*****************************/
+int main(int argc, char **argv)
+{
+    int err,i;
+    int j;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    Pktlib_HeapCfg heapCfg;
+    long t1, t2 ;
+    cpu_set_t cpu_set;
+    int c;
+    int statsQueryRequest = 0;
+    pthread_t *thrs;
+    int p;
+
+
+
+
+#if 1
+
+    if (argc == 2)
+    {
+        printf("main: argument %s\n", argv[1]);
+        if(!(strcmp(argv[1], "stats")))
+        {
+            statsQueryRequest =1;
+            printf("querying for stats\n");
+        }
+    }
+    printf("statsQueryReqeust: %d\n", statsQueryRequest);
+
+
+#endif
+
+
+    if (!statsQueryRequest)
+    {
+        if (initRm())
+        {
+            printf("main: initRm() returned error\n");
+            exit(1);
+        }
+
+        signal(SIGINT,netTest_utilMySig);
+        CPU_ZERO( &cpu_set);
+        CPU_SET( 0, &cpu_set);
+        hplib_utilSetupThread(HPLIB_THREADID, &cpu_set, hplib_spinLock_Type_LOL);
+    
+        /* create netapi */
+        our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+        netapi_handle = netapi_init(NETAPI_SYS_MASTER,
+                                    &our_netapi_default_cfg);
+        if (netapi_handle == NULL)
+        {
+            printf("main: netapi_init failure, exiting\n");
+            exit(1);
+        }
+        /* allocate segment for shared memory for packet stats */
+        /* allocate packet statistics */
+        pShmBase = hplib_shmOpen();
+        if (pShmBase)
+        {
+            if (hplib_shmAddEntry(pShmBase,
+                              sizeof(navl_wrapper_pkt_stat_t)
+                             * MAX_PROTOCOLS *NUM_FP_PROCS + sizeof(navl_wrapper_cfg_info_t),
+                             APP_ENTRY_1) != hplib_OK)
+            {
+                printf("main:  hplib_shmAddEntry failure\n");
+                return -1;
+            }
+            else
+            {
+                pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+                pNavlCfg =  (navl_wrapper_cfg_info_t*)pShmEntry;
+                memset(pNavlCfg,
+                       0,
+                       sizeof(navl_wrapper_pkt_stat_t) * MAX_PROTOCOLS *NUM_FP_PROCS+ sizeof(navl_wrapper_cfg_info_t));
+                pNavlCfg =  (navl_wrapper_cfg_info_t*)pShmEntry;
+                pNavlCfg->enable_dpi = 0; /* disable DPI by default */
+            }
+            if (hplib_shmAddEntry(pShmBase, sizeof(navl_global_dpi_stats), APP_ENTRY_2) != hplib_OK)
+            {
+                printf("main:  hplib_shmAddEntry failure\n");
+                return -1;
+            }
+            else
+            {
+                pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
+                pGlobDpiStats = (navl_global_dpi_stats*) pShmEntry;
+                memset(pGlobDpiStats, 0, sizeof(navl_global_dpi_stats));
+                pGlobDpiStats->min_time=100000000;
+            }
+            if (hplib_shmAddEntry(pShmBase, sizeof(navl_wrapper_stat_t)* (NUM_FP_PROCS *NUM_MEM_CTX * NUM_MEM_OBJ),
+                                  APP_ENTRY_3) != hplib_OK)
+            {
+                printf("main:  hplib_shmAddEntry failure\n");
+                return -1;
+            }
+            else
+            {
+                pShmEntry = hplib_shmGetEntry(pShmBase, APP_ENTRY_3);
+                pNavlMemStats = (navl_wrapper_mem_stats_t*) pShmEntry;
+                memset(pNavlMemStats, 0, sizeof(navl_wrapper_mem_stats_t));
+            }
+            
+        }
+        else
+        {
+            printf("main: hplib_shmOpen failure, exiting\n");
+            exit(1);
+        }
+            /* open the main heap */
+        OurHeap = Pktlib_findHeapByName("netapi");
+        if (!OurHeap)
+        {
+            printf("findheapbyname fail\n");
+            exit(1);
+        }
+
+        //if we want to relay network packets, we create a handle to the 
+        //default netcp receive queue here
+        netcp_rx_chan= netapi_pktioOpen(netapi_handle, NETCP_RX, (PKTIO_CB) recv_cb_bridge, &netcp_rx_cfg,  &err);
+        if (!netcp_rx_chan)
+        {
+            printf("pktio open RX failed err=%d\n",err);
+            exit(1);
+        }
+
+        netcp_tx_chan= netapi_pktioOpen(netapi_handle, NETCP_TX, (PKTIO_CB) NULL, &netcp_tx_cfg,  &err);
+        if (!netcp_tx_chan)
+        {
+            printf("pktio open TX failed err=%d\n",err);
+            exit(1);
+        }
+        else  //install a fast path template into the NETCP TX channel
+        {
+            PKTIO_CONTROL_T control2;
+            control2.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg2;
+            memset(&cfg2, 0, sizeof(PKTIO_CFG_T));
+            cfg2.fast_path_cfg.fp_send_option = PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT;
+            cfg2.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan, NULL, &cfg2, &control2, &err);
+       }
+
+
+        if (navl_setup() < 0)
+        {
+            printf("main: navl_setup failure, exiting\n");
+            exit(1);
+        }
+
+        /*********************************************/
+        /*****************end NETAPI STARTUP**********/
+        /*********************************************/
+
+        //now creaate a simple netcp rule
+        //to get a lot of packets
+        mac0 = netapi_netcpCfgCreateMacInterface(
+                      netapi_handle,
+                      &all_mac[0],
+                      NULL,
+                      0,
+                      1,
+                      (NETCP_CFG_ROUTE_HANDLE_T)  NULL,
+                      (NETCP_CFG_VLAN_T ) NULL ,  //future
+                      0x0800,
+                      1,
+                      &err);
+        if (err) {printf("addmac0 failed %d\n",err); exit(1); }
+        else printf("addmac0 sucess\n");
+
+        mac1 = netapi_netcpCfgCreateMacInterface(
+                      netapi_handle,
+                      &all_mac[0],
+                      NULL,
+                      1,
+                      2,
+                      (NETCP_CFG_ROUTE_HANDLE_T)  NULL,
+                      (NETCP_CFG_VLAN_T ) NULL ,  //future
+                      0x0800,
+                      1,
+                      &err);
+        if (err) {printf("addmac1 failed %d\n",err); exit(1); }
+        else printf("addmac1 sucess\n");
+
+        //calibrate idle
+        CALIB = calibrate_idle();
+
+        //**************************************
+        //Create a slow path thread
+        //***************************************
+        thrs = malloc( sizeof( pthread_t ) * NUM_PROCS );
+        if (thrs == NULL)
+        {
+            perror( "malloc" );
+            return -1;
+        }
+        printf( "dpi-demo: Starting slow_path_thread on core 0\n");
+
+        if (pthread_create( &thrs[0], NULL, (void*)slow_path_thread,
+                          (void *)0 ))  //start at core 0
+        {
+            perror( "pthread_create" );
+            exit(1);
+        }
+
+
+        for (j= 1;j < NUM_PROCS;j++)
+        {
+            printf( "dpi-demo: Starting fast_path_thread on core 1\n");
+            if (pthread_create( &thrs[j], NULL, (void*)fast_path_thread,
+                          (void *)j ))  //start at core 1
+            {
+                perror( "pthread_create" );
+                exit(1);
+            }
+        }
+    }
+    else
+    {
+        
+        pShmBase = hplib_shmOpen();
+        if (pShmBase)
+        {
+            pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_1);
+            pNavlCfg =  (navl_wrapper_cfg_info_t*)pTemp;
+
+            pStats1 = pTemp + sizeof(navl_wrapper_cfg_info_t);
+
+        
+            pStats2 = pTemp + sizeof(navl_wrapper_cfg_info_t) +
+                    (sizeof(navl_wrapper_pkt_stat_t)*pNavlCfg->num_protocols);
+
+            pTemp = hplib_shmGetEntry(pShmBase, APP_ENTRY_2);
+            pGlobDpiStats = (struct dpi_stats*) pTemp;
+
+            printf("dpi stats:  nops=%d nclass=%d min cycle=%d max cycle=%d ave cycle=%lld #mallocs=%d #mbytes=%d n_err=%d fops=%d mCycles=%d fCycles=%d\n",
+            pGlobDpiStats->n_ops,
+            pGlobDpiStats->n_class,
+            pGlobDpiStats->min_time,
+            pGlobDpiStats->max_time,
+            pGlobDpiStats->n_ops? pGlobDpiStats->tot/pGlobDpiStats->n_ops : 0,
+            pGlobDpiStats->m_op,
+            pGlobDpiStats->m_bytes,
+            pGlobDpiStats->n_err,
+            pGlobDpiStats->f_op, pGlobDpiStats->m_cycles, pGlobDpiStats->f_cycles);
+            for(i=0;i < NUM_FP_PROCS; i++)
+            {
+                navl_results2(i);
+            }
+            exit(1);
+        }
+    }
+
+
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+            printf(">");
+            c=getchar();
+            if (c=='C')
+            {
+                CAP=!CAP; 
+                printf("CAPTURE= %d\n", CAP);
+            }
+            else if (c=='q') {QUIT=1;break;}
+            else if (c=='s')
+                our_stats_cb(netapi_handle, &netcp_stats);
+    #ifdef VDPI
+               else if (c=='c') 
+                {navl_clear_stats();printf("> Clearing DPI stats\n");}
+               else if (c=='v') navl_set_verbose();
+               else if (c=='p') 
+                 {DUMP_DPI_CONN = !DUMP_DPI_CONN;printf(">  **DPI CONN DUMP is %s ** \n", DUMP_DPI_CONN ?"enabled":"disabled");}
+               else if (c=='d')
+                 {
+                    pNavlCfg->enable_dpi = !pNavlCfg->enable_dpi;
+                    printf("enable_dpi flag: %d\n", pNavlCfg->enable_dpi);
+                    printf(">  **DPI is %s ** \n", pNavlCfg->enable_dpi?"enabled":"disabled");
+                 }
+    #endif
+            else if (c=='!') {system("sh");}
+    
+            else if ((c=='h')||(c=='?'))
+            {
+                printf("> 'q' to quit,  's' for stats,'d' to dump capture\n,> 'h' for help\n ");
+            }
+    #if 1
+            else if (c=='r')
+            {
+                netTest_utilDumpHeader(&last_header[0], 0,0,0);
+                netTest_utilDumpDescr(&last_desc[0], 0);
+            }
+    #endif
+        }
+
+
+
+#ifdef VDPI
+            navl_done();
+#endif
+
+        //wait for completion 
+        printf("main task now pending on thread completion\n");
+        for (i = 0; i < NUM_PROCS; i++)
+                pthread_join( thrs[i], NULL );
+
+        free( thrs );
+
+        /*************************************************
+        ************CLEAN UP****************************
+        ************************************************/
+        //get rid of rule, in the case that we are relaying packets
+        //also close our netcp rx channel
+        netapi_netcpCfgDelMac(netapi_handle,0,&err);
+        netapi_netcpCfgDelMac(netapi_handle,1,&err);
+    
+        netapi_pktioClose(netcp_rx_chan,&err);
+        netapi_pktioClose(netcp_tx_chan,&err);
+
+
+        //done
+        netapi_shutdown(netapi_handle);
+
+
+}
+#if 1
+static inline void send_it(Ti_Pkt *tip, int len, int out_port)
+{
+  int err=0;
+  PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+  nwalTxPktInfo_t meta_tx2={0};
+  int coreid=Osal_nwalGetProcId();
+  if (len<60)
+  {
+     unsigned int templen;
+     char * p_pkt;
+     len=60;
+     Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+     Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+  }
+  Pktlib_setPacketLen(tip,len);
+  meta_tx2.txFlag1 = NWAL_TX_FLAG1_META_DATA_VALID;
+  meta_tx2.ploadLen = len ;
+  meta_tx2.enetPort=out_port;
+  meta2.u.tx_meta=&meta_tx2;
+  stats.tx+=1;
+  if(coreid<MAX_NUM_CORES)
+    pkt_tx[coreid]+=1;
+  netapi_pktioSend(netcp_tx_chan,tip,&meta2,&err);
+}
+#endif
+void recv_cb_bridge(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+int i;
+int len;
+int p;
+Ti_Pkt * tip;
+unsigned int appid;
+unsigned int templen;
+char * p_pkt;
+unsigned long t1;
+unsigned long t2;
+unsigned long long ct1;
+unsigned long long ct2;
+unsigned short ip_pl;
+unsigned long long n_c_ops;
+int ifno;
+int out_port;
+
+int coreid=Osal_nwalGetProcId();
+
+
+pasahoLongInfo_t* protoInfo;
+
+t1=netapi_timing_start();
+ct1 =Osal_cache_op_measure(&n_c_ops);
+for(i=0;i<n_pkts;i++)
+{
+        
+        tip = p_recv[i];
+        appid = ((unsigned int)meta[i].u.rx_meta->appId)&0xff000000;
+        if (appid == NETAPI_NETCP_MATCH_GENERIC_IP) 
+        {
+           stats.ip+=1;
+        }
+
+        protoInfo=nwal_mGetProtoInfo(tip);
+        ifno = nwal_mGetRxEmacPort( protoInfo);
+        if (ifno ==1) out_port=2; else out_port=1;
+        if(coreid<MAX_NUM_CORES) stats.core_rx[coreid]+=1;
+        if (ifno < MAX_NUM_INTERFACES) stats.if_rx[ifno]+=1;
+        Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+        if (CAP==coreid)
+        {
+            memcpy((unsigned char *)&last_header[0],p_pkt,32);
+            memcpy((unsigned char*)&last_desc[0],tip,64);
+        }
+        len = Pktlib_getPacketLen(tip);//real length, subtract mac trailer
+        stats.rx+=1;
+        //printf("recv_cb_bridge: appId: 0x%x, out_port: %d\n", appid, out_port);
+        if (appid == NETAPI_NETCP_MATCH_GENERIC_MAC)
+        {
+#ifdef VDPI
+            {
+                if (pNavlCfg->enable_dpi)
+                    navl_process_pkt(p_pkt, len);
+            }
+#endif
+        }
+
+    
+ //printf("recv_cb_bridge: coreId: %d, outPort %d\n", coreid, out_port);
+        //Pktlib_freePacket(tip);
+       send_it(tip,len,out_port);
+}
+t2=netapi_timing_start();
+ct2 =Osal_cache_op_measure(&n_c_ops);
+stats.app_cycles +=  (unsigned long long) (t2-t1);
+stats.tx_cache_cycles += (unsigned long long) (ct2-ct1);
+return;
+}
+
+#define NTOPOP 150
+volatile Ti_Pkt * pHd[NTOPOP];
+
+#define PKTGEN_PKT_LEN pkt_len
+#define MAXP 4   //max ports 
+void gen_pkts(int np, int out_port)
+{
+    int i;
+    int p=0;
+    unsigned long * pI ;
+    Ti_Pkt * tip;
+    int len;
+    unsigned char * pData;
+    int cstall=0;
+    int coreid = Osal_nwalGetProcId();
+    for(i=0;i<np;)
+    {
+        //set out output port
+        if (out_port)
+        {
+            p=out_port;
+        }
+        else //flip flop
+        {
+            p+=1;
+            if(p>MAXP) p=1;
+        }
+        //get a packet
+        tip=Pktlib_allocPacket(OurHeap,PKTGEN_PKT_LEN);
+        pI = (unsigned long *) tip;
+        if (!tip)
+        {
+            pkt_stall[coreid]+=1;
+            cstall+=1;
+            if (cstall >= 100000) 
+            {
+                printf("worker core %d, max stall hit,, exiting.\n",coreid); 
+                return;
+            }
+            continue;
+        }
+        cstall=0;
+        Pktlib_getDataBuffer(tip,&pData,&len);
+        memcpy(pData,&dummy_mac,14);
+        Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, pData,PKTGEN_PKT_LEN);
+        Pktlib_setPacketLen(tip,PKTGEN_PKT_LEN);
+        pI[1]=0x80000000;
+        //pI[2] &= 0xfff0ffff ;move to pktio send function
+
+        //capture packet just in case
+        if (CAP==coreid)
+        {
+            unsigned int templen;
+            char * p_pkt;
+            Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+            memcpy((unsigned char *)&last_header[0],p_pkt,32);
+            memcpy((unsigned char*)&last_desc[0],tip,64);
+        }
+
+        //send  packet
+        send_it(tip, PKTGEN_PKT_LEN, p);
+        pkt_tx[coreid]+=1;
+        i+=1;
+   }
+
+    return;
+}
diff --git a/ti/runtime/netapi/demo/src/transport_dpi_demo.h b/ti/runtime/netapi/demo/src/transport_dpi_demo.h
new file mode 100755
index 0000000..98b7f82
--- /dev/null
+++ b/ti/runtime/netapi/demo/src/transport_dpi_demo.h
@@ -0,0 +1,52 @@
+#include <stdlib.h>

+

+#define MAC_HEADER_LEN          14

+#define IP_HEADER_LEN           20

+#define UDP_HEADER_LEN          8

+

+#define MAX_NUM_INTERFACES 64

+#define MAX_NUM_CORES 4

+

+#define SP_THREAD_MASK 0xF0000000

+#define THREAD_NUM_MASK 0x000000FF

+

+

+typedef struct stats_t

+{

+    long itx;  //initially generated

+    long itx2;

+    long rx;

+    long tx;

+    long n_bad;

+    long n_new;

+    long n_class0_rx;   //count of pkts classified 

+    long n_class1_rx;   //count of pkts classified 

+    long n_class2_rx;   //count of pkts classified 

+    long n_t1;

+    long n_t2;

+    long n_t3;

+    long sec_tx;

+    long sec_rx;

+    long sb_tx;

+    long sb_rx;

+    long secp_rx;

+    long n_auth_ok;

+    unsigned long long  app_cycles;

+    unsigned long long  send_cycles;

+    unsigned long long  tx_cache_cycles;

+    long rx_min;

+    long tx_min;

+    long if_rx[MAX_NUM_INTERFACES];

+    long  core_rx[MAX_NUM_CORES];

+    long  n_stats_cb;

+    long  ip;

+} STATS_T;

+

+typedef struct head_t

+{

+        long ip[5];

+        long udp[2];

+} HEAD_T;

+

+

+

diff --git a/ti/runtime/netapi/device/k2e/src/netapi_device.c b/ti/runtime/netapi/device/k2e/src/netapi_device.c
new file mode 100755
index 0000000..d183d6f
--- /dev/null
+++ b/ti/runtime/netapi/device/k2e/src/netapi_device.c
@@ -0,0 +1,68 @@
+/******************************************************************************
+ * FILE PURPOSE:   NETAPI Peripheral Device Configuration
+ ****************************************************************************** 
+ * FILE NAME:   netapi_device.c
+ *
+ * DESCRIPTION: NETAPI Peripheral Device Configuration Mapping
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013-2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ ******************************************************************************
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include "ti/runtime/netapi/netapi.h"
+
+#include "ti/csl/cslr_device.h"
+
+
+
+/* NETPAPI initialization parameters */
+NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
+{
+    1,
+    CSL_NETCP_CFG_REGS,
+    CSL_QMSS_CFG_BASE,
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+};
+
+
diff --git a/ti/runtime/netapi/device/k2h/src/netapi_device.c b/ti/runtime/netapi/device/k2h/src/netapi_device.c
new file mode 100755
index 0000000..f06e653
--- /dev/null
+++ b/ti/runtime/netapi/device/k2h/src/netapi_device.c
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * FILE PURPOSE:   NETAPI Peripheral Device Configuration
+ ****************************************************************************** 
+ * FILE NAME:   netapi_device.c
+ *
+ * DESCRIPTION: NETAPI Peripheral Device Configuration Mapping
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013-2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ ******************************************************************************
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include "ti/runtime/netapi/netapi.h"
+
+#include "ti/csl/cslr_device.h"
+
+/* NETPAPI initialization parameters */
+NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
+{
+    0,
+    CSL_NETCP_CFG_REGS,
+    CSL_QMSS_CFG_BASE,
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+
+};
+
+
diff --git a/ti/runtime/netapi/device/k2k/src/netapi_device.c b/ti/runtime/netapi/device/k2k/src/netapi_device.c
new file mode 100755
index 0000000..f06e653
--- /dev/null
+++ b/ti/runtime/netapi/device/k2k/src/netapi_device.c
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * FILE PURPOSE:   NETAPI Peripheral Device Configuration
+ ****************************************************************************** 
+ * FILE NAME:   netapi_device.c
+ *
+ * DESCRIPTION: NETAPI Peripheral Device Configuration Mapping
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013-2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ ******************************************************************************
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include "ti/runtime/netapi/netapi.h"
+
+#include "ti/csl/cslr_device.h"
+
+/* NETPAPI initialization parameters */
+NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
+{
+    0,
+    CSL_NETCP_CFG_REGS,
+    CSL_QMSS_CFG_BASE,
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+
+};
+
+
diff --git a/ti/runtime/netapi/device/k2l/src/netapi_device.c b/ti/runtime/netapi/device/k2l/src/netapi_device.c
new file mode 100755
index 0000000..4acdabd
--- /dev/null
+++ b/ti/runtime/netapi/device/k2l/src/netapi_device.c
@@ -0,0 +1,66 @@
+/******************************************************************************
+ * FILE PURPOSE:   NETAPI Peripheral Device Configuration
+ ****************************************************************************** 
+ * FILE NAME:   netapi_device.c
+ *
+ * DESCRIPTION: NETAPI Peripheral Device Configuration Mapping
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013-2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ ******************************************************************************
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+#include "ti/runtime/netapi/netapi.h"
+
+#include "ti/csl/cslr_device.h"
+
+/* NETPAPI initialization parameters */
+NETCP_CFG_GLOB_DEVICE_PARAMS_T netapiDeviceGblCfgParam =
+{
+    1,
+    CSL_NETCP_CFG_REGS,
+    CSL_QMSS_CFG_BASE,
+    CSL_QMSS_DATA_BASE,
+    CSL_NETCP_CFG_SA_CFG_REGS
+};
+
+
diff --git a/ti/runtime/netapi/docs/tifooter.htm b/ti/runtime/netapi/docs/tifooter.htm
new file mode 100755
index 0000000..4bdf9c9
--- /dev/null
+++ b/ti/runtime/netapi/docs/tifooter.htm
@@ -0,0 +1,4 @@
+<hr size="1"><small>
+Copyright  $year, Texas Instruments Incorporated</small>
+</body>
+</html>
diff --git a/ti/runtime/netapi/docs/tiheader.htm b/ti/runtime/netapi/docs/tiheader.htm
new file mode 100755
index 0000000..57de9bb
--- /dev/null
+++ b/ti/runtime/netapi/docs/tiheader.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>$title</title>
+<link href="$relpath$doxygen.css" rel="stylesheet" type="text/css">
+<link href="$relpath$tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<table width=100%>
+<tr>
+  <td bgcolor="black" width="1"><a href="http://www.ti.com"><img border=0 src="../tilogo.gif"></a></td>
+  <td bgcolor="red"><img src="../titagline.gif"></td>
+</tr>
+</table>
diff --git a/ti/runtime/netapi/docs/tilogo.gif b/ti/runtime/netapi/docs/tilogo.gif
new file mode 100755
index 0000000..f2fab2d
--- /dev/null
+++ b/ti/runtime/netapi/docs/tilogo.gif
diff --git a/ti/runtime/netapi/docs/titagline.gif b/ti/runtime/netapi/docs/titagline.gif
new file mode 100755
index 0000000..743a024
--- /dev/null
+++ b/ti/runtime/netapi/docs/titagline.gif
diff --git a/ti/runtime/netapi/docs/user_space_apiv2.ppt b/ti/runtime/netapi/docs/user_space_apiv2.ppt
new file mode 100755
index 0000000..be24d81
--- /dev/null
+++ b/ti/runtime/netapi/docs/user_space_apiv2.ppt
diff --git a/ti/runtime/netapi/makefile_armv7 b/ti/runtime/netapi/makefile_armv7
new file mode 100755
index 0000000..c380560
--- /dev/null
+++ b/ti/runtime/netapi/makefile_armv7
@@ -0,0 +1,157 @@
+#*******************************************************************************
+#* FILE PURPOSE: Top level makefile for Creating Component Libraries for ARM
+#* architectures
+#*******************************************************************************
+#* FILE NAME: makefile
+#*
+#* DESCRIPTION: Defines Compiler tools paths, libraries , Build Options 
+#*
+#*
+#*******************************************************************************
+#*
+# (Mandatory) Specify where various tools are installed.
+
+# Output for prebuilt generated libraries
+export ARMV7LIBDIR ?= ./lib
+export ARMV7OBJDIR ?= ./obj
+export ARMV7OBJDIR_SO := $(ARMV7OBJDIR)/netapi/lib_so
+export ARMV7OBJDIR := $(ARMV7OBJDIR)/netapi/lib
+
+export ARMV7BINDIR ?= ./bin
+
+export DEVICE ?=k2l
+
+#Enable the following to build for tci6614
+#export CPU ?=cortex-a8
+
+
+# ROOT Directory
+export ROOTDIR := ../../..
+
+
+# INCLUDE Directory
+export INCDIR := ../;$(PDK_INSTALL_PATH);$(ROOTDIR)
+
+# Common Macros used in make
+
+ifndef RM
+export RM = rm -f
+endif
+
+ifndef CP
+export CP = cp -p
+endif
+
+export MKDIR = mkdir -p
+
+ifndef RMDIR
+export RMDIR = rm -rf
+endif
+
+ifndef SED
+export SED = sed
+endif
+
+ifndef MAKE
+export MAKE = make
+endif
+
+ifeq ($(DEVICE), k2h)
+export CSL_DEVICE = -DDEVICE_K2H
+endif
+ifeq  ($(DEVICE), k2k)
+export CSL_DEVICE = -DDEVICE_K2K
+endif
+ifeq ($(DEVICE), k2l)
+export CSL_DEVICE = -DDEVICE_K2L -DNSS_GEN2
+endif
+ifeq ($(DEVICE), k2e)
+export CSL_DEVICE = -DDEVICE_K2E -DNSS_GEN2
+endif
+
+# PHONY Targets
+.PHONY: all clean lib tests examples install installbin demo installdemo
+
+# all rule
+all: .executables install installbin installdemo
+.executables: lib tests examples
+
+# Make rule to create $(ARMV7LIBDIR)/libnetapi.a library
+lib: $(ARMV7LIBDIR)/libnetapi_$(DEVICE).a libnetapi_$(DEVICE).so
+
+$(ARMV7LIBDIR)/libnetapi_$(DEVICE).a:
+        -@echo Building library...
+        -@echo ARMV7OBJDIR = $(ARMV7OBJDIR)
+        @$(MAKE) -f ./build/Makefile $@
+
+
+libnetapi_$(DEVICE).so:
+        -@echo Building library...
+        -@echo ARMV7OBJDIR = $(ARMV7OBJDIR_SO)
+        @$(MAKE) -f ./build/Makefile $@
+
+
+# Rule to clean $(ARMV7LIBDIR)/libnetapi.a library
+clean:
+        -@echo Cleaning netapi package... $@
+        @$(MAKE) -f ./build/Makefile $@
+        @$(MAKE) -f ./test/build/Makefile $@
+
+install:
+        install -d $(INSTALL_INC_BASE_DIR)/ti/runtime/netapi
+        install -d $(INSTALL_INC_BASE_DIR)/ti/runtime/netapi/src
+        install -d $(INSTALL_LIB_BASE_DIR)
+        $(CP) ./*.h                                       $(INSTALL_INC_BASE_DIR)/ti/runtime/netapi
+        $(CP) -r ./device                                 $(INSTALL_INC_BASE_DIR)/ti/runtime/netapi/
+        @$(CP) -r $(ARMV7LIBDIR)/libnetapi_$(DEVICE).a    $(INSTALL_LIB_BASE_DIR)
+        @$(CP) -rp $(ARMV7LIBDIR)/libnetapi_$(DEVICE).so* $(INSTALL_LIB_BASE_DIR)
+        $(CP) src/*.h                                     $(INSTALL_INC_BASE_DIR)/ti/runtime/netapi/src
+
+installbin:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_loopback_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_loopback_$(DEVICE)
+        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_router_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_router_$(DEVICE)
+        install -c -m 755 $(ARMV7BINDIR)/netapi/test/net_test_bench_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/net_test_bench_$(DEVICE)
+        install -c -m 755 $(ARMV7BINDIR)/netapi/test/nt_bridge_$(DEVICE) $(INSTALL_BIN_BASE_DIR)/nt_bridge_$(DEVICE)
+        install -c -m 755 tools/eqos/dumpqos.sh $(INSTALL_BIN_BASE_DIR)/dumpqos.sh
+        install -d $(SYSCONFDIR)/transportnetlib/test
+        $(CP) test/net_test_config.txt                        $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/net_test_loopback_setup.sh    $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/net_test_router_setup.sh      $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/nt_bridge_setup.sh            $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/irqset.sh                     $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/dsp_core_setup.sh             $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/eqos/parse_ale.sh             $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/eqos/parse_ale.awk            $(SYSCONFDIR)/transportnetlib/test
+        $(CP) test/eqos_config1.txt                           $(SYSCONFDIR)/transportnetlib/test
+        $(CP) test/eqos_config2.txt                           $(SYSCONFDIR)/transportnetlib/test
+        install -c -m 755 tools/ipsec_tools/sample_evm_ipsec.conf  $(SYSCONFDIR)/transportnetlib/test
+
+installdemo:
+        install -d $(INSTALL_BIN_BASE_DIR)
+        install -c -m 755 $(ARMV7BINDIR)/netapi/demo/transport_dpi_demo $(INSTALL_BIN_BASE_DIR)/
+        install -d $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/transport_dpi_demo_setup.sh    $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 644 demo/demo_setup_files/index.html                     $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/dpicgi1.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/dpicgi2.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/dpicgi3.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/dpicgi4.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c -m 755 demo/demo_setup_files/dpicgi5.sh               $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/stats1.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/stats2.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/stats3.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/stats4.awk                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/tilogo.gif                      $(SYSCONFDIR)/transportnetlib/dpi_demo
+        install -c demo/demo_setup_files/titagline.gif                   $(SYSCONFDIR)/transportnetlib/dpi_demo
+
+# Make rule to create tests
+tests:
+        -@echo compiling tests 
+        @$(MAKE) -f ./test/build/Makefile $@
+
+# Make rule to create net_test_dpi_demo 
+demo:
+        -@echo compiling tests 
+        @$(MAKE) -f ./demo/build/Makefile $@
+examples:
diff --git a/ti/runtime/netapi/netapi.h b/ti/runtime/netapi/netapi.h
new file mode 100755
index 0000000..e1225c5
--- /dev/null
+++ b/ti/runtime/netapi/netapi.h
@@ -0,0 +1,319 @@
+/******************************************************************************
+ * FILE PURPOSE:  User space access to transport resources on SOC
+ ******************************************************************************
+ * FILE NAME:   netapi.h
+ *
+ * DESCRIPTION: NETAPI definitions and data structures
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+/**
+ *   @file  netapi.h
+ *
+ *   path  ti/runtime/netapi/netapi.h
+ *
+ *   @brief  Netapi main header file for user space transport library
+ *
+ */
+
+/**  @mainpage Network API 
+ *
+ *   @section intro  Introduction
+ *
+ *   The network API provides a user space interface to TI SOC transport 
+ *   Resources. The library includes:
+ *      - general startup and setup for user space operations
+ *      - memory heap and packet buffer  management
+ *      - pktio  either to/from network or internal queues
+ *      - timers for network stacks
+ *      - netcp (network co-processor) configuration and control
+ *      - utilities including user space synchronization primitivies
+ *      - sample scheduling event loop
+ *
+ *    NETAPI allows user space transport to configure control the NETCP:
+ *      - Classification of packets based on L2: MAC header fields
+ *      - Classification of packets based on L3: IP header fields
+ *      - Routing of packets to host based on L4 UDP or L5 GTPU ID
+ *      - Unidirectional IPSec SA creation and deletion
+ *      - Unidirectional IPSec Security Policy creation and deletion
+ *
+ *  \par
+ *  NOTE:
+ *      (C) Copyright 2010-2012 Texas Instruments, Inc.
+ *  \par
+ */
+
+#ifndef __NETAPI__H
+#define __NETAPI__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "ti/drv/nwal/nwal.h"
+#include "ti/runtime/hplib/hplib.h"
+#include "netapi_types.h"
+#include "netapi_tune.h"
+#include "pktio.h"
+#include "netcp_cfg.h"
+#include "netapi_sec.h"
+#include "netapi_sched.h"
+#include "netapi_util.h"
+
+
+/* Define NETAPI as a master group in Doxygen format and
+ * add all NETAPI
+ * definitions to this group.
+ */
+/** @defgroup netapi Network API
+ *  @{
+ */
+/** @} */
+
+/** @defgroup netapi_gen_functions NETAPI General Functions
+ *  @ingroup netapi
+ */
+
+
+/** @defgroup netapi_cfg NETAPI Configuration Interface
+ *  @ingroup netapi
+ */
+/** @defgroup cfg_functions NETAPI Configuration Functions
+ *  @ingroup netapi_cfg
+ */
+
+/** @defgroup cfg_structures NETAPI Configuration Structures used in API's
+ *  @ingroup netapi_cfg
+ */
+
+/** @defgroup cfg_constants NETAPI Configuration Constants
+ *  @ingroup netapi_cfg
+ */
+
+/** @defgroup netapi_security NETAPI Security Interface
+ *  @ingroup netapi
+ */
+
+/** @defgroup cfg_security_functions NETAPI Security Configuration Functions
+ *  @ingroup netapi_security
+ */
+
+/** @defgroup cfg_security_structures NETAPI Security Configuration Structures used in API's
+ *  @ingroup netapi_security
+ */
+
+
+/** @defgroup security_constants NETAPI Security Constants
+ *  @ingroup netapi_security
+ */
+
+/** @defgroup netapi_pktio NETAPI PKTIO Interface
+ *  @ingroup netapi
+ */
+
+/** @defgroup pktio_functions NETAPI PKTIO Functions
+ *  @ingroup netapi_pktio
+ */
+
+/** @defgroup pktio_structures NETAPI PKTIO Structures used in API's
+ *  @ingroup netapi_pktio
+ */
+
+/** @defgroup pktio_constants NETAPI PKTIO Constants
+ *  @ingroup netapi_pktio
+ */
+
+/** @defgroup netapi_scheduler NETAPI Scheduler Interface
+ *  @ingroup netapi
+ */
+
+/** @defgroup sched_functions NETAPI Scheduler Functions
+ *  @ingroup netapi_scheduler
+ */
+
+/** @defgroup sched_structures NETAPI Scheduler Structures used in API's
+ *  @ingroup netapi_scheduler
+ */
+
+/** @defgroup sched_constants NETAPI Scheduler Constants
+ *  @ingroup netapi_scheduler
+ */
+
+/** @defgroup netapi_cb_functions NETAPI Callback Functions
+ *  @ingroup netapi
+ */
+
+/** @defgroup tune_parameters NETAPI Tune Parameters
+ *  @ingroup netapi
+ */
+
+/**
+ * @def NETAPI_PROC_MASTER
+ *      This defines the master core/thread for a process
+ */
+#define NETAPI_PROC_MASTER 3
+
+/**
+ * @def NETAPI_SYS_MASTER
+ *      This defines the master core for the system
+ *      also will be master core/thread of the process
+ */
+#define NETAPI_SYS_MASTER  2
+
+/**
+ * @def NETAPI_CORE_MASTER
+ *      This defines the master thread  for a particular core
+ */
+#define NETAPI_CORE_MASTER 1
+
+/**
+ * @def  NETAPI_NO_MASTER
+ *      This defines a non master thread which can be running on any core,, specifically for data only
+ */
+#define NETAPI_NO_MASTER   0  //data only
+
+
+
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_init  API instantiates the NETAPI and allocated global resources.
+ *
+ *  @details The API will allocate global resources valid  per system level common
+ *           across all ARM cores or per thread based on "master" argument.
+ *           Intializes the following substems: pktio pklib qmss cppi nwal
+ *
+ *  @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.
+ *  @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);
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_shutdown  API de-allocates all global resources allocated as part of @ref netapi_init
+ *
+ *  @details De-allocates global resources valid  per system level common across all ARM cores 
+ *           or per thread based on "master" argument passed in at init time.
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     none 
+ *  @pre        @ref netapi_init 
+ */
+void netapi_shutdown(NETAPI_T  p);
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getPktlibIfTable  API returns a Pktlib_HeapIfTable to use when creating
+ *  pktlib heaps
+ *
+ *  @details Application will need a Pktlib_HeapIfTable in order to create its own heaps. This
+ *           function returns a table that can be passed in the call to Pktlib_CreateHeap
+ *           The memory used for these heaps is special with the following characteristics:
+ *             - Specific alignment.
+ *             - Must be contguous.
+ *             - Must have a physical to virtual mapping that  is known by NETAPI. 
+ *           Thus it must be completely managed by NETAPI. This interface table provides a
+ *           malloc function that the pktlib heap library uses to allocate data for the heap
+ *           buffers.
+ *  @retval     Pktlib_HeapIfTable pointer 
+ *  @pre        @ref netapi_init 
+ */
+Pktlib_HeapIfTable *netapi_getPktlibIfTable(void) ;
+
+
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getDescRemainder  API is used to return the amount of free memory available
+ *  for allocating descriptors for additonal Pktlib heaps.
+ *
+ *  @details The application can use this API to determine how much free memory is
+ *           available for heap descriptors if it decides to create its own heap.
+ *  @retval     Amount of memory available for heap descriptor storage (in bytes)
+ *  @pre        @ref netapi_init 
+ */
+int  netapi_getDescRemainder(void);
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_netcpPoll  API is used to poll for NETCP configuration response messages.
+ *
+ *  @details Application, if implementing the scheduler,  will need to call this
+ *           function periodically to check for NETCP configuration responses (eg
+ *           statistics requests). 
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     none 
+ *  @pre        @ref netapi_init 
+ */
+void netapi_netcpPoll(NETAPI_T  p);
+
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_pollHeapGarbage  API is used to poll the garbage collection queue for 
+ *                                  the internal NETAPI heaps and any application created heaps.
+ *
+ *  @details  This API is used to poll the netapi internal heaps and any 
+ *            application-created heaps    that have been registered with the netapi instance. The
+ *            poll function checks the garbage collection queue associated with the heap and returns
+ *            descriptors and buffers when appropriate to the main free queue.
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     none 
+ *  @pre        @ref netapi_init
+ */
+void netapi_pollHeapGarbage(NETAPI_T p);
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getMemoryRegionId  API is used to return configured descriptor
+ *         memory region Id
+ *
+ *  @details  API is used to return configured descriptor memory region Id
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     Memory Resgion Id, -1 on error
+ *  @pre        @ref netapi_init
+ */
+int netapi_getMemoryRegionId(NETAPI_T  p);
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/netapi_sched.h b/ti/runtime/netapi/netapi_sched.h
new file mode 100755
index 0000000..a42a09f
--- /dev/null
+++ b/ti/runtime/netapi/netapi_sched.h
@@ -0,0 +1,359 @@
+/**************************************************************************************
+ * FILE PURPOSE:  Netapi scheduler module
+ ***************************************************************************************
+ * FILE NAME:   netapi_sched.h
+ *
+ * DESCRIPTION: Netapi sample  scheduler header file for  user space transport library
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/**
+ *  @file netapi_sched.h
+ *  @brief netapi scheduler header file for user space transport library
+ */
+
+
+#ifndef __NETAPI_SCHED__
+#define __NETAPI_SCHED__
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "ti/csl/tistdtypes.h"
+#include "netapi_types.h"
+#include "ti/runtime/netapi/src/netapi_loc.h"
+
+//#include "netapi.h"
+
+/**
+ * @brief This defines the handle to the NETAPI scheduling context.
+ * Each user space transport application thread/core should have its own
+ * scheduler context.
+ */
+struct  NETAPI_SCHED_HANDLE_Tag;
+
+
+/**
+ *  @ingroup netapi_cb_functions
+ *  @brief NETAPI_SCHED_CB   Callback function for scheduling context house keeping.
+ *  This allows application to set a function to be periodically called by scheduler
+ *  to perform house keeping operations. If NULL, then no callback will be invoked
+ * 
+ *  @details The application provides a callback function that the NETAPI scheduling context
+ *  will call on  a periodic/ low priority basis.
+ *  @param[in]  h   The handle to the NETAPI scheduling context
+ *  @retval     none 
+ *  @pre        @ref netapi_init
+ */
+typedef void (*NETAPI_SCHED_CB)(struct NETAPI_SCHED_HANDLE_Tag *h);
+
+/**
+ *  @ingroup sched_structures
+ *  @brief NETAPI scheduler configuration structure.
+ *
+ *  @details Pointer to this structure is passed in the call to @ref netapi_schedOpen API.
+ */
+typedef struct NETAPI_SCHED_CONFIG_Tag
+{
+/**
+ * @def NETAPI_SCHED_DURATION
+ * @ingroup sched_constants
+ *      Duration configuration flag for scheduler
+ */
+#define NETAPI_SCHED_DURATION 0x1
+
+/**
+ * @def NETAPI_SCHED_CBV
+ * @ingroup sched_constants
+ *      This defines that the housekeeping call back option of scheduler context has been configured.
+ */
+#define NETAPI_SCHED_CBV  0x2
+
+/// @cond NOT_IMPLEMENTED
+/**
+ * @def NETAPI_SCHED_POWER
+ * @ingroup sched_constants
+ *      This defines the power option of scheduler context being configured.
+ */
+#define NETAPI_SCHED_POWER 0x4
+
+/**
+ * @def NETAPI_SCHED_FINE
+ * @ingroup sched_constants
+ *      This defines the fine tune option of scheduler context being configured.
+ */
+#define NETAPI_SCHED_FINE  0x8
+/// @endcond
+/**
+ * @def NETAPI_SCHED_FOREVER
+ * @ingroup sched_constants
+ *      This defines is used to configure scheduler to run forever.
+ */
+#define NETAPI_SCHED_FOREVER 0L
+
+    int             valid_flags;            /**< Flags used to configure the scheduler, @ref NETAPI_SCHED_DURATION,
+                                                 @ref NETAPI_SCHED_CBV. */
+    uint64_t        duration;               /**< Duration scheduler is configured to run, 0 == forever,
+                                                 non-zero value is ticks for scheduler to run */
+    NETAPI_SCHED_CB house_cb;               /**< House keeping callback */
+
+    uint32_t        interval;               /**< How many poll loop intervals after which to call the house keeping
+                                                 callback function*/
+
+    int             power_control;          /**< Currently NOT_IMPLEMENTED  */
+
+
+/**
+ * @def NETAPI_SCHED_POWER_ALWAYS_OFF
+ * @ingroup sched_constants
+ *      This define is used to configure scheduler power_control option to be always off.
+ */
+#define NETAPI_SCHED_POWER_ALWAYS_OFF 0
+
+/**
+ * @def NETAPI_SCHED_POWER_ALWAYS_ON
+ * @ingroup sched_constants
+ *      This define is used to configure scheduler power_control option to be always on.
+ */
+#define NETAPI_SCHED_POWER_ALWAYS_ON 1
+
+
+    int             idle_time;              /**< Currently NOT_IMPLEMENTED  */
+    Bool            yield;                  /**< Option to yield in scheduling loop if no packets received
+                                                 from any NETAPI PKTIO channel associated with NETAPI instance.*/
+    Bool            pollCtrlQ;              /**< Option to poll the NETCP control queues associated with the NETAPI
+                                                 intance in scheduling loop. */
+    Bool            pollGarbageQ;           /**< Option to poll the internal heaps and any application heaps that have
+                                                 been registerd with NETAPI instance. in scheduling loop. */
+} NETAPI_SCHED_CONFIG_T;
+
+/**
+ *  @ingroup sched_structures
+ *  @brief NETAPI scheduler statisics.
+ *
+ *  @details This structure is returned from call to @ref netapi_schedOpen API.
+ */
+typedef struct NETAPI_SCHED_STATS_Tag
+{
+    unsigned long long num_pkts;        /**< Number of packets processed in sheduler context */
+    unsigned long long busy_cycles;     /**< Number of CPU cyles scheduler was busy processing packets */
+    unsigned long long cache_cycles;    /**< Number of CPU cyles scheduler was busy in cache operations */
+} NETAPI_SCHED_STATS_T;
+
+/**
+ *  @ingroup sched_structures
+ *  @brief NETAPI scheduler configuration structure.
+ *
+ *  @details Pointer to this structure is passed in the call to @ref netapi_schedOpen API.
+ */
+typedef struct NETAPI_SCHED_HANDLE_Tag
+{
+/**
+ * @def NETAPI_SCHED_STATE_CLOSE
+ * @ingroup sched_constants
+ *      This define indicates the state of the scheduler to be CLOSE state or idle
+ */
+#define NETAPI_SCHED_STATE_CLOSE 0x0
+
+/**
+ * @def NETAPI_SCHED_STATE_CLOSE_IN_PROGRESS
+ * @ingroup sched_constants
+ *      This define indicates the state of the scheduler is being shutdown state
+ */
+#define NETAPI_SCHED_STATE_CLOSE_IN_PROGRESS 1
+
+/**
+ * @def NETAPI_SCHED_STATE_OPEN
+ * @ingroup sched_constants
+ *      This define indicates the state of the scheduler is OPEN or running
+ */
+#define NETAPI_SCHED_STATE_OPEN 2
+
+
+    volatile int            state;              /**< @ref NETAPI_SCHED_STATE_CLOSE ,
+                                                     @ref NETAPI_SCHED_STATE_CLOSE_IN_PROGRESS ,
+                                                     @ref NETAPI_SCHED_STATE_OPEN */
+    void*                   back;               /**< Pointer back to NETAPI handle */
+    NETAPI_SCHED_CONFIG_T   config;             /**< NETAPI scheduler configuration */
+    uint64_t                start;              /**< Start time of NETAPI scheduler context */ 
+    volatile int            shutdown_reason;    /**< Currently NOT_IMPLEMENTED  */
+    volatile uint64_t       shutdown_time;      /**< Time till scheduler context will be shutdown/closed */
+    NETAPI_SCHED_STATS_T    stats;              /**< Per scheduler satistics */
+} NETAPI_SCHED_HANDLE_T;
+
+
+
+
+/// @cond NOT_IMPLEMENTED
+/* return codes for sched run */
+#define NETAPI_SCHED_RETURN_ERR         0       /**<unknown, err */
+#define NETAPI_SCHED_RETURN_TO          1       /**<returned after timeout */
+#define NETAPI_SCHED_RETURN_SHUTDOWN    2       /**<returned after shutdown */
+/// @endcond
+
+/**
+ *  @ingroup sched_structures
+ *  @brief NETAPI scheduler shutdown structure.
+ *  @details  This structure is passed an an argument for @ref netapi_schedClose.
+ */
+typedef struct NETAPI_SCHED_SHUTDOWN_Tag
+{
+/**
+ * @def NETAPI_SCHED_SHUTDOWN_NOW
+ * @ingroup sched_constants
+ *      This define is used to shudown the scheduling context immediately 
+ */
+#define NETAPI_SCHED_SHUTDOWN_NOW 0
+
+/// @cond NOT_IMPLEMENTED
+/**
+ * @def NETAPI_SCHED_SHUTDOWN_TO
+ * @ingroup sched_constants
+ *      This define is used to shudown the scheduling context after a short while.
+ */
+#define NETAPI_SCHED_SHUTDOWN_TO  1
+
+/**
+ * @def NETAPI_SCHED_SHUTDOWN_NEXT_IDLE
+ * @ingroup sched_constants
+ *      This define is used to shudown the scheduling context during next idle period
+ */
+#define NETAPI_SCHED_SHUTDOWN_NEXT_IDLE  2
+/// @endcond
+    int shutdown_type;                      /**< @ref NETAPI_SCHED_SHUTDOWN_NOW*/
+
+    int timeout;                            /**< Currently NOT_IMPLEMENTED  */
+} NETAPI_SCHED_SHUTDOWN_T;
+
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedOpen: API to open a scheduling context.
+ *
+ *  @details API to open a scheduling context.
+ *  @param[in]  n   the NETAPI handle, @ref NETAPI_T
+ *  @param[in] p_config :pointer to @ref NETAPI_SCHED_CONFIG_T
+  *  @param[out] p_err    Pointer to error code.
+ *  @retval     Handle associated with created scheduler context, @ref NETAPI_SCHED_HANDLE_T
+ *  @pre        @ref netapi_init 
+ */
+NETAPI_SCHED_HANDLE_T * netapi_schedOpen(NETAPI_T                   n,
+                                         NETAPI_SCHED_CONFIG_T*     p_config,
+                                         int*                       p_err);
+
+/// @cond NOT_IMPLEMENTED
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedControl: API to re-configure a scheduling context.
+ *
+ *  @details API to re-configure a scheduling context.
+ *  @param[in]  s           The NETAPI scheduling context handle, @ref NETAPI_SCHED_HANDLE_T
+ *  @param[in] p_config     Pointer to @ref NETAPI_SCHED_CONFIG_T
+ *  @param[out] p_err    Pointer to error code.
+ *  @retval     Handle associated with created scheduler context, @ref NETAPI_SCHED_HANDLE_T
+ *  @pre        @ref netapi_schedOpen 
+ */
+int netapi_schedControl(NETAPI_SCHED_HANDLE_T*  s,
+                        NETAPI_SCHED_CONFIG_T*  p_config,
+                        int*                    p_err);
+/// @endcond
+
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedRun: API for main entry point to scheduler.
+ *
+ *  @details API for main entry point to scheduler. User application gives up control to scheduler.
+  *  @param[in]  s           The NETAPI scheduling context handle, @ref NETAPI_SCHED_HANDLE_T
+ *  @param[out] p_err: error code, zero on sucess, non-zero on failure
+ *  @retval     always 1
+ *  @pre        @ref netapi_schedOpen 
+ */
+int netapi_schedRun(NETAPI_SCHED_HANDLE_T*  s,
+                    int*                    p_err);
+
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedClose: API to close a scheduling context.
+ *
+ *  @details API to close a scheduling context.
+ *  @param[in]  s           The NETAPI scheduling context handle, @ref NETAPI_SCHED_HANDLE_T
+ *  @param[in]  p_close  @ref NETAPI_SCHED_SHUTDOWN_T
+ *  @param[out] p_err    Pointer to error code.
+ *  @retval     NO USED, ALWAYS 1
+ *  @pre        @ref netapi_schedOpen 
+ */
+int netapi_schedClose(NETAPI_SCHED_HANDLE_T*    s, 
+                      NETAPI_SCHED_SHUTDOWN_T*  p_close,
+                      int*                      p_err);
+
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedGetHandle: API to get the NETAPI handle from scheduling context.
+ *
+ *  @details API to get the NETAPI handle from scheduling context.
+ *  @param[in]  s The NETAPI scheduling context handle, @ref NETAPI_SCHED_HANDLE_T
+ *  @retval     Handle to NETAPI instance
+ */
+static NETAPI_T netapi_schedGetHandle(NETAPI_SCHED_HANDLE_T *s)
+{
+    return (NETAPI_T)s->back;
+}
+
+/**
+ *  @ingroup sched_functions
+ *  @brief netapi_schedGetStats: API to get scheduling context statistics.
+ *
+ *  @details API to get scheduling context statistics.
+ *  @param[in]  s           The NETAPI scheduling context handle, @ref NETAPI_SCHED_HANDLE_T
+ *  @param[in]  p_pkts  total number of packets processed by scheduler poll loop
+ *  @param[in]  p_cycles total number cycles taken by scheduler poll loop
+ *  @param[in]  p_ccycles  total number of cache control cycles taken by scheduler poll loop
+ *  @retval     none
+ */
+void netapi_schedGetStats(NETAPI_SCHED_HANDLE_T*    s,
+                          unsigned long long*       p_pkts, 
+                          unsigned long long*       p_cycles,
+                          unsigned long long*       p_ccycles);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/ti/runtime/netapi/netapi_sec.h b/ti/runtime/netapi/netapi_sec.h
new file mode 100755
index 0000000..c4e8add
--- /dev/null
+++ b/ti/runtime/netapi/netapi_sec.h
@@ -0,0 +1,320 @@
+/******************************************************************************
+ * FILE PURPOSE:  Netapi Security configuration header file
+ ******************************************************************************
+ * FILE NAME:   netapi_sec.h
+ *
+ * DESCRIPTION: netapi security  header file for user space transport library
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+
+
+/**
+ *   @file netapi_sec.h
+ *   @brief netapi security header file for user space transport library
+ */
+
+#ifndef __NETAPI_SEC__H
+#define __NETAPI_SEC__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#include "netcp_cfg.h"
+#include "ti/drv/nwal/nwal.h"
+#include <ti/drv/sa/salld.h>
+
+
+
+
+/**
+ *  @ingroup cfg_security_structures
+ *  @brief NETAPI SA Statistics
+ *
+ *  @details Pointer to this structure is passed in the call to netapi_getSaStats API. It will be popluated with the requested statistics.
+ */
+typedef struct NETAPI_SA_STATS_Tag
+{
+/**
+ * Bit map indicating the IPSec SA Inflow/Side band data mode stats validity
+ * <br>
+ * The validParams field indicates to the caller which stats being returned by calling the @ref netapi_getSaStats are valid.
+ *      @ref NETAPI_IPSEC_STAT_VALID, @ref NETAPI_SIDEBAND_DATA_MODE_STAT_VALID
+ */
+    uint16_t            validParams;            /**< Bit map indicating the IPSec SA Inflow/Side band data mode stats validity */
+
+/**
+ * @def NETAPI_IPSEC_STAT_VALID
+ * @ingroup security_constants
+ *      Indicates to user application that IPSEC stats are valid for INFLOW mode
+ */
+#define NETAPI_IPSEC_STAT_VALID                 0x0001 
+
+/**
+ * @def NETAPI_SIDEBAND_DATA_MODE_STAT_VALID
+ * @ingroup security_constants
+ *      Indicates to user application that IPSEC stats are valid for SIDEBAND mode
+ */
+#define NETAPI_SIDEBAND_DATA_MODE_STAT_VALID    0x0002
+
+    Sa_IpsecStats_t     saIpsecStats;           /**<  Structure containing IPSEC stats for INFLOW MODE*/
+    Sa_DataModeStats_t  dataModeStats;          /**<  Structure containing Data Mode stats for SIDEBAND MODE */
+} NETAPI_SA_STATS_T;
+
+
+/**
+ *  @ingroup cfg_security_structures
+ *  @brief NETAPI security SA information
+ *
+ *  @details This structure contains the information necessary to create a security association (for either for inflow mode or sideband mode)
+ */
+typedef struct NETAPI_SEC_SA_INFO_tag
+{
+    nwal_SaDir          dir;            /**< Direction for the channel. Inbound or Outbound */
+    uint32_t            spi;            /**< IPSec Security Parameter index */
+    nwal_IpSecProto     proto;          /**< IpSec Proto (ESP/AH) */
+    nwal_saMode         saMode;         /**< Tunnel/ Transport mode (sideband RX/TX) */
+    nwal_IpType         ipType;         /**< IPV4 or V6 (sideband RX/TX) */
+    nwalIpAddr_t        src;            /**< Source IP Address (remote) (sideband RX) */
+    nwalIpAddr_t        dst;            /**< DST IP Address (local) (sideband RX) */
+    uint32_t            replayWindow;   /**< Replay Window Size (sideband RX) */
+    nwal_saAALG         authMode;       /**< Authentication Algorithm */
+    nwal_saEALG         cipherMode;     /**< Encryption Algorithm */
+    uint32_t            esnLo;          /**< Initial Value of Extended Sequence Number LSB (sideband TX) */
+    uint32_t            esnHi;          /**< Initial Value of Extended Sequence Number MSB (sideband TX) */
+} NETAPI_SEC_SA_INFO_T;
+
+
+
+/**
+ * @brief This defines the SA mode of operation to be INFLOW. This means that IPSEC will be applied 
+ *        as the packet is being received or just before it is transmitted. This is a more efficient 
+ *        way to use SA and saves host cycles.
+ * @ingroup security_constants
+ */
+#define NETAPI_SEC_SA_INFLOW   0x2
+
+/**
+ * @brief This defines the SA mode of operation to be SIDEBAND. This means that Security Acclerator is
+ *        to be used a traditional accelerator where for RX, the packet will first be received on host 
+ *        and then sent back to SA for crypto.  For TX the packet will first be sent to SA for crypto,
+ *        returned to host and then sent to NETCP for transmit.
+ * @ingroup security_constants
+ */
+#define NETAPI_SEC_SA_SIDEBAND 0x1
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief netapi_secAddSA  API to add an IPSEC SA.
+ *
+ *  @details API to add an IPSec SA. SAs are IPSec security contexts and define a uni-directional
+ *           secure path (tunnel or transport). SAs are attached to MAC interfaces that have already
+ *           been created. API allows SA to be configured as either inflow or sideband mode. This API is used for both receive and transmit SAs.
+ *  @param[in]  h            The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  iface_no     Interface to attach SA to.
+ *  @param[in]  sa_info      Information on the SA being added, @ref NETAPI_SEC_SA_INFO_T
+ *  @param[in]  key_params   Security key information for the SA.
+ *  @param[in]  mode         SA implementation mode @ref NETAPI_SEC_SA_SIDEBAND or @ref NETAPI_SEC_SA_INFLOW
+ *  @param[in]  route        Optional: @ref NETCP_CFG_ROUTE_HANDLE_T
+ *  @param[in]  data_mode_handle     Returned data mode handle for PKTIO (in the case of sideband SAs)
+ *  @param[in]  inflow_mode_handle   Returned inflow mode handle for PKTIO (in the case of TX inflow SAs)
+ *  @param[in]  user_data     Optional: pointer to user provided data associated with SA, optional
+ *  @param[out]  perr        Pointer to error code.
+ *  @retval     Application id associated with created SA @ref NETCP_CFG_SA_T. 
+ *              This ID is used when referencing this SA in subsequent APIs (eg. to delete it).
+ *              Also in the case of Receive Inflow,  packets will be tagged with this ID so that s/w will know 
+ *              that the packet has already been decrypted, authenticated and window-replay checked.
+ *              (note: if a RX policy is matched also then the ID associated with the policy will be tagged instead).
+ *  @pre        @ref netapi_init
+ */
+NETCP_CFG_SA_T netapi_secAddSA(NETAPI_T                     h,
+                                int iface_no,
+                                NETAPI_SEC_SA_INFO_T*       sa_info,
+                                nwalSecKeyParams_t*         key_params,
+                                int                         mode,
+                                NETCP_CFG_ROUTE_HANDLE_T    route,
+                                void**                      data_mode_handle,
+                                void**                      inflow_mode_handle,
+                                void*                       user_data,
+                                int*                        perr);
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief netapi_secAddSAIP  API to add an IPSEC SA with IP handle.
+ *
+ *  @details API to add an IPSec SA. SAs are IPSec security contexts and define a uni-directional
+ *           secure path (tunnel or transport). SAs are attached to MAC interfaces that have already
+ *           been created. API allows SA to be configured as either inflow or sideband mode. This API is used for both receive and transmit SAs.
+ *  @param[in]  h            The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  iface_no     Interface to attach SA to.
+ *  @param[in]  sa_info      Information on the SA being added, @ref NETAPI_SEC_SA_INFO_T
+ *  @param[in]  key_params   Security key information for the SA.
+ *  @param[in]  mode         SA implementation mode @ref NETAPI_SEC_SA_SIDEBAND or @ref NETAPI_SEC_SA_INFLOW
+ *  @param[in]  route        Optional: @ref NETCP_CFG_ROUTE_HANDLE_T
+ *  @param[in]  data_mode_handle     Returned data mode handle for PKTIO (in the case of sideband SAs)
+ *  @param[in]  inflow_mode_handle   Returned inflow mode handle for PKTIO (in the case of TX inflow SAs)
+ *  @param[in]  user_data     Optional: pointer to user provided data associated with SA, optional
+ *  @param[in]  ip_rule      IP rule @ref NETCP_CFG_IP_T
+ *  @param[out]  perr        Pointer to error code.
+ *  @retval     Application id associated with created SA @ref NETCP_CFG_SA_T. 
+ *              This ID is used when referencing this SA in subsequent APIs (eg. to delete it).
+ *              Also in the case of Receive Inflow,  packets will be tagged with this ID so that s/w will know 
+ *              that the packet has already been decrypted, authenticated and window-replay checked.
+ *              (note: if a RX policy is matched also then the ID associated with the policy will be tagged instead).
+ *  @pre        @ref netapi_init
+ */
+NETCP_CFG_SA_T netapi_secAddSAIP(NETAPI_T h,
+                                 int iface_no,
+                                 NETAPI_SEC_SA_INFO_T *sa_info,
+                                 nwalSecKeyParams_t * key_params,
+                                 int inflow_mode,
+                                 NETCP_CFG_ROUTE_HANDLE_T  route,
+                                 void **p_data_mode_handle,
+                                 void **p_inflow_mode_handle,
+                                 void * p_user_data,
+                                 NETCP_CFG_IP_T ip_rule,
+                                 int * perr);
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief  netapi_secDelSA: API to delete an IPSEC SA. 
+ *
+ *  @details API to delete an IPSEC SA
+ *  @param[in]  h       The NETAPI handle, @ref NETAPI_T
+ *  @param[in] iface_no Interface to attach SA to.
+ *  @param[in] sa_app_id Application id returned from call to @ref netapi_secAddSA
+ *  @param[out] perr Pointer to error code.
+ *  @retval     none
+ *  @pre        @ref netapi_init @ref netapi_secAddSA
+*/
+void netapi_secDelSA(NETAPI_T       h,
+                     int            iface_no, 
+                     NETCP_CFG_SA_T sa_app_id,
+                     int*           perr);
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief netapi_secAddRxPolicy: API to add a receive security policy
+ *
+ *  @details API to add a receive security policy
+ *  @param[in]  h       The NETAPI handle @ref NETAPI_T
+ *  @param[in] sa       Application id returned from call to @ref netapi_secAddSA.  
+ *                      This SA must have beeen configured for (a) RX and (b) Inflow mode.
+ *  @param[in] ipType   IPV4 or IPV6
+ *  @param[in] src_ip_addr  source IP for policy check
+ *  @param[in] dst_ip_addr  destination IP for policy check
+ *  @param[in] ip_qualifiers  IP qualifiers for policy check
+ *  @param[in] route    Optional: @ref NETCP_CFG_ROUTE_HANDLE_T
+ *  @param[in]  user_data   Optional: pointer to user provided data associated with policy
+ *  @param[out] perr    Pointer to error code.
+ *  @retval    Aplication id associated with created receive security policy @ref NETCP_CFG_IPSEC_POLICY_T.  This is used to refer to the policy in the @ref netapi_secDelRxPolicy call.  Also, packets that match this policy but do not pass any further lookups in NETCP will be tagged with this ID
+ *  @pre        @ref netapi_init @ref netapi_secAddSA
+*/
+NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T                     h,
+                                               NETCP_CFG_SA_T               sa,
+                                               nwal_IpType                  ipType,
+                                               nwalIpAddr_t*                src_ip_addr,
+                                               nwalIpAddr_t*                dst_ip_addr,
+                                               nwalIpOpt_t*                 ip_qualifiers,
+                                               NETCP_CFG_ROUTE_HANDLE_T     route,
+                                               void*                        user_data,
+                                               int*                         perr);
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief netapi_secDelRxPolicy: API to add a receive security policy
+ *
+ *  @details API to add a receive security policy
+ *  @param[in]  h               The NETAPI handle, @ref NETAPI_T
+ *  @param[in] policy_app_id    Application id returned from call to @ref netapi_secAddRxPolicy
+ *  @param[out] perr            Pointer to error code.
+ *  @retval     none
+ *  @pre        @ref netapi_init, @ref netapi_secAddRxPolicy
+*/
+void netapi_secDelRxPolicy(NETAPI_T                 h,
+                           NETCP_CFG_IPSEC_POLICY_T policy_app_id, 
+                           int*                     perr);
+
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief netapi_getSaStats: API to retrieve SA statistics via NWAL.
+ *
+ *  @details API to retrieve SA statistics via NWAL.
+ *  @param[in]  h   The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  handle @ref NETCP_CFG_SA_T
+ *  @param[out] pSaStats Pointer to SA stats which will get populated by this API call @ref NETAPI_SA_STATS_T
+ *  @retval     none
+ *  @pre        @ref netapi_init, @ref netapi_secAddSA
+*/
+void  netapi_getSaStats (NETAPI_T                   h,
+                         NETCP_CFG_SA_T             handle,
+                         NETAPI_SA_STATS_T*         pSaStats);
+
+
+
+/**
+ *  @ingroup cfg_security_functions
+ *  @brief  API to retrieve internal context information from channel resources
+ *          maintained by NWAL. Selective NetCP PA/SA channel handles are exposed
+ *          to handle the case of multiple owner use case for PA/SA LLD
+ *  @details API to retrieve internal context information from channel resources
+ *          maintained by NWAL. Selective NetCP PA/SA channel handles are exposed
+ *          to handle the case of multiple owner use case for PA/SA LLD
+ *  @param[in]   h      The NETAPI handle, @ref NETAPI_T
+ *  @param[in]   appId  Application Id returned from any config APIs
+ *  @param[out]  pInfo  NWAL Channel context information
+ *  @retval     none
+ *  @pre        @ref netapi_init, @ref netapi_secAddSA
+ */
+void netapi_secGetChanCtxInfo(NETAPI_T h,
+                           NETCP_CFG_APP_ID_T appId,
+                           nwalChanCxtInfo_t* pInfo);
+
+typedef struct  {
+    uint32_t            spi;            /**< IPSec Security Parameter index */
+    nwalIpAddr_t        src;            /**< Source IP Address */
+    nwalIpAddr_t        dst;            /**< Destination Address */
+    nwal_IpSecProto     proto;          /**< IpSec Proto */
+    uint8_t             inUse;
+    uint8_t             ref_count;
+    NETCP_CFG_SA_T      app_id;
+} NETAPI_SA_INFO_LOCAL_T;
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/netapi_tune.h b/ti/runtime/netapi/netapi_tune.h
new file mode 100755
index 0000000..8da5725
--- /dev/null
+++ b/ti/runtime/netapi/netapi_tune.h
@@ -0,0 +1,335 @@
+/******************************************************************************
+ * FILE PURPOSE:  netapi tunable parameters (compile time)
+ ******************************************************************************
+ * FILE NAME:   netapi_tune.h
+ *
+ * DESCRIPTION:Tuneable (compile time) parameters for user space transport library
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+
+/**
+ *   @file netapi_tune.h
+ *   @brief Netapi Tuneable (compile time) parameters for user space transport library
+ */
+
+
+#ifndef __NETAPI_TUNE__H
+#define __NETAPI_TUNE__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+ * @ingroup tune_parameters
+ * @def NETAPI_ENABLE_SECURITY
+ *      Define this to enable securtiy.
+ * @note Libraries using netapi need to be built with SA enabled
+*/
+#define NETAPI_ENABLE_SECURITY 
+
+
+/**
+ * @ingroup tune_parameters
+ * @def NETAPI_USE_DDR
+ *      Define this to enable use of cached DDR for buffers and descriptors. 
+ * @note Do not define if USE_MSMC defined below
+*/
+#define NETAPI_USE_DDR
+
+
+#ifdef NETAPI_USE_DDR
+/**
+ * @ingroup tune_parameters
+ * @def NETAPI_TUNE_USE_CACHE_OPS
+ *      Define this to enable use of cached DDR for buffers and descriptors. 
+ * @note Do not define if USE_MSMC defined below
+*/
+#define NETAPI_TUNE_USE_CACHE_OPS   //for appleton, no cache coherency with netcp & ARM 
+#endif
+
+/**
+ * @ingroup tune_parameters
+ * @def NETAPI_USE_MSMC
+ *      Define this to enable use of un-cached MSMC for buffers and descriptors 
+ * @note Do not define if USE_DDR defined above 
+*/
+//#define NETAPI_USE_MSMC
+
+#ifdef NETAPI_USE_MSMC
+#ifdef NETAPI_USE_DDR
+#error "only define NETAPO_USE_MSMC or NETAPI_USE_DDR"
+#endif
+#endif
+
+/**
+ * @ingroup tune_parameters
+* @def TUNE_NETAPI_NUM_CORES
+*       This defines the number of cores (theads) 
+ */
+#define TUNE_NETAPI_NUM_CORES 5
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_PERM_MEM_SZ
+ *      This defines how much contiguous memory to grab. This is used for
+ *      descriptors and buffers in the case of uncached configuration only.  
+ *      descriptors and buffers.  Can't be bigger than  msmc if
+ *      MSMC memory is being using uncached .  This can be set at netapi_init via NETAPI_CFG_T
+ */
+#define TUNE_NETAPI_PERM_MEM_SZ   (2*1024*1024) 
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_PKTIO
+ *      This defines the number of GLOBAL pkt io channels
+ */
+#define TUNE_NETAPI_MAX_PKTIO 16
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_DEFAULT_BUFFER_SIZE
+ *      This defines the size of the netapi default pktlib heap buffers This can be set at @ref netapi_init 
+ */
+#define TUNE_NETAPI_DEFAULT_BUFFER_SIZE 1600  
+
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_DEFAULT_NUM_BUFFERS
+ *      This defines the number of netapi default pktlib heap buffers (and assoc descriptors)
+ *      this can be set at @ref netapi_init
+ */
+#define TUNE_NETAPI_DEFAULT_NUM_BUFFERS  200 
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_DEFAULT_NUM_SOLO_DESCRIPTORS
+ *      This defines the number of netapi default pkt lib heap solo descriptors
+ *      this can be set at @ref netapi_init
+ */
+#define TUNE_NETAPI_DEFAULT_NUM_SOLO_DESCRIPTORS  100 
+
+/**
+ * @ingroup tune_parameters
+ * @def  NETAPI_INCLUDE_SCHED
+ *      Define this to include the scheduler component
+ */
+#define NETAPI_INCLUDE_SCHED 
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM
+ *      This defines the number of of QM descriptors (total). This can be set set in @ref netapi_init
+ * @note Must be a power or 2
+*/
+#define TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM  2048 /* 16384 is abs max */
+
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_NUM_LOCAL_DESC
+ *      This defines the number of of QM descriptors (total). This can be set set in @ref netapi_init
+*/
+#define TUNE_NETAPI_NUM_LOCAL_DESC  64 
+
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_NUM_GLOBAL_DESC
+ *      This defines the number of global descriptors.
+ * @note Must be a power or 2
+*/
+#define TUNE_NETAPI_NUM_GLOBAL_DESC  1024
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_DESC_SIZE
+ *      This defines the descriptor size
+ * @note This define should NOT be changes
+ */
+#define TUNE_NETAPI_DESC_SIZE  128
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_NWAL_ENABLE_PASS_LOOPBACK
+ *      Define this to 1 for debutg mode where NETCP just loops pkts that tx back to rx
+ */
+#define TUNE_NETAPI_NWAL_ENABLE_PASS_LOOPBACK 0  /*1*/
+
+
+/// @cond INTERNAL
+//(10) NWAL (internal) config. Should not have to change
+#define TUNE_NETAPI_CONFIG_MAX_PA_TO_SA_DESC       32
+#define TUNE_NETAPI_CONFIG_MAX_SA_TO_PA_DESC       200
+/// @endcond
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_MAC
+ *      This defines the number of logical mac addresses
+ */
+#define TUNE_NETAPI_MAX_NUM_MAC                64
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_IP
+ *      This defines the number of ip addresses
+ */
+#define TUNE_NETAPI_MAX_NUM_IP                64
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_PORTS_PER_CORE
+ *      This defines the number of ports per core
+ */
+#define TUNE_NETAPI_MAX_NUM_PORTS_PER_CORE     4
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_PORTS
+ *      This defines the number maximum number of ports
+ */
+#define TUNE_NETAPI_MAX_NUM_PORTS     (TUNE_NETAPI_MAX_NUM_PORTS_PER_CORE * (TUNE_NETAPI_NUM_CORES)) 
+
+#ifdef NETAPI_ENABLE_SECURITY
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS
+ *      This defines the number maximum number of ipsec channels
+ */
+#define TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS     128
+#else
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS
+ *      This defines the number maximum number of ipsec channels
+ */
+#define TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS     0
+#endif
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_L2_L3_HDRS
+ *      This defines the number maximum number of L2_L3 headers to reserve  in the nwal layer. This should be kept small as transport lib does not expose this inwal feature by default
+ */
+#define TUNE_NETAPI_MAX_NUM_L2_L3_HDRS         3
+
+/**
+ * @ingroup tune_parameters
+ * @def TUNE_NETAPI_MAX_NUM_TRANS
+ *      This defines the number maximum number of transactions with NETCP that can be outstanding at any one time 
+ */
+#define TUNE_NETAPI_MAX_NUM_TRANS              (TUNE_NETAPI_MAX_NUM_MAC + TUNE_NETAPI_MAX_NUM_IP + TUNE_NETAPI_MAX_NUM_PORTS + TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS)
+
+
+/// @cond INTERNAL
+/* PA control buffer pool (internal) */
+#define TUNE_NETAPI_CONFIG_MAX_CTL_RXTX_BUF_SIZE 2400
+#define TUNE_NETAPI_CONFIG_NUM_CTL_RX_BUF  16 
+#define TUNE_NETAPI_CONFIG_NUM_CTL_TX_BUF  16 
+/// @endcond
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_BURST_RCV
+ *      This defines the maximum number of packets to receive in one pktio poll.
+ */
+#define TUNE_NETAPI_MAX_BURST_RCV 32
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_NUM_TIMER_CELLS
+ *      This defines the number of hash bins in a timer group.
+ */
+#define TUNE_NETAPI_NUM_TIMER_CELLS  128
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_NUM_GLOBAL_TIMERS
+ *      This defines the number of global timer blocks
+ */
+#define TUNE_NETAPI_NUM_GLOBAL_TIMERS  4
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_HEAPS
+ *      This defines the maximum number of heaps one NETAPI instance can create
+ */
+#define TUNE_NETAPI_MAX_HEAPS  4
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_CLASSIFIERS
+ *      This defines the maximum number of classifiers
+ */
+#define TUNE_NETAPI_MAX_CLASSIFIERS 16
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_BUF_POOLS_IN_FLOW
+ *      This defines the  maximum number of buffer pools in a flow - A flow is used by hardware
+ *      when it needs a buffer for a receive packet.  This define allows the maximum number 
+ *      of pools (free descriptor queues) to be defined for a flow, so that different sized packets 
+ *      can be allocated from different memory areas.
+ * @note This define should NOT be changed as HW assumes at most 4 now
+ */
+#define TUNE_NETAPI_MAX_BUF_POOLS_IN_FLOW  4
+
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_FLOWS
+ *      This defines the maximum number of flows
+ */
+#define TUNE_NETAPI_MAX_FLOWS  4   //app defined flows
+
+/**
+ * @ingroup tune_parameters
+* @def  TUNE_NETAPI_MAX_SA
+*       This defines the maximum number of security associations
+*/
+#define TUNE_NETAPI_MAX_SA 128   //rx&tx combined (so MAX_SA/4 tunnels typically)
+
+/**
+ * @ingroup tune_parameters
+ * @def  TUNE_NETAPI_MAX_POLICY
+ *      This defines the maximum number of security policies.
+*/
+#define TUNE_NETAPI_MAX_POLICY 128  //rx policies
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/netapi_types.h b/ti/runtime/netapi/netapi_types.h
new file mode 100755
index 0000000..ca5c075
--- /dev/null
+++ b/ti/runtime/netapi/netapi_types.h
@@ -0,0 +1,159 @@
+/*******************************
+ * file: netapi_err.h
+ * purpose: netapi error codes
+ **************************************************************
+ * @file netapi.h
+ * 
+ * @brief DESCRIPTION:  netapi Error Definitions for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ******************************/
+
+#ifndef __NETAPI_ERR__
+#define __NETAPI_ERR__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @ingroup cfg_constants
+ * @brief  One per thread/core, used in most NETAPI function calls, returned from call to netapi_init().
+ */
+typedef void * NETAPI_T;
+
+
+
+/**
+ *   @defgroup netapi_RetValue NETAPI API Return Values
+ *   @ingroup netapi
+ */
+/**  @ingroup nwal_RetValue */
+typedef int16_t netapi_RetValue;
+
+/** @defgroup netapi_errors NETAPI Error Return Values
+ *  @ingroup netapi
+ */
+
+/**
+ *  @def  NETAPI_ERR_OK
+ *  @ingroup netapi_errors
+ *       No error 
+ */
+#define NETAPI_ERR_OK  0
+
+/**
+ *  @def  NETAPI_ERR_NOMEM
+ *  @ingroup netapi_errors
+ *  @brief   out of memory error
+ */
+#define NETAPI_ERR_NOMEM -1
+
+/**
+ *  @def  NETAPI_ERR_BAD_INPUT
+ *  @ingroup netapi_errors
+ *  @brief   arguments or configuraiton is invalid
+ */
+#define NETAPI_ERR_BAD_INPUT -2
+
+/**
+ *  @def  NETAPI_ERR_QLLD 
+ *  @ingroup netapi_errors
+ *  @brief   QUEUE MANAGER Reports an error
+ */
+#define NETAPI_ERR_QLLD -3
+
+/**
+ *  @def  NETAPI_ERR_NOTFOUND
+ *  @ingroup netapi_errors
+ *  @brief   the resource cannot be located
+ */
+#define NETAPI_ERR_NOTFOUND -4
+/**
+ *  @def  NETAPI_ERR_BUSY
+ *  @ingroup netapi_errors
+ *  @brief   Temporarily out of resources or resource leak
+ */
+#define NETAPI_ERR_BUSY -5 
+
+/**
+ *  @def  NETAPI_ERR_NWAL_ERR0
+ *  @ingroup netapi_errors
+ *  @brief   NWAL subsytem reports error 
+ */
+#define NETAPI_ERR_NWAL_ERR0 -6
+
+/**
+ *  @def  NETAPI_ERR_NOT_IMPLEMENTED
+ *  @ingroup netapi_errors
+ *  @brief   Feature not implemented in this version
+ */
+#define NETAPI_ERR_NOT_IMPLEMENTED -7
+
+/**
+ *  @def  NETAPI_ERR_NORES
+ *  @ingroup netapi_errors
+ *  @brief   no free (hw) resources available 
+ */
+#define NETAPI_ERR_NORES -8
+
+/**
+ *  @def  NETAPI_ERR_NORES
+ *  @ingroup netapi_errors
+ *  @brief   error returned by NETCP PA firmware
+ */
+#define NETAPI_ERR_PA_FW -9
+
+
+/**
+ *  @def  NETAPI_ERR_ALREADY_CANCELLED
+ *  @ingroup netapi_errors
+ *  @brief   timer has already been cancelled
+ */
+#define NETAPI_ERR_ALREADY_CANCELLED -100
+
+/**
+ *  @def  NETAPI_ERR_NWAL_TX_ERR
+ *  @ingroup netapi_errors
+ *  @brief   error trying to send to NWAL.
+ */
+#define NETAPI_ERR_NWAL_TX_ERR -65536
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/ti/runtime/netapi/netapi_util.h b/ti/runtime/netapi/netapi_util.h
new file mode 100644
index 0000000..a1cc0c7
--- /dev/null
+++ b/ti/runtime/netapi/netapi_util.h
@@ -0,0 +1,422 @@
+/******************************************************
+ *  File: netapi_util.h
+ *  Purpose:  misc utilites
+ **************************************************************
+ * FILE: netapi_util.h
+ * 
+ * DESCRIPTION:  netapi utility header file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************************/
+#ifndef __NETAPI_UTIL__H
+#define __NETAPI_UTIL__H
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include "./src/netapi_loc.h"
+
+
+//#define NETAPI_DEBUG
+#ifdef NETAPI_DEBUG
+#define netapi_Log printf
+#else
+#define netapi_Log
+#endif
+
+extern NETAPI_SHM_T* pnetapiShm;
+
+/* Wrapper functions around HPLIB APIs for QMSS , *utility to convert virt2phy, phy2virt */
+#define _Osal_qmssVirtToPhy hplib_mVMVirtToPhy
+
+#define _Osal_qmssPhyToVirt hplib_mVMPhyToVirt
+
+//static hplib_spinLock_T netapi_util_lock = hplib_spinLock_UNLOCKED_INITIALIZER;
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_registerHeap  API is used to register a heap that is created by application so that
+ *                              it's garbage queue can be polled automatically by @ref netapi_pollHeapGarbage.
+ *
+ *  @details This API registers an application-created heap with the netapi instance
+ *           so that it can add that heap's garbage queue to the garbage poll function. 
+ *           NOTE: netapi internal heap is automatically registered
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  h   Handle of pklib heap to register
+ *  @retval     1 if OK, <0 on error
+ *  @pre        @ref netapi_init
+ */
+static inline int netapi_registerHeap(NETAPI_T p,
+                                      Pktlib_HeapHandle h)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    int i;
+    pp->spinLock.lock(&pnetapiShm->netapi_util_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_HEAPS;i++)
+    {
+        if (!pp->createdHeaps[i])
+        {
+            pp->createdHeaps[i]=h;
+            pp->spinLock.unlock(&pnetapiShm->netapi_util_lock);
+            return 1;
+        }
+    }
+    pp->spinLock.unlock(&pnetapiShm->netapi_util_lock);
+    return -1;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_unregisterHeap  API is used to un-register a heap that was created by application 
+ *                                and previously registered so that it's garbage queue could  be polled 
+ *                                automatically by @ref netapi_pollHeapGarbage. 
+ *
+ *  @details This API un-registers an application-created heap with the netapi instance. 
+ *           NOTE: netapi internal heap is automatically registered
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  h   The pklib handle to heap 
+ *  @retval     <0 if err, 1 if OK
+ *  @pre        @ref netapi_init
+ */
+static inline int netapi_unregisterHeap(NETAPI_T p,
+                                        Pktlib_HeapHandle h)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    int i;
+    pp->spinLock.lock(&pnetapiShm->netapi_util_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_HEAPS;i++)
+    {
+            if (pp->createdHeaps[i] == h)
+            {
+                pp->createdHeaps[i]=NULL;
+                pp->spinLock.unlock(&pnetapiShm->netapi_util_lock);
+                return 1;
+            }
+    }
+    pp->spinLock.unlock(&pnetapiShm->netapi_util_lock);
+    return -1;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_closeHeap  API is used to remove a created pktlib heap
+ *
+ *  @details This API removes an application-created heap with the netapi instance
+ *           NOTE: descriptors are zapped and cannot be reused]
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  h :  handle to pklib heap 
+ *  @retval     <0 if err, 1 if OK
+ *  @pre        @ref netapi_init  @ref netapi_registerHeap
+ */
+static inline int netapi_closeHeap(NETAPI_T p,
+                                   Pktlib_HeapHandle h)
+{
+    int err = 0;
+
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    Qmss_QueueHnd q;
+    Pktlib_garbageCollection(h);
+
+    Pktlib_deleteHeap(h, &err);
+
+    return 1;
+}
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getCookie  API is used to return a piece of application-provided opaque data that has been
+ *                           stored in the netapi instance.
+ *
+ *  @details The application can save a pointer to opaque data in the @ref NETAPI_T instance.
+ *           This APi lets this data be returned to the application.
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     Data provided in @ref netapi_setCookie
+ *  @pre        @ref netapi_init, @ref netapi_setCookie
+ */
+
+static inline void * netapi_getCookie(NETAPI_T p)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    return pp->cookie;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_setCookie  API is used to set a piece of application-provided opaque data t in the netapi instance.
+ *
+ *  @details The applicaiton can save a pointer to opaque data in the @ref NETAPI_T instance.
+ *           Pointer to a opaque data can be returned later to the application via @ref netapi_getCookie
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @param[in]  cookie Opaque data to be saved
+ *  @retval     none
+ *  @pre        @ref netapi_init
+ */
+static inline void netapi_setCookie(NETAPI_T p,
+                                    void * cookie)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    pp->cookie= cookie;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getBufMemRemainder  API is used to return the amount of free memory available for
+ *         allocating buffers for additonal Pktlib heaps
+ *
+ *  @details The application can use this API to determine how much free memory is
+ *           available for heap buffers if it decides to create its own.
+ *  @retval     Amount of memory available for heap buffer storage (in bytes)
+ *  @pre        @ref netapi_init 
+ */
+static inline int  netapi_getBufMemRemainder(void)
+{
+     return hplib_vmGetMemPoolRemainder(0);
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getDefaultFlow:  API is used to return the default NETCP flow that is to
+ *                                 be used for incoming packets.
+ *
+ *  @details   The application can use this API to return the default NETCP flow that is used
+ *             for received packets. A NETCP flow is a list of PacketLib Heaps that are to be
+ *             used to supply free packets to the receive DMA function.
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     NETCP_CFG_FLOW_HANDLE_T     The handle to default flow
+ *  @pre        @ref netapi_init 
+ */
+static inline NETCP_CFG_FLOW_HANDLE_T netapi_getDefaultFlow(NETAPI_T p)
+{
+    return NETCP_DEFAULT_FLOW;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_getDefaultRoute:  API is used to return the default NETCP route handle.
+ *
+ *  @details This API returns the default NETCP route created by @ref netapi_init.
+ *           A netcp route consists of a NETCP flow plus a destination pktio channel 
+ *  @param[in]  p   The NETAPI handle, @ref NETAPI_T
+ *  @retval     The handle of the default route, NETCP_CFG_ROUTE_HANDLE_T
+ *  @pre        @ref netapi_init  
+ */
+static inline NETCP_CFG_ROUTE_HANDLE_T netapi_getDefaultRoute(NETAPI_T p)
+{
+    return NETCP_DEFAULT_ROUTE;
+}
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgGetPolicyUserData    API to retrieve user mode data associated with 
+ *                                             Policy APPID.
+ *
+ *  @details This api is used to retrieve user mode data associated with an Policy APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to be retrieved
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline void*  netapi_netcpCfgGetPolicyUserData(NETAPI_T h,
+                                                      NETCP_CFG_SA_T app_id)
+{
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+    int slot = netapi_cfgGetMatchId(app_id);
+    if ((slot <0 ) || (slot >= TUNE_NETAPI_MAX_POLICY))
+    {
+        return NULL;
+    }
+    return (p->policy[slot].user_data);
+}
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgGetIpSecUserData    API to retrieve user mode data associated with IPSEC APPID.
+ *
+ *  @details This api is used to retrieve user mode data associated with an IPSEC APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to be retrieved
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline void*  netapi_netcpCfgGetIpSecUserData(NETAPI_T h,
+                                                     NETCP_CFG_SA_T app_id)
+{
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+    int slot = netapi_cfgGetMatchId(app_id);
+    if ((slot <0 ) || (slot >= TUNE_NETAPI_MAX_SA))
+    {
+        return NULL;
+    }
+    return (p->tunnel[slot].user_data);
+}
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgGetIpUserData    API to retrieve user mode data associated with Generic IP APPID.
+ *
+ *  @details This api is used to retrieve user mode data associated with a Generic IP APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to be retrieved
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline void*  netapi_netcpCfgGetIpUserData(NETAPI_T h,
+                                                  NETCP_CFG_SA_T app_id)
+{
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+    int slot = netapi_cfgGetMatchId(app_id);
+    if ((slot <0 ) || (slot >= TUNE_NETAPI_MAX_NUM_IP))
+    {
+        return NULL;
+    }
+    return (p->ips[slot].user_data);
+}
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgGetClassiferUserData  API to retrieve user mode data associated with Classifer APPID.
+ *
+ *  @details This api is used to retrieve user mode data associated with a flassifier APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to be retrieved
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline void*  netapi_netcpCfgGetClassiferUserData(NETAPI_T h,
+                                                         NETCP_CFG_SA_T app_id)
+{
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+    int slot = netapi_cfgGetMatchId(app_id);
+    if ((slot <0 ) || (slot >= TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        return NULL;
+    }
+    return (p->classi[slot].user_data);
+}
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgGetUserData    API to retrieve user mode data associated with APPID.
+ *
+ *  @details This api is used to retrieve user mode data associated with an APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to be retrieved
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline void*  netapi_netcpCfgGetUserData(NETAPI_T h,
+                                                NETCP_CFG_SA_T app_id)
+{
+    NETCP_CFG_SA_T appIdType;
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+
+    appIdType = app_id & 0xff000000;
+    switch(appIdType)
+    {
+        case(NETAPI_NETCP_MATCH_IPSEC):
+            return (netapi_netcpCfgGetIpSecUserData(h, app_id));
+            break;
+        case(NETAPI_NETCP_MATCH_IPSEC_POLICY):
+            return (netapi_netcpCfgGetPolicyUserData(h, app_id));
+            break;
+        case(NETAPI_NETCP_MATCH_GENERIC_IP):
+            return (netapi_netcpCfgGetIpUserData(h, app_id));
+            break;
+        case(NETAPI_NETCP_MATCH_CLASS):
+            return (netapi_netcpCfgGetClassiferUserData(h, app_id));
+            break;
+        default:
+            return NULL;
+            break;
+    }
+}
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgUpdateUserData    API to update user mode data associated with APPID.
+ *
+ *  @details This api is used to update user mode data associated with an APPID
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  app_id  application id whose user mode data is to updated
+ *  @retval void*   pointer to user mode data.
+ *  @pre       @ref netapi_init 
+ */
+static inline netapi_RetValue netapi_netcpCfgUpdateUserData(NETAPI_T h,
+                                                            NETCP_CFG_SA_T app_id,
+                                                            void * user_data)
+{
+    NETCP_CFG_SA_T appIdType;
+    NETAPI_NWAL_GLOBAL_CONTEXT_T *p = &netapi_get_global()->nwal_context;
+
+    int slot = netapi_cfgGetMatchId(app_id);
+    if ((slot <0 ) || (slot >= TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        return NETAPI_ERR_BAD_INPUT;
+    }
+    appIdType = app_id & 0xff000000;
+    switch(appIdType)
+    {
+        case(NETAPI_NETCP_MATCH_IPSEC):
+            p->tunnel[slot].user_data = user_data;
+            return NETAPI_ERR_OK;
+            break;
+        case(NETAPI_NETCP_MATCH_IPSEC_POLICY):
+            p->policy[slot].user_data = user_data;
+            return NETAPI_ERR_OK;
+            break;
+        case(NETAPI_NETCP_MATCH_GENERIC_IP):
+            p->ips[slot].user_data = user_data;
+            return NETAPI_ERR_OK;
+            break;
+        case(NETAPI_NETCP_MATCH_CLASS):
+            p->classi[slot].user_data = user_data;
+            return NETAPI_ERR_OK;
+            break;
+        default:
+            return NETAPI_ERR_BAD_INPUT;
+            break;
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif
diff --git a/ti/runtime/netapi/netapi_ver.h b/ti/runtime/netapi/netapi_ver.h
new file mode 100755
index 0000000..43ab444
--- /dev/null
+++ b/ti/runtime/netapi/netapi_ver.h
@@ -0,0 +1,94 @@
+/*******************************
+ * file: netapi_ver.h
+ * purpose: netapi version information
+ **************************************************************
+ * @file netapi.h
+ * 
+ * @brief DESCRIPTION:  netapi version information for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ******************************/
+
+#ifndef __NETAPI_ERR__
+#define __NETAPI_ERR__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @def NETAPI_VERSION_ID
+ *      This is the NETAPI Version. Versions numbers are encoded in the following 
+ *      format:
+ *              0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
+ */
+#define NETAPI_VERSION_ID                   (0x01010006)
+
+/**
+ * @def NETAPI_VERSION_STR
+ *      This is the version string which describes the NETAPI along with the
+ *      date and build information.
+ */
+#define NETAPI_VERSION_STR      "NETAPI Revision: 01.01.00.06"
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_mGetVersion  API used to get version of NETAPI 
+ *
+ *  @details This  API used to get version of netapi
+ *  @retval     int version of netapi
+ *  @pre        @ref netapi_init
+ */
+static inline int netapi_getVersion(void)
+{
+return NETAPI_VERSION_ID;
+}
+
+/**
+ *  @ingroup netapi_gen_functions
+ *  @brief netapi_mGetVersionString  API used to get version string of NETAPI 
+ *
+ *  @details This  API used to get version string of netapi
+ *  @retval     char version string of netapi
+ *  @pre        @ref netapi_init
+ */
+static inline char * netapi_getVersionString(void) { return NETAPI_VERSION_STR;}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/netcp_cfg.h b/ti/runtime/netapi/netcp_cfg.h
new file mode 100755
index 0000000..1953a98
--- /dev/null
+++ b/ti/runtime/netapi/netcp_cfg.h
@@ -0,0 +1,911 @@
+/******************************************************************************
+ * FILE PURPOSE:  netapi NETCP configuration API header file
+ ******************************************************************************
+ * FILE NAME:   netcp_cfg.h
+ *
+ * DESCRIPTION:netapi NETCP configuration API header  file for user space transport library
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+
+/**
+ *   @file netcp_cfg.h
+ *   @brief Netapi NETCP configuration API header file for user space transport library
+ */
+
+
+
+#ifndef __NETCP_CFG__H
+#define __NETCP_CFG__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//#include "netapi.h"
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETCP Flow ID configuaration informaation
+ *  @details A flow defines a set of free queues (pktlib heap) for hardware to use to get
+ *          free packet descriptor(s) and buffer(s) to use when receiving a packet. CPPI flow ID for
+ *          default case, use NETCP_DEFAULT_FLOW
+ */
+typedef struct NETCP_CFG_FLOW_Tag
+{
+    int flowid;         /**< flow id*/
+    int dma_engine;     /**< dma engine (QMSS, NETCP)*/
+} NETCP_CFG_FLOW_T;
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETAPI configuration information
+ *
+ *  @details The parameters in this structure are used to configure NETAPI.
+ */
+typedef struct NETAPI_CFG_Tag
+{
+ int def_mem_size;                  /**<  Bytes of CMA memory we have allocated */
+ int def_flow_pkt_rx_offset;        /**<  Offset in pkt buffer for hw to start RX */
+ int def_max_descriptors;           /**<  Number of descriptors in system  (must be power of 2), 2^14 max */
+ int def_tot_descriptors_for_us;    /**<  Number of descriptors to create in our region (must be power of 2)*/
+ int def_heap_n_descriptors;        /**<  Number of descriptor plus buffers in default heap*/
+ int def_heap_n_zdescriptors;       /**<  Number of zero len descriptors in defaut heap*/
+ int def_heap_buf_size;             /**<  Size of buffers in default heap, max amount of area for packet data */
+ int def_heap_tailroom_size;        /**<  Size of tailroom in reserve */
+ int def_heap_extra_size;           /**<  Size of extra space at end of buffer */ 
+ int def_multi_process;             /**<  Flag to indicate if NETAPI init is for multi-process environment */
+ void *rmHandle;                    /**<  Optional: Resource Manager (RM) server handle to use RM for re                                                    souce allocations*/
+ int memoryRegion;                  /**<  Optional: Specify the descriptor memory region to be used,
+                                          must be a valid memory  region index
+                                          (0 to Maximum number of memory regions supported
+                                          Not used when using Resouce Manager(RM)as QMSS via RM will
+                                          return available Memory Region Id.
+                                          */
+ int start_index;                   /**<  Optional: Used to leave holes by configuring dummy regions which
+                                          can be later configured with actual values. May either be
+                                          specified by the user (for example, to select "internal" or
+                                          "external" linking RAM, or set to QMSS_START_INDEX_NOT_SPECIFIED,
+                                          QMSS_PARAM_NOT_SPECIFIED to have LLD/RM select a compatible startIndex
+                                          from anywhere with free indicies, or QMSS_START_INDEX_INTERNAL.
+                                          for internal linking RAM, QMSS_START_INDEX_EXTERNAL for external linking RAM. 
+                                          Not used when using Resouce Manager(RM)as QMSS via RM will
+                                          return available Memory Region Id and determine avialable start index.
+                                          */
+}  NETAPI_CFG_T;
+
+/* @note:
+   each buffer will be allocated:  def_heap_buf_size+def_heap_extra_size bytes
+   each descriptor attached to these buffers will have rigBufferLen of:
+      def_heap_buf_size.
+   for default RX flow,  for rx packet, the bufptr  will be def_flow_pkt_rx_offset.
+   for detault RX flow,  threshold (ie max # of bytes in buffer) will be:
+       def_heap_buf_size - def_heap_tailroom_size-def_flow_pkt_rx_offset
+
+
+ RX Packet from NetCP
+
+Headroom [Application]     Packet [HW]                Tailroom [Application]    Extra Space [Application]
+<-----------------------><--------------------------><------------------------><----------------------->
+
+Cppi_HostDesc->origBufferLen
+<----------------------------------------------------------------------------->
+Cppi_HostDesc->origBuffPtr
+|
+\/
+|------------def_heap_buf_size-------------------------------------------------|--def_heap_extra_size--|
+| def_flow_pkt_rx_offset| max Cppi_HostDesc->buffLen | def_heap_tailroom_size  |   Extra Size          |
+                        ^
+                        |
+                     Cppi_HostDesc->buffPtr
+*/
+
+
+/**
+ * @ingroup cfg_constants
+ * @brief  This defines the handle to a NETCP configured Flow. A Flow is a set of pktlib heaps that h/w can use to obtain free packets.
+ */
+typedef NETCP_CFG_FLOW_T* NETCP_CFG_FLOW_HANDLE_T;
+
+/**
+ * @ingroup cfg_constants
+ * @def NETCP_DEFAULT_FLOW
+ * @brief This defines the default FLOW for NETCP to use.
+ * The default flow uses the default pktlib heap created by netapi_init; i.e.
+ * NETCP will allocate descriptors and buffers for received packets from this heap.
+ */
+#define NETCP_DEFAULT_FLOW  (NETCP_CFG_FLOW_HANDLE_T) NULL
+
+
+
+/**
+ * @ingroup cfg_constants
+ * @def NETCP_DEFAULT_ROUTE
+ * @brief This defines the NETCP default route.  This route has NETCP send received packets to the default NETCP 
+ * pktio channel using descriptors and buffers from the default flow. The default route is created by netapi_init
+ */
+#define NETCP_DEFAULT_ROUTE (NETCP_CFG_ROUTE_HANDLE_T) NULL
+
+
+/**
+ *  @ingroup cfg_constants
+ *  @{
+ *
+ *  @name   Valid Parameter configuration for NETCP_CFG_ROUTE_T
+ *  @brief  Valid Parameter configuration
+ *
+ *  @details Valid Parameter to configure optional parameters.
+ */
+/* @{ */
+/**
+ *  @def  NETCP_CFG_VALID_PARAM_ROUTE_TYPE
+ *        Valid Route Type configuration
+ *
+ */
+
+#define NETCP_CFG_VALID_PARAM_ROUTE_TYPE        0x01
+/*  @}  */
+/* @{ */
+/**
+ *  @def  NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST
+ *        Valid Match Destination configuration present,
+ *        When set, NetCP to terminate packet at configured destination
+ *        if classification matches as specified by match_destination of
+ *        @NETCP_CFG_ROUTE_T
+ *
+ */
+#define NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST        0x02
+/*  @}  */
+/* @{ */
+/**
+ *  @def  NETCP_CFG_VALID_PARAM_FAIL_ACTION_DEST
+ *        Valid Fail Destination configuration present,
+ *        When set, NetCP to terminate packet at configured destination
+ *        if next route classification fails as specified by fail_destination of
+ *        @NETCP_CFG_ROUTE_T
+ *
+ */
+#define NETCP_CFG_VALID_PARAM_FAIL_ACTION_DEST          0x04
+/*  @}  */
+/** @} */
+
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETCP application defined route information.
+ *  @details This structure is used to define a packet receive route.  A route consists of a 
+ *           flow where to get free descriptors and buffers to hold the packet, and a destination 
+ *           queue where to place the packet. Priority routing based on VLAN priority bits,
+ *           DSCP/TOS, and received input port is supported. In the case
+ *           of priority based routing, the PASS will forward the matchd packeed to the desired
+ *           queue which is equal to the base queue plus an offset. This offset is sepcififed
+ *           by the VLAN prioirty or DSCP/TOS value, or received input port.
+ *
+ */
+typedef struct NETCP_CFG_ROUTE_Tag
+{
+    uint32_t            valid_params;       /**< Specifies which route config params
+                                                 are valid */
+    NETCP_CFG_FLOW_T    *p_flow;            /**< NULL or NETCP_DEFAULT_FLOW for default
+                                              *flow,@ref NETCP_CFG_FLOW_T
+                                              */
+    PKTIO_HANDLE_T      *p_dest_q;          /**< NULL for default destination queue */
+
+    nwalRouteType_t     routeType;          /**< Optional: Routing priority,
+                                              *  @see nwal.h for nwalRouteType_t
+                                              */
+   uint16_t             egress_swith_port;  /* learned swithc port #, from ale_table */
+    uint16_t            match_destination;  /**< Optional: NetCP to terminate packet at specified destination 
+                                                  if classification matches
+                                                  @see nwal.h for nwal_matchAction_t*/
+    uint16_t            fail_destination;   /**< Optional: NetCP to terminate packet at specified destination 
+                                                  if next route classification match fails 
+                                                  @see nwal.h for nwal_failAction_t*/
+
+} NETCP_CFG_ROUTE_T;
+
+
+/**
+ * @ingroup cfg_constants
+ * @brief  Handle to a NETCP route.
+ * @details Application to use this handle to identify a NETCP route. A NETCP route defines the
+ *          pktio channel for packets received by NETCP
+ *    and the flow to use.
+ */
+typedef NETCP_CFG_ROUTE_T* NETCP_CFG_ROUTE_HANDLE_T;
+
+
+
+
+/**
+ * @ingroup cfg_constants
+ * @def NETCP_CFG_ACTION_DISCARD
+ *      This defines the NETCP action to discard packet.
+ */
+#define NETCP_CFG_ACTION_DISCARD NWAL_MATCH_ACTION_DISCARD
+/**
+ * @ingroup cfg_constants
+ * @def  NETCP_CFG_ACTION_CONTINUE
+ *      This defines the NETCP action to pass packet ono the next classifier
+ */
+#define NETCP_CFG_ACTION_CONTINUE NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE
+/**
+ * @ingroup cfg_constants
+ * @def NETCP_CFG_ACTION_TO_SW
+ *      This defines the NETCP action to pass packet to User space application
+ */
+#define NETCP_CFG_ACTION_TO_SW    NWAL_MATCH_ACTION_HOST
+
+/**
+ * @ingroup cfg_constants
+ * @def NETCP_CFG_ALL_EXCEPTIONS
+ *      This defines NETCP configuration for all Exepction Packets.
+ */
+#define NETCP_CFG_ALL_EXCEPTIONS 0xff
+
+/**
+ * @ingroup cfg_constants
+ * @brief General APP_ID Type definition.
+ */
+typedef uint32_t NETCP_CFG_APP_ID_T;
+
+
+/**
+ * @ingroup cfg_constants
+ * @brief  Handle to NETCP VLAN configuration (FUTURE).
+ * @details Application to use this handle to identify a VLAN configuration.
+ */
+typedef void * NETCP_CFG_VLAN_T;
+
+/**
+ * @ingroup cfg_constants
+ * @brief  NETCP PA LLD handle associated with an SA
+ * @details Application to use this handle to identify a PA PLLD handle associated with an SA.
+ */
+typedef void * NETCP_CFG_PA_HANDLE_T;
+
+/**
+ * @ingroup cfg_constants
+ * @brief  NETCP SA LLD handle associated with an SA
+ * @details Application to use this handle to identify a SA LLD handle associated with an SA.
+ */
+typedef void * NETCP_CFG_SA_HANDLE_T;
+
+/**
+ * @ingroup cfg_constants
+ * @brief  AppID for packets matching a  MAC interface rule
+ */
+typedef uint32_t NETCP_CFG_MACIF_T;
+
+/**
+ * @ingroup cfg_constants
+ * @brief AppID for packets matching an IP interface rule
+ */
+typedef uint32_t NETCP_CFG_IP_T;
+
+/**
+ * @ingroup cfg_constants
+ * @brief This define is used to identify the application id associated with a created SA (IPSEC security association) rule
+ */
+typedef uint32_t NETCP_CFG_SA_T;
+
+
+/**
+ * @ingroup cfg_constants
+ * @brief AppId for packets matching an NETCP IPSEC policy rule
+ */
+typedef uint32_t NETCP_CFG_IPSEC_POLICY_T;
+
+
+
+/**
+ * @ingroup cfg_constants
+ * @brief  AppID for packets being classified as  type exception.
+ */
+typedef uint32_t NETCP_CFG_EXCEPTION_PKT_T;
+
+/**
+ * @ingroup cfg_constants
+ *@brief This define is to be used in AddIp, AddClassifier, addSA, etc. to indicate that the rule can be bound to any MAC address.
+ */
+#define NETCP_CFG_NO_INTERFACE 0xff
+
+
+
+/**
+ * @note  APPIDs are present in RX packet meta data and tell "how far" the packet got
+ * through the classification rules of NETCP. 
+ * APPID is 32 bits:
+ * bits 31-24 = NETAPI_NETCP_MATCH_STAGE
+ * bits 23-8  = NETAPI_NETCP_MATCH_ID identifier 
+ * bits  7-0  = NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE logical mac interface
+*/
+
+#define NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT 0 
+#define NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK 0xFF
+
+#define NETAPI_NETCP_MATCH_ID_SHIFT 8 
+#define NETAPI_NETCP_MATCH_ID_MASK 0xFFFF
+
+#define NETAPI_NETCP_MATCH_STAGE_SHIFT 24
+#define NETAPI_NETCP_MATCH_STAGE_MASK 0xFF
+
+
+/**
+ * @brief Helper function to get match stage associated with application ID.
+ */
+#define netapi_cfgGetMatchStage(appid)  (((appid) >> NETAPI_NETCP_MATCH_STAGE_SHIFT) & NETAPI_NETCP_MATCH_STAGE_MASK)
+
+/**
+ * @brief Helper function to get match id associated with application ID.
+ */
+#define netapi_cfgGetMatchId(appid) (((appid) >> NETAPI_NETCP_MATCH_ID_SHIFT) & NETAPI_NETCP_MATCH_ID_MASK)
+
+/**
+ * @brief Helper function to get logical match interface associated with application ID.
+ */
+#define netapi_cfgGetMatchLogicalMacIface(appid) (((appid) >> NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT) & \
+                                                    NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK)
+
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_GENERIC_MAC
+ *      This define is used for an APPID that indicates that a packet matched a MAC entry.
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *      Packet did not match any other rule.
+ */
+#define NETAPI_NETCP_MATCH_GENERIC_MAC  0x10000000
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_GENERIC_IP
+ *      This define is used for an APPID that indicates that a packet matched a MAC entry.
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *       IP rule number for this interface location:
+ *          Refer to NETAPI_NETCP_MATCH_ID_SHIFT and 
+ *          NETAPI_NETCP_MATCH_ID_MASK.
+ *      Packet also matched a generic IP rule attached to that interface.
+ *      Packet did not match any other rule.
+ */
+#define NETAPI_NETCP_MATCH_GENERIC_IP   0x20000000
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_CLASS
+ *      This define is used for an APPID that indicates that a packet matched a MAC entry.
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *      Classifer ID location:
+ *          Refer to NETAPI_NETCP_MATCH_ID_SHIFT and 
+ *          NETAPI_NETCP_MATCH_ID_MASK.
+ *      Packet also matched a generic IP rule attached to 
+ *      that interface OR a general IP rule added as part of the classifier or it matched a combination
+ *      of ISPEC SA rule and a policy check.  In addition, packet matched a L4 port rule that was added 
+ *      as part of a classifer. Packet did not match any other rule.
+ */
+#define NETAPI_NETCP_MATCH_CLASS        0x80000000
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_CLASS_L3
+ *      This define is used for an APPID that indicates that a  packet matched a MAC entry.
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *      Packet also  matched a general IP rule added as part 
+ *      of a classifier.  But it not match a L4 port or any other rule. 
+ *      We cannot determine what classifer partially matched so Bytes 3-2 are not applicable
+ */
+#define NETAPI_NETCP_MATCH_CLASS_L3     0x40000000
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_IPSEC
+ *      This define is used for an APPID that indicates that a packet matched a MAC entry.
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *      SA ID location:
+ *          Refer to NETAPI_NETCP_MATCH_ID_SHIFT and 
+ *          NETAPI_NETCP_MATCH_ID_MASK.
+ *      Packet also matched an IPSEC SA  rule (matched proto, destination ip and SPI).  
+ *      Packet did not match any other rule (so may have failed a policy check)
+ */
+#define NETAPI_NETCP_MATCH_IPSEC        0x01000000  
+
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_MATCH_IPSEC_POLICY
+ *      This define is used for an APPID that indicates that a packet matched a MAC entry
+ *      Logical MAC interface location:
+ *          Refer to NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_SHIFT and 
+ *          NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK.
+ *      Packet also matched an IPSEC SA rule (matched proto, 
+ *      dest ip and SPI).  Packet also matched a POLICY RULE (this is a check of the inner IP).
+ *      IPSEC RX Policy ID location:
+ *          Refer to NETAPI_NETCP_MATCH_ID_SHIFT and 
+ *          NETAPI_NETCP_MATCH_ID_MASK.
+ *      Packet did not match any other rule 
+ */
+#define NETAPI_NETCP_MATCH_IPSEC_POLICY 0x02000000  //lower byte==interface, Or' in SA id (16 bits)
+
+/**
+ * @ingroup cfg_constants
+ * @def NETAPI_NETCP_CFG_MATCH_EXCEPTION
+ *      This define is used for an APPID that indicates that a packet is of type exception. 
+ *      Actual exception id is in byte 0 of APPID.
+ */
+#define NETAPI_NETCP_CFG_MATCH_EXCEPTION     0x08000000
+
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETCP flow configuration information.
+ *  @details This structure is used to define key parameters for the receive flow to be created.
+ *           These include the flow index to use (or can be left un-specified), the dma_index
+ *           (specifying out of which CPPI DMA engine the flow should be allocated),
+ *           the receive offset (the byte offset into each buffer where received data should be placed),
+ *           and the drop policy for the DMA channel to use if there is no free buffer available (drop or block)
+ *
+ */
+typedef struct NETCP_CFG_FLOW_CONFIG_Tag
+{
+   int              flow_index;     /**< flow index to use or NETAPI_NETCP_FLOW_INDEX_ANY */
+/**
+ * @def NETAPI_NETCP_FLOW_INDEX_ANY
+ * @ingroup cfg_constants
+ *      This define is used to let NETAPI pick the flow index to use(for flow_index field)
+ */
+#define NETAPI_NETCP_FLOW_INDEX_ANY  CPPI_PARAM_NOT_SPECIFIED
+
+   int              dma_index;      /**< allocate flow out of which DMA */
+/**
+ * @def NETAPI_DMA_INFRASTRUCTURE
+ * @ingroup cfg_constants
+ *      This define is used specify a flow in the QMSS CPPI DMA (for dma_index field)
+ */
+#define NETAPI_DMA_INFRASTRUCTURE 0
+/**
+ * @def NETAPI_DMA_NETCP
+ * @ingroup cfg_constants
+ *      This define us usee specify a flow in the NETCP CPPI DMA (for dma_index field)
+ */
+#define NETAPI_DMA_NETCP 1
+
+   int              recv_offset;    /**< start of packet offset */
+
+   int              block;          /**< TRUE => DMA will wait for free descriptor if heap(s) are empty.
+                                         FALSE => DMA will discard */
+/**
+ * @def NETAPI_FLOW_DROP
+ * @ingroup cfg_constants
+ *      This define is used to indicate that the flow should institute a Block policy.
+ *      This means that the DMA should wait for a free descriptor/buffer to come available if
+ *      the free poll is empty (for the block field)
+ */
+#define NETAPI_FLOW_BLOCK 1
+/**
+ * @def NETAPI_FLOW_DROP
+ * @ingroup cfg_constants
+ *      This define us used to indicate that the flow should institute a Drop policy.
+ *      This means that the DMA should NOT wait for a free descriptor/buffer to come available
+ *      if the free poll is empty. The transfer will be aborted and the data will dropped (for block field)
+ */
+#define NETAPI_FLOW_DROP 0
+
+   PKTIO_HANDLE_T * p_dest_q;       /**<destination queue for this flow (may be overwrritten by source DMA) */
+} NETCP_CFG_FLOW_CONFIG_T;
+
+ /**
+ *  @ingroup cfg_structures
+ * @brief
+ *  The structure contains the NETAPI Physical Memory Address Device configuration for
+ *  QMSS and PASS Perihperals.
+ *
+ * @details
+ *  The structure contains the NETAPI Physical Memory Address Device configuration for
+ *  QMSS and PASS Perihperals.
+ */
+typedef struct NETCP_CFG_GLOB_DEVICE_PARAMS_Tag
+{
+    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;
+
+
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgAddFlow   API to add a flow
+ * 
+ *  @details This api is used to add a flow
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  n    number of Pktlib_HeapHandle
+ *  @param[in]  handles[]   Handles to Pktlib_HeapHandle
+ *  @param[in]  sizes[]     must be <= heap corresponding heap size-recv_offset-any desired tail room
+ *  @param[in]  p_cfg   @ref NETCP_CFG_FLOW_CONFIG_T
+ *  @param[out] err     pointer to error return
+ *  @retval     NETCP flow handle, @ref NETCP_CFG_FLOW_HANDLE_T
+ *  @pre       @ref netapi_init
+ */
+NETCP_CFG_FLOW_HANDLE_T netapi_netcpCfgAddFlow(NETAPI_T h,
+                                            int n, 
+                                            Pktlib_HeapHandle handles[],
+                                            int sizes[],
+                                            NETCP_CFG_FLOW_CONFIG_T * p_cfg,
+                                            int * err );
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgDelFlow   API to delete a flow
+ * 
+ *  @details This api is used to delete a flow.
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  p    handle to NETCP  flow
+ *  @param[out] err     pointer to error return
+ *  @retval     none
+ *  @pre       @ref netapi_init, netapi_netcpCfgAddFlow
+ */
+void netapi_netcpCfgDelFlow(NETAPI_T h ,
+                                            NETCP_CFG_FLOW_HANDLE_T p ,
+                                            int * err);
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief  API attaches an IP address and qualifier to a MAC interface
+ * 
+ *  @details This api is used to add an IP address to a MAC interface along
+ *            with optional IP qualifier. A route, @ref NETCP_CFG_ROUTE_HANDLE_T,or NULL for default 
+ *            may be specified to indicate where to send packets matching the MAC interface MAC address, the
+ *            supplied IP address and any qualifier.  This API adds a rule to the NETCP level 1 lookup tables.
+ *            Packets arriving that match this rule are identified in meta data with Appid=  NETAPI_NETCP_MATCH_GENERIC_IP
+ *            Note: An IP address must be attached to enable NETCP receive Checksum offload feature
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  iface_no    interface number (0,1,..)
+ *  @param[in]  ipType  type of IP address (V4 for V6)
+ *  @param[in]  ip_addr destination or local
+ *  @param[in]  ip_rem_addr source or remote
+ *  @param[in]  ip_qualifiers   ip_qualifiers (all 0 for no qualifiers). This can be used to apply special handling for
+ *                              diffserv category for example.
+ *  @param[in]  route       handle of a created route or NULL to use internal default route, @ref NETCP_CFG_ROUTE_HANDLE_T
+ *  @param[in]  user_data     Optional: pointer to user provided data associated with IP
+ *  @param[in]  ip_addr remote
+ *  @param[out] err     pointer to error return
+ 
+ *  @retval     returned AppID for attached rule. This is returned in RX meta data for packets matching this rule and no other, @ref NETCP_CFG_IP_T
+ *  @pre       @ref netapi_init
+ */
+NETCP_CFG_IP_T  netapi_netcpCfgAddIp(NETAPI_T                   h,
+                                     int                        iface_no,
+                                     nwal_IpType                ipType,
+                                     nwalIpAddr_t*              ip_addr,
+                                     nwalIpAddr_t*              ip_rem_addr,
+                                     nwalIpOpt_t*               ip_qualifiers,
+                                     NETCP_CFG_ROUTE_HANDLE_T   route,
+                                     void*                      user_data,
+                                     int*                       err);
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgDelIp   API to delete IP interface
+ * 
+ *  @details This api is used to delete an IP interface
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  iface_no    interface number (0,1,..)
+ *  @param[in]  ipType  type of IP address (V4 for V6)
+ *  @param[in]  ip_addr      ip_address
+ *  @param[in]  ip_qualifiers   ip_qualifiers (all 0 for no qualifiers). This can be used to apply special handling for
+ *                  diffserv category for example.
+ *  @param[in]  ip_rule_id      @ref NETCP_CFG_IP_T
+ *  @param[out] err     pointer to error return
+ *  @retval     returned AppID for attached rule. This is returned in RX meta data for packets matching this rule and no other, @ref NETCP_CFG_IP_T
+ *  @pre       @ref netapi_init , @ref netapi_netcpCfgAddIp
+ */
+void netapi_netcpCfgDelIp(NETAPI_T          h, 
+                          int               iface_no,
+                          nwal_IpType       ipType,
+                          nwalIpAddr_t*     ip_addr,
+                          nwalIpOpt_t*      ip_qualifiers, 
+                          NETCP_CFG_IP_T    ip_rule_id,
+                          int*              err);
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgCreateMacInterface  API to insert a MAC interface rule in the NETCP hardware
+ *  lookup engines.
+ * 
+ *  @details This api is used to insert a MAC interface in the NETCP hardware lookup engines.
+ *      Once it is created, the MAC interface can be used to receive packets. The API
+ *      adds a rule to the NETCP 1st level lookup tables to route all packets with destination
+ *      MAC matching supplied argument and not matching any other lookup entry (see @ref netapi_netcpCfgAddIp) to
+ *      the supplied route, @ref NETCP_CFG_ROUTE_T, (or default route).
+ *      Packets arriving that match this rule are identified in meta data with Appid=  NETAPI_NETCP_MATCH_GENERIC_MAC
+ *      Note: The internal SOC switch (if operating in full swithc mode) may need to  be "taught" that this mac
+ *      address is present by transmitting a packet with destination mac = this interface mac address.
+ *  @param[in]  h   NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  p_mac   pointer to 6 byte MAC address for local interface
+ *  @param[in]  p_mac_remote   pointer to 6 byte MAC address for remote interface
+ *  @param[in]  iface_no    interface number (0,1,..) 
+ *  @param[in]  switch_port     (0 don't care, 1 switch port 1, 1 switch port 2) [only 0 supported currenly] 
+ *  @param[in]  route   handle of a created route or NULL to use internal default route, @ref NETCP_CFG_ROUTE_HANDLE_T
+ *  @param[in]  vlan    [future[ vlan configuration . Set to NULL, @ref NETCP_CFG_VLAN_T
+ *  @param[in]  etherType  Ethertype field.
+
+ *  @param[in]  state   [future] interface state (0=down, 1= up)
+ *  @param[out] err     pointer to error return
+ *  @retval     returns AppID for interface (this is returned in meta data for received packets matching this rule an no others, @ref NETCP_CFG_MACIF_T
+ *  @pre       @ref netapi_init 
+ */
+NETCP_CFG_MACIF_T  netapi_netcpCfgCreateMacInterface(NETAPI_T                   h,
+                                                     uint8_t*                   p_mac,
+                                                     uint8_t*                   p_mac_remote,
+                                                     int                        iface_no,
+                                                     int                        switch_port,
+                                                     NETCP_CFG_ROUTE_HANDLE_T   route,
+                                                     NETCP_CFG_VLAN_T           vlan,
+                                                     uint16_t                   etherType,
+                                                     int                        state,
+                                                     int *                      err);
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgDelMac   API to delete MAC  interface
+ * 
+ *  @details This api is used to delete a MAC interface
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  iface_no    interface number (0,1,..)
+ *  @param[out] err     pointer to error return
+ *  @retval     returned AppID for attached rule. This is returned in RX meta data for packets matching this rule and no other, @ref NETCP_CFG_IP_T
+ *  @pre       @ref netapi_init , @ref netapi_netcpCfgCreateMacInterface 
+ */
+void netapi_netcpCfgDelMac(NETAPI_T     h,
+                           int          iface_no,
+                           int*         err);
+
+
+/**
+ * @brief This defines handle to installed classifier returned by API.  Pkts matching this classifier will have meta data with this tag.
+ *  Also used to delete classifier
+ */
+typedef uint32_t NETCP_CFG_CLASS_T;
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETAPI Class L4 Configuration
+ *
+ *  @details This structure contains Classifier L4 Configuration. In this type of classifier, the  L2 and L3 header match criteria are implied by the iface and ip entries.  L4 packet match criteria are defined by the proto and appProto fields ( L4 protocol id and ports)
+ */
+typedef struct NETCP_CFG_CLASS_L4_Tag
+{
+    int                 iface;      /**< Indicates which MAC interface packet should be received on*/
+    NETCP_CFG_IP_T      ip;         /**< IP rule to match: see @ref NETCP_CFG_IP_T */
+    nwal_appProtoType_t proto;      /**< L4 proto (-1 for don't care)*/
+    nwalAppProto_t      appProto;   /**< L4 Ports or equivalent */
+
+} NETCP_CFG_CLASS_L4_T;
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETAPI Classifier L4 plus IPSEC policy configuration
+ *
+ *  @details This structure contains Classifier L4 plus IPSEC policy configuration. In this type of classifier, the  L2,L3 header match criteria are implied by the iface and ip_policy fields. The L4 match criteria are implied by the proto and appProto fields. 
+ */
+//classifier L4 + policy  (L2, L3 (outer), tunnel, L3 (inner)  implied by policy
+typedef struct NETCP_CFG_CLASS_L4_IPSEC_Tag
+{
+    int                       iface;      /**< Indicates which MAC interface packet should be received from */
+    NETCP_CFG_IPSEC_POLICY_T  ip_policy;  /**< IPSEC policy configuration. see @ref NETCP_CFG_IPSEC_POLICY_T */
+    nwal_appProtoType_t       proto;      /**< L4 proto (-1 for don't care)*/
+    nwalAppProto_t            appProto;   /**< L4 Ports or equivalent */
+
+} NETCP_CFG_CLASS_L4_IPSEC_T;
+
+
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETAPI Classifier L4/L3 configuration
+ *
+ *  @details This structure contains Class L4 + L3 Classifier configuration. In this type of classifier the L2 header match criteria is implied by the iface field.  The L3 header match criteria is implied by the ipType, ip_addr and ip_qulaifier fields.  L4 match criteris is implied by the proto and appProto fields.  A failed route can be optionally included to tell NETCP what to do if the L3 portion of the classifier matches but not the L4 portion.
+ */
+typedef struct NETCP_CFG_CLASS_L3_L4_Tag
+{
+    int                         iface;          /**< Indicates which MAC interface packet is from */
+    nwal_IpType                 ipType;         /**< IP address type, IPV4 or IPV6 */
+    nwalIpAddr_t*               ip_addr;        /**< IP address to match */
+    nwalIpOpt_t*                ip_qualifiers;  /**< IP address qualifiers */
+    NETCP_CFG_ROUTE_HANDLE_T    p_fail_route;   /**< What to do if L3 matches but L4 fails AND L3 is a 
+                                                     new rule.(if exisitng rule, then existing fail
+                                                     route will be used). */
+    nwal_appProtoType_t         proto;          /**< L4 proto (-1 for don't care)*/
+    nwalAppProto_t              appProto;       /**< Ports or equivalent */
+} NETCP_CFG_CLASS_L3_L4_T;
+
+/**
+ *  @ingroup cfg_structures
+ *  @brief NETAPI Classifier configuration
+ *
+ *  @details This structure contains the NETAPI classifer configuration.  This is a union of the different classifier types above
+ */
+typedef struct NETCP_CFG_CLASSIFIER_Tag
+{
+
+/**
+ * Classifer type which can be set to one of the following defines:
+ * <br>
+ *      @ref NETCP_CFG_CLASS_TYPE_L4 , @ref NETCP_CFG_CLASS_TYPE_L3_L4, _
+ */
+    int classType;
+
+/**
+ * @def NETCP_CFG_CLASS_TYPE_L4
+ * @ingroup cfg_constants
+ *      This defines classifier type to be Class L4. Class L4 classifiers specifiy the L4 protocol information of the packets to matched;  the L2,L3 portions of the classifier are implied by supplied handles from the mac interface create and IP Add APIs
+ */
+#define NETCP_CFG_CLASS_TYPE_L4  0
+
+/**
+ * @def NETCP_CFG_CLASS_TYPE_L3_L4
+ * @ingroup cfg_constants
+ *      This defines classifier type to be Class L4/L3 .  Class L3_L4 classifiers specify both the IP address (L3) and the L4 protocol information of the packets to be matched.
+ */
+#define NETCP_CFG_CLASS_TYPE_L3_L4  1
+
+     union
+    {
+        NETCP_CFG_CLASS_L3_L4_T     c_l3_l4;    /**< @ref NETCP_CFG_CLASS_L3_L4_T */
+        NETCP_CFG_CLASS_L4_T        c_l4;       /**< @ref NETCP_CFG_CLASS_L4_T */
+        NETCP_CFG_CLASS_L4_IPSEC_T  c_l4_ipsec; /**< @ref NETCP_CFG_CLASS_L4_IPSEC_T */
+    } u;                                        /**< union for classifier type configuration structure */
+} NETCP_CFG_CLASSIFIER_T;
+
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgAddClass   API to attach a classifier rule to NETCP.
+ *      This can be used to route a particular packet flow to a specific PKTIO channel
+ * 
+ *  @details This api can be used to route a particular packet flow to a particular PktIO channel, using a specific 
+ *  pktLib heap, and/or have NetCP attach a tag (classifier id) to the incoming packet.
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  p_class definition of the classifier
+ *  @param[in]  p_route handle to NETCP route.
+ *  @param[in]  action       what to do with packet: one of NETCP_CFG_ACTION_TO_SW, DISCARD or CONTINUE
+ *  @param[in]  user_data     Optional: pointer to user provided data associated with SA
+ *  @param[out] err     pointer to error return
+ *  @retval     returned AppID for attached rule. This is returned in RX meta data for packets matching this rule and no other, @ref NETCP_CFG_IP_T
+ *  @pre       @ref netapi_init
+ */NETCP_CFG_CLASS_T netapi_netcpCfgAddClass(NETAPI_T                   h,
+                                             NETCP_CFG_CLASSIFIER_T*    p_class,
+                                             NETCP_CFG_ROUTE_HANDLE_T   p_route,
+                                             int                        action,
+                                             void*                      user_data,
+                                             int*                       err);
+
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgDelClass   API to delete a preconfigured classifier
+ * 
+ *  @details This API can be used to delete a preconfigured classifier
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  classId
+ *  @param[out] err     pointer to error return
+ *  @retval     none
+ *  @pre       @ref netapi_init, @ref netapi_netcpCfgAddClass
+ */
+void netapi_netcpCfgDelClass(NETAPI_T           h,
+                             NETCP_CFG_CLASS_T  classId,
+                             int*               err);
+
+
+/**
+ *  @ingroup netapi_cb_functions
+ *  @brief NETCP_CFG_STATS_CB   Callback function that is used to return statistics from NETCP
+ * 
+ *  @details The application provides a callback function that NETAPI  uses to report statistics.
+ *  The request for stats is generated from the @ref netapi_netcpCfgReqStats API.
+ *  Note: to receive this stats callback, the @ref netapi_netcpPoll function must be called
+ *  @param[in]  h   NETAPI instance handle, @ref NETAPI_T
+ *  @param[out]  pPaStats    the PA (NETCP packet accelerator subsystem) statistics block 
+ *  @retval     none 
+ *  @pre       @ref netapi_init , @ref netapi_netcpCfgReqStats, @ref netapi_netcpPoll
+ */
+typedef void (*NETCP_CFG_STATS_CB)(NETAPI_T      h,
+                                   paSysStats_t* pPaStats);
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgReqStats   API to request statistics from NETCP
+ * 
+ *  @details This api is used to request a statistics from NETCP.  This will generate a stats request
+ *  command to NETCP. Sometime later, the statistics result will arrive and will be passed to 
+ *  the caller via the asynchronus callback @ref NETCP_CFG_STATS_CB that is registered in this call.
+ *  Note: to receive the stats callback, the @ref netapi_netcpPoll funcition must be called
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  cb   the callback function to invoke with the resulting statistics block, @ref NETCP_CFG_STATS_CB
+ *  @param[in]  doClear     clear the stats in NETCP after the report (0=no, 1=yes) 
+ *  @param[out] err     pointer to error return
+ *  @retval     none 
+ *  @pre       @ref netapi_init 
+ */
+void netapi_netcpCfgReqStats(NETAPI_T               h,
+                             NETCP_CFG_STATS_CB     cb,
+                             int                    doClear,
+                             int*                   err);
+
+
+/**
+ *  @ingroup cfg_functions
+ *  @brief netapi_netcpCfgExceptions    API to configure NETCP with global rules for exception packet handling
+ *
+ *  @details This api is used to configure NETCP with global rules of how to handle exception packets specified by exception_id.
+ *  @param[in]  h    NETAPI instance handle, @ref NETAPI_T
+ *  @param[in]  exception_id id of the exception packet, refer to pa.h,.pa_EROUTE_XXX for list of exception packet id's
+ *  @param[in]  p_route handle to NETCP route.
+ *  @param[in]  action, action for NETCP to take upon classifying packet as type exception, refer to nwal. nwal_matchAction_t
+ *  @retval returns app_id, @ref NETCP_CFG_EXCEPTION_PKT_T
+ *  @pre       @ref netapi_init 
+ */
+NETCP_CFG_EXCEPTION_PKT_T netapi_netcpCfgExceptions(NETAPI_T                    h,
+                                                    int                         exception_id ,
+                                                    nwal_matchAction_t          action,
+                                                    NETCP_CFG_ROUTE_HANDLE_T    p_route);
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
+
diff --git a/ti/runtime/netapi/netsync.h b/ti/runtime/netapi/netsync.h
new file mode 100755
index 0000000..133cf3c
--- /dev/null
+++ b/ti/runtime/netapi/netsync.h
@@ -0,0 +1,162 @@
+/*********************************************
+ * File: netsync.h
+ * Purpose: NETAPI Synchronization primitives
+ **************************************************************
+ * FILE: netsync.h
+ * 
+ * DESCRIPTION:  netapi synch utilities header file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ **********************************************/
+#ifndef NETAPI_SYNC_H
+#define NETAPI_SYNCH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include "hplib_sync.h"
+
+/*--------------------------*/
+/*----------spinLock--------*/
+/*--------------------------*/
+
+#define  NETAPI_spinLock_T hplib_spinLock_T
+
+#define NETAPI_spinLock_LOCKVAL hplib_spinLock_LOCKVAL
+#define NETAPI_spinLock_UNLOCKVAL hplib_spinLock_UNLOCKVAL
+#define NETAPI_spinLock_UNLOCKED_INITIALIZER (NETAPI_spinLock_UNLOCKVAL)
+
+/* init a lock */
+#define netapi_spinLock_init hplib_mSpinLockInit
+
+/* lock a spinLock */
+#define netapi_spinLock_lock hplib_mSpinLockLock
+
+
+/* try to get lock 1 time. Return 1 if ok, 0 if un-successful */
+#define netapi_spinLock_try_lock hplib_mSpinLockTryLock
+
+/* unlock a spinLock.   */
+#define netapi_spinLock_unlock hplib_mSpinLockUnlock
+
+/* poll a lock, return 0 if unlocked, NETAPI_spinLock_LOCKVAL if locked */
+#define netapi_spinLock_is_locked hplib_mSpinLockIsLocked
+
+
+/*--------------------------*/
+/*----------rwLock--------*/
+/*--------------------------*/
+
+/* a rw lock strucuture */
+#define  NETAPI_rwLock_T hplib_rwLock_T
+
+//initialize a rw lock 
+#define netapi_rwLock_init hplib_mRWLockInit
+
+// lock a write lock.  
+#define netapi_rwLock_write_lock hplib_mRWLockWriteLock
+
+
+//unlock a writer part of rwLock */
+#define netapi_rwLock_write_unlock hplib_mRWLockWriteUnlock
+
+//grab a read lock
+//=> can be other readers, but no writer
+#define netapi_rwLock_read_lock hplib_mRWLockReadLock
+
+//rw_lock reader unlock
+#define netapi_rwLock_read_unlock hplib_mRWLockReadUnlock
+
+
+/*--------------------------*/
+/*----------atomic32--------*/
+/*--------------------------*/
+#define NETAPI_ATOMIC32_T hplib_atomic32_T
+
+
+
+#define NETAPI_ATOMIC_INIT32 hplib_mAtomic32Init
+
+#define netapi_atomic_read32 hplib_mAtomic32Read
+
+#define netapi_atomic_set32 hplib_mAtomic32Set
+
+#define netapi_atomic_add32 hplib_mAtomic32Add
+
+#define netapi_atomic_sub32 hplib_mAtomic32Sub
+
+#define NETAPI_atomic_inc32 hplib_mAtomic32Inc
+
+#define NETAPI_atomic_dec32(p) hplib_mAtomic32Dec
+
+#define netapi_atomic_add_return32 hplib_mAtomic32AddReturn
+
+#define netapi_atomic_sub_return32 hplib_mAtomic32SubReturn
+
+
+#define netapi_atomic_inc_and_test32 hplib_mAtomic32IncAndTest
+
+#define netapi_atomic_dec_and_test32 hplib_mAtomic32DecAndTest
+
+#define netapi_atomic_test_and_set32 hplib_mAtomic32TestSetReturn
+
+#define netapi_atomic_clear32(p) hplib_mAtomic32Clear
+
+/*--------------------------*/
+/*----------atomic64--------*/
+/*--------------------------*/
+#define NETAPI_ATOMIC64_T hplib_atomic64_T
+
+
+#define NETAPI_ATOMIC_INIT64(x) hplib_mAtomic64Init
+
+#define netapi_atomic_read64 hplib_mAtomic64Read
+
+#define netapi_atomic_set64 hplib_mAtomic64Set
+
+#define netapi_atomic_add64 hplib_mAtomic64Add
+
+/*******************************************************
+ ****************memory barrier************************
+******************************************************/
+#define netapi_mb hplib_mMemBarrier
+#define netapi_rmb hplib_mReadMemBarrier
+#define netapi_wmb hplib_mWriteMemBarrier
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/ti/runtime/netapi/pktio.h b/ti/runtime/netapi/pktio.h
new file mode 100755
index 0000000..81d50b4
--- /dev/null
+++ b/ti/runtime/netapi/pktio.h
@@ -0,0 +1,816 @@
+/******************************************************************************
+ * FILE PURPOSE:  Top level interface file for NWAL Module
+ ******************************************************************************
+ * FILE NAME:   pktio.h
+ *
+ * DESCRIPTION: netapi PKTIO module header file
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/**
+ *   @file pktio.h
+ *   @brief pktio module main header file for user space transport library
+ *   @details:  pktio provides an abstraction to H/W queues that are used to transmit and receive packets, 
+ *              IPC messages, etc.  Pktio channels can be created by user but there are also several canned 
+ *              channels available  for NETCP transmit, receive, SA sideband crypto transmit and receive 
+ */
+
+
+
+#ifndef __PKTIO__H
+#define __PKTIO__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+//#include "netapi.h"
+#include "ti/drv/nwal/nwal.h"
+#include "ti/drv/nwal/nwal_util.h"
+
+/**
+ * @def NETCP_TX
+ * @ingroup pktio_constants
+ *      This defines the default PKTIO NETCP transmit channel name
+ */
+#define NETCP_TX "NETCP_TX"
+
+/**
+ * @def NETCP_RX
+ * @ingroup pktio_constants
+ * @brief This defines the default PKTIO NETCP receive channel name
+ */
+#define NETCP_RX "NETCP_RX"
+
+/**
+ * @def NETCP_SB_RX
+ * @ingroup pktio_constants
+ * @brief This defines the PKTIO NETCP-SA receive SIDEBAND channel name.
+          This channel is used to receive the results from sideband crypto operations
+ */
+#define NETCP_SB_RX "NETCP_SB_RX"
+
+/**
+ * @def NETCP_SB_TX
+ * @ingroup pktio_constants
+ * @brief This defines the PKTIO NETCP-SA transmit SIDEBAND channel name.
+          This channel is used to send packets for sideband crypto operations
+ */
+#define NETCP_SB_TX "NETCP_SB_TX"
+
+/**
+ * @def PKTIO_MAX_NAME
+ * @ingroup pktio_constants
+ *      This defines the maximum length of a pktio channel name
+ */
+#define PKTIO_MAX_NAME 20
+
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO meta data information .
+ *
+ *  @details PKTIO meta data information. meta data is used to convey the results of NETCP pre-processing on receive packets and to tell NETCP what functions to perform on transmitted packets. It is a union of sub-structures (one for TX, one for RX, one for sideband rx, one for sideband tx).
+ */
+typedef struct PKTIO_METADATA_Tag
+{
+
+    int flags1;     /**< Configuration flags for PKTIO channel, @ref PKTIO_META_RX,
+                                                                @ref PKTIO_META_TX,
+                                                                @ref PKTIO_META_SB_RX,
+                                                                @ref PKTIO_META_SB_TX*/
+
+/**
+ * @def PKTIO_META_RX
+ * @ingroup pktio_constants
+ *      This defines the PKTIO NETCP receive INFLOW channel
+ */
+#define PKTIO_META_RX 0x01
+
+/**
+ * @def PKTIO_META_TX
+ * @ingroup pktio_constants
+ *      This defines the PKTIO NETCP transmit INFLOW channel
+ */
+#define PKTIO_META_TX 0x02
+
+/**
+ * @def PKTIO_META_SB_RX
+ * @ingroup pktio_constants
+ *      This defines the PKTIO NETCP SIDEBAND channel channel
+ */
+#define PKTIO_META_SB_RX 0x4
+
+/**
+ * @def PKTIO_META_SB_TX
+ * @ingroup pktio_constants
+ *      This defines the PKTIO NETCP transmit SIDEBAND channel
+ */
+#define PKTIO_META_SB_TX 0x8
+
+
+/**
+ * @def PKTIO_META_IFDMA_TX
+ * @ingroup pktio_constants
+ *      This defines the PKTIO NETCP infrastructure DMA transfer channel
+ */
+#define PKTIO_META_IFDMA_TX 0x10
+
+/**
+ * @def PKTIO_META_APP_DEF
+ * @ingroup pktio_constants
+ *      This allows user space application to define custom packet types.
+ */
+#define PKTIO_META_APP_DEF 0x80000000
+
+/**
+ * @brief NWAL Packet meta data information
+ */
+    union
+    {
+        nwalRxPktInfo_t*        rx_meta;          /**< NWAL Packet meta data information for incoming packet */
+        nwalTxPktInfo_t*        tx_meta;          /**< NWAL Packet meta data information for outgoing packet */
+        nwalDmRxPayloadInfo_t*  rx_sb_meta;       /**<NWAL Data mode meta data payload information from NetCP */
+        nwalDmTxPayloadInfo_t*  tx_sb_meta;       /**< NWAL Data Mode Payload information for packet to SA */
+        unsigned int            tx_ifdma_dest;    /**< infrastructure dma destination flow */
+    } u;                                          /**< union NWAL Packet meta data information  */
+
+    void * sa_handle;                       /**< This contains the appplication id associated with created SA.
+                                            details This is used when crypto is to be performed on the 
+                                            egress packet */
+} PKTIO_METADATA_T;
+
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO fast path configuration structure.
+ *
+ *  @details This strucuture allows user space applications to specify the PKTIO packet send function.
+ *
+ *  @note This configuration is not expected at time of @ref netapi_pktioOpen but can be updated via
+ *        @ref netapi_pktioControl API.
+ */
+typedef struct PKTIO_FAST_PATH_CONFIG_Tag
+{
+    int               fp_send_option;  /**< PKTIO_FP_NONE, @ref PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT,
+                                        PKTIO_FP_L4CKSUM_PORT, @ref PKTIO_FP_ESP_L4CKSUM_PORT,
+                                        @ref PKTIO_FP_AH_L4CKSUM_PORT, @ref PKTIO_FP_ESP_PORT, 
+                                        @ref PKTIO_FP_AH_PORT */
+
+/**
+ * @def PKTIO_FP_NONE
+ * @ingroup pktio_constants
+ *      Use this define to reconfigure the PKTIO channel send function to not use any PKTIO fast path
+        send functions.
+ */
+#define  PKTIO_FP_NONE 0
+
+/**
+ * @def PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with updates to ENET port, no crypto operation,
+ *      no L4 checksum to be performed.
+ */
+#define  PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT 1
+
+/**
+ * @def PKTIO_FP_L4CKSUM_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with updates to L4 checksum, ENET port, no crypto operation
+ *      to be performed.
+ */
+#define  PKTIO_FP_L4CKSUM_PORT 2
+
+/**
+ * @def PKTIO_FP_ESP_L4CKSUM_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with Crypto ESP, UDP checksum, updates to ENET port
+ */
+#define  PKTIO_FP_ESP_L4CKSUM_PORT 3
+
+/**
+ * @def PKTIO_FP_AH_L4CKSUM_PORT
+  * @ingroup pktio_constants
+ *      Use this define to send packet with Cypto AH, UDP checksum, updates to ENET port
+ */
+#define  PKTIO_FP_AH_L4CKSUM_PORT 4
+
+/**
+ * @def PKTIO_FP_ESP_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with Crypto ESP packet, updates to ENET port
+ */
+#define  PKTIO_FP_ESP_PORT 5
+
+/**
+ * @def PKTIO_FP_AH_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with AH packet
+ */
+#define  PKTIO_FP_AH_PORT 6
+
+/**
+ * @def PKTIO_FP_AH_PORT
+ * @ingroup pktio_constants
+ *      Use this define to send packet with Crypto ESP, IP checksum, updates to ENET port
+ */
+#define  PKTIO_FP_ESP_L3CKSUM_PORT 7
+
+    nwalTxPktInfo_t   *txPktInfo;  /** <The parameters in this structure are used to 
+                                         provide additional details for the outgoing packet*/
+} PKTIO_FAST_PATH_CONFIG_T;
+
+
+
+struct PKTIO_HANDLE_tag;
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO configuration information
+ *
+ *  @details PKTIO :q information
+ */
+typedef struct PKTIO_CFG_Tag
+{
+/**
+ * @def PKTIO_RX
+ * @ingroup pktio_constants
+ *      This defines the pktio channel as type read, i.e., for ingress
+ */
+#define PKTIO_RX 0x1
+
+/**
+ * @def PKTIO_TX
+ * @ingroup pktio_constants
+ *      This defines the pktio channel as type write, i.e. for egress
+ */
+#define PKTIO_TX 0x2
+
+/**
+ * @def PKTIO_RX_TX
+ * @ingroup pktio_constants
+ *      This defines the pktio channel as type read/write 
+ */
+#define PKTIO_RX_TX (PKTIO_RX | PKTIO_TX)
+
+/**
+ * Flags for PKTIO channel configuration
+ * <br>
+ * The following are flags used to configure the pktio channel:
+ *      @ref PKTIO_RX , @ref PKTIO_TX, @ref PKTIO_RX_TX
+ */
+    int flags1; 
+
+/**
+ * @def PKTIO_GLOBAL
+ * @ingroup pktio_constants
+ *      This defines the pktio channel as type global. 
+        Type global means that this channel can be used by all worker threads/cores
+ */
+#define PKTIO_GLOBAL 0x1
+
+/**
+ * @def PKTIO_LOCAL
+ * @ingroup pktio_constants
+ *      This defines the pktio channel as type local.
+        Type local means that thi s channel can only be used by the the thread/core that created it; 
+        its name will not be visible to other threads/cores
+ */
+#define PKTIO_LOCAL  0x2
+
+/**
+ * @def PKTIO_PKT
+ * @ingroup pktio_constants
+ *      This defines the pktio channel is for NETCP
+ */
+#define PKTIO_PKT    0x4
+
+/**
+ * @def PKTIO_SB
+ * @ingroup pktio_constants
+ *      This defines the pktio channel is for sideband crypto
+ */
+#define PKTIO_SB     0x8
+#define PKTIO_IFDMA  0x10  //define this if this channel is for ifrastructure dma  
+    int flags2; /**< Flags for PKTIO channel configuration, @ref PKTIO_LOCAL , @ref PKTIO_GLOBAL, 
+                    @ref PKTIO_PKT, @ref PKTIO_SB*/
+
+/**
+ * @def PKTIO_Q_ANY
+ * @ingroup pktio_constants
+ *      This defines the pktio IO queue number to be specified by the transport library. 
+ */
+#define PKTIO_Q_ANY QMSS_PARAM_NOT_SPECIFIED
+
+    int qnum;       /**< PKTIO channel queue number */
+    int max_n;      /**< Maximum number of packets read in 1 poll */
+    PKTIO_FAST_PATH_CONFIG_T fast_path_cfg;  /** < @ref PKTIO_FAST_PATH_CONFIG_T */
+    int queueType ;             /**<Queue Manager queue type,
+                                    refer to ti/csl/csl_qm_queue.h */
+} PKTIO_CFG_T;
+
+
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO polling control struct, currently NOT_IMPLEMENTED
+ *
+ *  @details PKTIO polling control struct, currently NOT_IMPLEMENTED
+ */
+typedef struct PKTIO_POLL_Tag
+{
+} PKTIO_POLL_T;
+
+/**
+ *  @ingroup netapi_cb_functions
+ *  @brief PKTIO_CB   Callback function to be issued on packet receive
+ * 
+ *  @details The application provides a callback function that gets invoked on packet receive
+ *  @param[in]  channel     The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  p_recv      Pointer to the packets received.
+ *  @param[in]  p_meta      Pointer to meta data associated with packet, @ref PKTIO_METADATA_T
+ *  @param[in]  n_pkts      Number of packets received.
+  * @param[in]  ts          Timestamp associted with received packets.
+ *  @retval     none
+ *  @pre       @ref netapi_pktioOpen
+ */
+typedef void (*PKTIO_CB)(struct PKTIO_HANDLE_tag* channel,
+                         Ti_Pkt*                  p_recv[],
+                         PKTIO_METADATA_T         p_meta[],
+                         int                      n_pkts,
+                         uint64_t                 ts);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief PKTIO_SEND   PKTIO specific send function
+ * 
+ *  @details The application calls this PKTIO specific send function to transmit packet
+ *  @param[in]  channel         The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  p_send          Pointer to the packet to send
+ *  @param[in]  p_meta          Pointer to meta data associated with packet, @ref PKTIO_METADATA_T
+ *  @param[out] p_err             Pointer to error code.
+ *  @retval     none 
+ *  @pre       @ref netapi_pktioOpen
+ */
+typedef int (*PKTIO_SEND)(struct PKTIO_HANDLE_tag * channel,
+                          Ti_Pkt*                   p_send,
+                          PKTIO_METADATA_T*         p_meta,
+                          int*                      p_err);
+
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief PKTIO_POLL   PKTIO specific poll function
+ * 
+ *  @details The application calls this PKTIO specific POLL function
+ *  @param[in]  channel     The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  p_poll_cfg  @ref PKTIO_POLL_T, currently NOT_IMPLEMENTED
+ *  @param[out] p_err       Pointer to error code.
+ *  @retval     none 
+ *  @pre       @ref netapi_pktioOpen
+ */
+typedef int (*PKTIO_POLL)(struct PKTIO_HANDLE_tag * channel,
+                          PKTIO_POLL_T*             p_poll_cfg,
+                          int*                      p_err);
+
+
+/**
+ * @brief This defines an unused packet io channel slot
+ */
+#define PKTIO_NA 0
+
+
+struct NETAPI_tag;
+
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO handle structure definition.
+ *
+ *  @details PKTIO handle strucutre which is returned from call to @ref netapi_pktioCreate
+ */
+typedef struct PKTIO_HANDLE_Tag
+{
+/**
+ * @def PKTIO_INUSE
+ * @ingroup pktio_constants
+ *      This defines whether the pktio channel entry is valid.
+ */
+#define PKTIO_INUSE 0xfeedfeed
+
+    int inuse;                      /**<true is pktio channel is in use  */
+
+/**
+ * Set the "use_nwal" field to one of the defines listed below.
+ * <br>
+ * The following defines are used to populate the use_nwal field:
+ *      @ref PKTIO_4_IPC , @ref PKTIO_4_ADJ_NWAL, @ref PKTIO_DEF_NWAL. @ref PKTIO_4_ADJ_SB., @ref PKTIO_DEF_SB
+ */
+    int use_nwal;                  
+
+/**
+ * @def PKTIO_4_IPC
+ * @ingroup pktio_constants
+ *      This define is for channels used for IPC between cores
+ */
+#define  PKTIO_4_IPC 0
+
+/**
+ * @def PKTIO_4_ADJ_NWAL
+ * @ingroup pktio_constants
+ *      This define is for NETCP (RX) channels whose associated queues are managed by NWAL
+ */
+#define  PKTIO_4_ADJ_NWAL 1
+
+/**
+ * @def PKTIO_DEF_NWAL
+ * @ingroup pktio_constants
+ *      This define is for NETCP channels that are tied to the default NWAL RX/TX queues
+ */
+#define  PKTIO_DEF_NWAL 2
+
+/**
+ * @def PKTIO_4_ADJ_SB
+ *      This define is for (RX) channels used to get crypto side band results via application managed queues
+ * @ingroup pktio_constants
+ */
+#define  PKTIO_4_ADJ_SB 3
+
+/**
+ * @def PKTIO_DEF_SB
+ * @ingroup pktio_constants
+ *      This define is for channels tied to the default crypto side band  queues
+ */
+#define  PKTIO_DEF_SB 4
+
+    struct NETAPI_tag * back;           /**< back handle  to NETPAI instance */
+    void * nwalInstanceHandle;          /**<save here for conveninece  this is the nwal handle set at init time*/
+    PKTIO_CB cb;                        /**< callback for channel (for Rx) */
+    PKTIO_CFG_T cfg;                    /**<configuration  of channel */
+    Qmss_QueueHnd q;                    /**<the associated queue handle for channel */
+    Qmss_Queue qInfo;                   /**<and its qm#/q# */
+    int max_n;                          /**<max # of pkts to read in one poll */
+    void * cookie;                      /**<app specific */
+    PKTIO_SEND _send;                   /**<pktio type specific send function */
+    PKTIO_POLL _poll;                   /**<pktio type specific POLL function */
+    int poll_flags;                     /**< pktio flags to control polling options */
+    char name[PKTIO_MAX_NAME+1];        /**< Name of pktio channel */
+    Cppi_Handle             cppiHnd;    /* < cppi handle */
+    Cppi_ChHnd              rxChHnd;    /* < cppi receive channel handle */
+    Cppi_ChHnd              txChHnd;    /* < cppi transmit channe handle */
+    nwalTxPSCmdInfo_t tx_psCmdInfo; /**<Command Label to be sent to NetCP for the packet flow */
+}  PKTIO_HANDLE_T;
+
+
+/**
+ *  @ingroup pktio_structures
+ *  @brief PKTIO control structure 
+ *
+ *  @details PKTIO control stucture for the control API. Allows operations on pktio channel such as CLEAR ,  DIVERT, etc
+ */
+typedef struct PKTIO_CONTROL_Tag
+{
+/**
+ * @def PKTIO_CLEAR
+ *      This defines is used to clear out the pktio channel
+ */
+#define PKTIO_CLEAR 0x1
+
+// @cond NOT_IMPLEMENTED
+/**
+ * @def PKTIO_DIVERT
+ *      This define is used to divert to a dest pktio channel 
+ */
+#define PKTIO_DIVERT 0x2
+/// @endcond
+
+/**
+ * @def PKTIO_SET_POLL_FLAGS
+ *      This define is used to set poll flags for a pktio channel
+ */
+#define PKTIO_SET_POLL_FLAGS 0x4 //control poll flags (netcp_rx only)
+/**
+ * @def PKTIO_UPDATE_FAST_PATH
+ *      This define is used to update the command information template for 
+ *      INFLOW mode of operation of a ptktio channel (netcp_tx only)
+ */
+#define PKTIO_UPDATE_FAST_PATH 0x8
+
+/**<max # of pkts to read in one poll */
+/**
+ * @def PKTIO_UPDATE_MAX_PKTS_PER_POLL
+ *      This define is used to update the maximum number of packets to read in 1 poll
+ *      period for the pktio channel.
+ */
+#define PKTIO_UPDATE_MAX_PKTS_PER_POLL 0x10
+
+    int op;                 /**< Control operation (CLEAR, DIVERT, ..) */
+    PKTIO_HANDLE_T *dest;   /**< Handle to PKTIO channel (for DIVERT) */
+    int poll_flags;         /**< Flags to indicate polling options */
+} PKTIO_CONTROL_T;
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API creates a NETAPI PKTIO channel 
+ *
+ *  @details This assigns global resources to a NETAPI pktio channel.
+ *   Once created, the channel can be used to send and/or receive
+ *   a Ti_Pkt. This can be used for communication with the
+ *   the Network co-processor (NETCP) or for internal inter-processor
+ *   communication. The channel is saved under the assigned name
+ *   and can be opened by other netapi threads instances.
+ *  @param[in]  netapi_handle   The NETAPI handle, @ref NETAPI_T 
+ *  @param[in]  name            A pointer to the char string name for channel
+ *  @param[in]  cb              Callback to be issued on packet receive, @ref PKTIO_CB
+ *  @param[in]  p_cfg           Pointer to channel configuration, @ref PKTIO_CFG_T
+ *  @param[out] err             Pointer to error code.
+ *  @retval     Handle to the pktio instance or NULL on error, @ref PKTIO_HANDLE_T
+ *  @pre       @ref netapi_init 
+ */
+PKTIO_HANDLE_T * netapi_pktioCreate(NETAPI_T        netapi_handle,
+                                    char*           name,
+                                    PKTIO_CB        cb,
+                                    PKTIO_CFG_T*    p_cfg,
+                                    int*            err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API opens an existing  NETAPI PKTIO channel
+ *
+ *  @details This opens an NETAPI pktio channel for use. The channel
+ *  must have already been created via @ref netapi_pktioCreate or may have
+ *  been created internally during the netapi intialization.
+ *   Once opened, the channel can be used to send and/or receive
+ *   a Ti_Pkt. This can be used for communication with the 
+ *   the Network co-processor (NETCP) or for internal inter-processor
+ *   communication. 
+ *
+ *  @param[in]  netapi_handle   The NETAPI handle, @ref NETAPI_T 
+ *  @param[in]  name            A pointer to the char string name for channel to open
+ *  @param[in]  cb              Callback to be issued on packet receive, @ref PKTIO_CB
+ *  @param[in]  p_cfg           Pointer to channel configuration, @ref PKTIO_CFG_T
+ *  @param[out] err             Pointer to error code.
+ *  @retval     Handle to the pktio instance or NULL on error, @ref PKTIO_HANDLE_T
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate
+ */
+PKTIO_HANDLE_T * netapi_pktioOpen(NETAPI_T      netapi_handle, 
+                                 char*          name,
+                                 PKTIO_CB       cb,
+                                 PKTIO_CFG_T*   p_cfg,
+                                 int*           err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API controls an existing NETAPI PKTIO channel
+ *
+ *  @details This controls an opened pktio channel
+ *
+ *  @param[in]  handle      The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  cb          Callback to be issued on packet receive, @ref PKTIO_CB
+ *  @param[in]  p_cfg       Pointer to channel configuration which (optional), @ref PKTIO_CFG_T
+ *  @param[in]  p_control   Pointer to PKTIO control information (optional), @ref PKTIO_CONTROL_T
+ *  @param[out] err         Pointer to error code.
+ *  @retval     none
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+void netapi_pktioControl(PKTIO_HANDLE_T*    handle,
+                         PKTIO_CB           cb,
+                         PKTIO_CFG_T*       p_cfg,
+                         PKTIO_CONTROL_T*   p_control,
+                         int*               err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API closes a NETAPI PKTIO channel
+ *
+ *  @details This closes a PKTIO channel
+ *
+ *  @param[in]  handle  The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[out] err    Pointer to error code.
+ *  @retval     none
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+void netapi_pktioClose(PKTIO_HANDLE_T*  handle,
+                       int*             err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API deletes a NETAPI PKTIO channel
+ *
+ *  @details This deletes a PKTIO channel
+ *
+ *  @param[in]  handle  The PKTIO  handle, @ref PKTIO_HANDLE_T
+ *  @param[out] err     Pointer to error code.
+ *  @retval     none
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+void netapi_pktioDelete(PKTIO_HANDLE_T* handle,
+                        int*            err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API sends a packet to a NETAPI PKTIO channel 
+ *
+ *  @details This sends a Ti_Pkt and associated meta data, 
+ *  @ref PKTIO_METADATA_T to a channel. The channel
+ *  must have already been created via @ref netapi_pktioCreate or opened
+ *  via @ref netapi_pktioOpen.  It  may have
+ *  been created internally during the netapi intialization.
+ *  @param[in]  handle  The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  pkt     Pointer to the packet to send
+ *  @param[in]  m       Pointer to meta data associated with packet, @ref PKTIO_METADATA_T
+ *  @param[out] err     Pointer to error code.
+ *  @retval     1 if packet sent, 0 if error 
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+static inline int  netapi_pktioSend(PKTIO_HANDLE_T*   handle,
+                                    Ti_Pkt*           pkt,
+                                    PKTIO_METADATA_T* m,
+                                    int*              err)
+{
+   return handle->_send((struct PKTIO_HANDLE_tag *)handle, pkt, m, err);
+}
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API sends multiple packets to a NETAPI PKTIO channel
+ *
+ *  @details This sends an array of Ti_Pkt and associated meta data,
+ *  @ref PKTIO_METADATA_T to a channel. The channel
+ *  must have already been created via @ref netapi_pktioCreate or opened
+ *  via @ref netapi_pktioOpen.  It  may have
+ *  been created internally during the netapi intialization.
+ *  @param[in]  handle  The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  pkt     Pointer to the packet to send
+ *  @param[in]  m       Pointer to meta data associated with packet, @ref PKTIO_METADATA_T
+ *  @param[in]  np      The number of packets in list to send
+ *  @param[out] err     Pointer to error code.
+ *  @retval             Number of packets sent, 0 if error
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+int netapi_pktioSendMulti(PKTIO_HANDLE_T*   handle,
+                          Ti_Pkt*           pkt[],
+                          PKTIO_METADATA_T* m[],
+                          int               np,
+                          int*              err);
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API polls a NETAPI PKTIO channel for received packets 
+ *
+ *  @details This api polls a pktio channel. Any pending data in the channel is
+ *  passed to the @ref  PKTIO_CB registered when the channel was
+ *  created or opened. The channel must
+ *  have already been created via @ref netapi_pktioCreate or opened
+ *  via @ref netapi_pktioOpen.  It  may have
+ *  been created internally during the netapi intialization.
+ *  @param[in]  handle      The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  p_poll_cfg  Pointer to pktio poll configuration. @ref PKTIO_POLL_T
+ *  @param[out] err         Pointer to error code.
+ *  @retval                 Number of packets received by poll 
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+static inline int netapi_pktioPoll(PKTIO_HANDLE_T* handle,
+                                   PKTIO_POLL_T*   p_poll_cfg,
+                                   int*            err)
+{
+    return handle->_poll((struct PKTIO_HANDLE_tag *) handle, p_poll_cfg, err);
+}
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief API polls all NETAPI PKTIO channels associated with @ref NETAPI_T instance
+ *         for received packets
+ *
+ *  @details This api polls all pktio channels attached to an instance.
+ *  Any pending data in these channels are 
+ *  passed to the @ref  PKTIO_CB registered when the channel was
+ *  created or opened. The channels  must
+ *  have already been created via @ref netapi_pktioCreate or opened
+ *  via @ref netapi_pktioOpen.  They may have
+ *  been created internally during the netapi intialization.
+ *  @param[in]  handle      The PKTIO channel handle, @ref PKTIO_HANDLE_T
+ *  @param[in]  p_poll_cfg  Pointer to pktio poll configuration. @ref PKTIO_POLL_T
+ *  @param[out] err         Pointer to error code.
+ *  @retval                 Number of packets received by poll 
+ *  @pre       @ref netapi_init, @ref netapi_pktioCreate, @ref netapi_pktioOpen
+ */
+int netapi_pktioPollAll(NETAPI_T        handle, 
+                        PKTIO_POLL_T*   p_poll_cfg, 
+                        int*            err);
+
+
+/**
+ * @brief This define sets the max number of pkts to read in one poll in the @ref PKTIO_HANDLE_T
+ */
+#define netapi_pktioSetMaxN(handle,max_n) (handle)->max_n=max_n;
+
+/**
+ * @brief This define returns NETAPI handle stored in the @ref PKTIO_HANDLE_T
+ */
+#define netapi_pktioGetNetapiHandle(handle) (handle)->back
+
+
+/**
+ * @brief This define sets a user space application cookie in the @ref PKTIO_HANDLE_T
+ */
+#define netapi_pktioSetCookie(handle, cookie) (handle)->cookie = cookie
+
+/**
+ * @brief This define returns a previously set user space application cookie stored in the @ref PKTIO_HANDLE_T
+ */
+#define netapi_pktioGetCookie(handle) (handle)->cookie
+
+/**
+ * @brief This define returns a associate queue handle stored in the @ref PKTIO_HANDLE_T
+ */
+#define netapi_pktioGetQ(handle) (handle)->q
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API returns default packet queue to poll for netcp RX
+ *  @note: these are expensive calls, so call once and save
+ */
+static inline Qmss_QueueHnd pktio_mGetDefaultNetCpQ(PKTIO_HANDLE_T *h)
+{
+    nwalGlobCxtInfo_t Info;
+    nwal_getGlobCxtInfo(h->nwalInstanceHandle,&Info);
+    return Info.rxDefPktQ;
+}
+
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API returns L4Queue to poll for netcp RX (L4 classifier queue).
+ *  @note: these are expensive calls, so call once and save
+ */
+static inline Qmss_QueueHnd pktio_mGetDefaultNetCPL4Q(PKTIO_HANDLE_T *h)
+{
+    nwalLocCxtInfo_t Info;
+    nwal_getLocCxtInfo(h->nwalInstanceHandle,&Info);
+    return Info.rxL4PktQ;
+}
+
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API to perform descriptor push to QMSS Queue
+ */
+static inline void pktio_mQmssQueuePushDescSizeRaw(Qmss_QueueHnd    hnd,
+                                                   void*            descAddr,
+                                                   uint32_t         descSize)
+{
+    return(Qmss_queuePushDescSizeRaw(hnd,descAddr,descSize));
+}
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API to perform descriptor pop from QMSS Queue
+ */
+static inline void* pktio_mQmssQueuePopRaw(Qmss_QueueHnd hnd)
+{
+    return(Qmss_queuePopRaw(hnd));
+}
+
+/**
+ *  @ingroup pktio_functions
+ *  @brief  API to retrieve NWAL global instance handle.
+ */
+static inline nwal_Inst pktio_mGetNwalInstance(PKTIO_HANDLE_T *h)
+{
+    return h->nwalInstanceHandle;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/ti/runtime/netapi/src/netapi.c b/ti/runtime/netapi/src/netapi.c
new file mode 100755
index 0000000..db9301e
--- /dev/null
+++ b/ti/runtime/netapi/src/netapi.c
@@ -0,0 +1,462 @@
+/***********************************************************************
+ * FILE: netapi.c
+ * Purpose:  Main initialization and shutdown routines of NETAPI 
+ *           user space transport library.
+ ***********************************************************************
+ * FILE: netapi.c
+ * 
+ * DESCRIPTION:  netapi main source file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ * *****************************/
+
+#include <unistd.h>
+#include "ti/runtime/netapi/netapi.h"
+#include "netapi_loc.h"
+
+void* pBase;
+NETAPI_SHM_T* pnetapiShm;
+void *pRmClientHandle = NULL;
+
+static NETAPI_CFG_T netapi_default_cfg=
+{
+    TUNE_NETAPI_PERM_MEM_SZ,
+    0,  //start of packet offset for hw to place data on rx for default flow
+    TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+    TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+    TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+    TUNE_NETAPI_DEFAULT_NUM_SOLO_DESCRIPTORS, //#descriptors w/o buffers in default heap
+    TUNE_NETAPI_DEFAULT_BUFFER_SIZE,   //size of buffers in default heap
+    0,
+    0,
+    0,
+    NULL                                   /* Resource manager handle to use RM server */
+};
+
+HPLIB_SPINLOCK_IF_T spinlock_lol =
+{
+    hplib_mSpinLockInit,
+    hplib_mSpinLockTryLock,
+    hplib_mSpinLockIsLocked,
+    hplib_mSpinLockLock,
+    hplib_mSpinLockUnlock,
+    hplib_mRWLockInit,
+    hplib_mRWLockWriteLock,
+    hplib_mRWLockWriteUnlock,
+    hplib_mRWLockReadLock,
+    hplib_mRWLockReadUnlock
+};
+
+
+HPLIB_SPINLOCK_IF_T spinlock_mp =
+{
+    hplib_mSpinLockInit,
+    hplib_mSpinLockTryLock,
+    hplib_mSpinLockIsLocked,
+    hplib_mSpinLockLockMP,
+    hplib_mSpinLockUnlockMP,
+    hplib_mRWLockInit,
+    hplib_mRWLockWriteLockMP,
+    hplib_mRWLockWriteUnlockMP,
+    hplib_mRWLockReadLockMP,
+    hplib_mRWLockReadUnlockMP
+};
+
+/* Global variablesto hold virtual address of various subsystems */
+hplib_virtualAddrInfo_T netapi_VM_VirtAddr[HPLIB_MAX_MEM_POOLS];
+
+/* Global variables which needs to be populated with memory pool attributes
+   which is passed to HPLIB for memory pool initialization*/
+hplib_memPoolAttr_T netapi_VM_MempoolAttr[HPLIB_MAX_MEM_POOLS];
+unsigned char *netapi_VM_QMemLocalDescRam;
+unsigned char *netapi_VM_QMemGlobalDescRam;
+unsigned char *netapi_VM_SaContextVaddr;
+
+//global for this process that points to the 
+// master thread for this process (either the SYS_MASTER, or PROC_MASTER)
+//...
+NETAPI_HANDLE_T * netapi_proc_master = NULL;
+Pktlib_HeapIfTable  netapi_pktlib_ifTable;
+NETAPI_PROC_GLOBAL_T netapi_proc_global;
+//NETAPI_GLOBAL_T * netapi_get_global(){ return &netapi_global;}
+NETAPI_GLOBAL_T * netapi_get_global(){ return &pnetapiShm->netapi_global;}
+NETAPI_PROC_GLOBAL_T * netapi_get_proc_global(){ return &netapi_proc_global;}
+
+/* utility API for NETAPI user to get pktlib if table to use if he creates his own heap */
+Pktlib_HeapIfTable *netapi_getPktlibIfTable(void) {return &netapi_pktlib_ifTable;}
+
+
+/********************************************************************
+* FUNCTION PURPOSE:  API instantiates the NETAPI and allocated global resources.
+ ********************************************************************
+ * DESCRIPTION:  API instantiates the NETAPI and allocated global resources.
+ ********************************************************************/
+NETAPI_T netapi_init(int                master,
+                     NETAPI_CFG_T *     p_cfg)
+{
+    int i;
+    int err;
+    int exception_id = 7;
+    void* pBase = NULL;
+
+    hplib_shmInfo_T* pshmBase = NULL;
+    NETAPI_HANDLE_T * p = (NETAPI_HANDLE_T *) calloc(1,sizeof(NETAPI_HANDLE_T));
+    NETAPI_HANDLE_T * p_master;
+    if (!p) return NULL;
+    p->master = master;
+
+    /*  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)
+    {
+        pBase = hplib_shmCreate(HPLIB_SHM_SIZE);
+
+        if (pBase == NULL)
+        {
+            free(p);
+            return NULL;
+        }
+
+        if (hplib_shmAddEntry(pBase, sizeof(NETAPI_SHM_T), NETAPI_ENTRY) !=
+            hplib_OK)
+        {
+            free(p);
+            return NULL;
+        }
+        hplib_utilOsalCreate();
+    }
+    /*ALL others:  we are not the system master; assume SYS_MASTER has
+      created SHM area for us already, so just open it */
+    else
+    {
+        pBase = hplib_shmOpen();
+        if (pBase)
+            Osal_start(pBase);
+    }
+
+    /*ALL:  create space for our local pktios */
+    for(i=0;i<TUNE_NETAPI_MAX_PKTIO; i++)
+    {
+        p->pktios[i] = calloc(1,sizeof(PKTIO_HANDLE_T));
+        if (!p->pktios[i])
+        {
+            free(p);
+            return NULL;
+        }
+        else
+        {
+            PKTIO_ENTRY_T *pe = (PKTIO_ENTRY_T*)p->pktios[i];
+            pe->qn.qNum = -1;
+        }
+    }
+
+#ifdef NETAPI_INCLUDE_SCHED
+    /* ALL: create space for scheduler */
+    p->p_sched = calloc(1,sizeof(NETAPI_SCHED_HANDLE_T));
+    if (!p->p_sched)
+    {
+        goto ERR_netapi_init;
+    }
+#endif
+
+    /* SYS_MASTER:  The following segment should be done 1 Time per system boot by global master process */
+    if (master == NETAPI_SYS_MASTER)
+    {
+        pnetapiShm = (NETAPI_SHM_T*)hplib_shmGetEntry(pBase, NETAPI_ENTRY);
+        pnetapiShm->netapi_pktio_lock= hplib_spinLock_UNLOCKED_INITIALIZER;
+        pnetapiShm->netapi_netcp_cfg_lock = hplib_spinLock_UNLOCKED_INITIALIZER;
+        pnetapiShm->netapi_netcp_cfg_l3_classi_lock = hplib_spinLock_UNLOCKED_INITIALIZER;
+        pnetapiShm->netapi_util_lock = hplib_spinLock_UNLOCKED_INITIALIZER;
+
+        if (p_cfg)
+        {
+            memcpy(&pnetapiShm->netapi_global.cfg,p_cfg, sizeof(NETAPI_CFG_T));
+        }
+        else
+        {
+            memcpy(&pnetapiShm->netapi_global.cfg,&netapi_default_cfg, sizeof(NETAPI_CFG_T));
+        }
+        for(i=0;i<TUNE_NETAPI_MAX_PKTIO;i++) 
+        {
+            pnetapiShm->netapi_global.pktios[i].qn.qNum=-1;
+            pnetapiShm->netapi_global.pktios[i].name[0]='\0';
+        }
+    }
+    else
+    {
+        /* other 'masters' will just get a pointer to the netapi SHM area*/
+        pnetapiShm = (NETAPI_SHM_T*)hplib_shmGetEntry(pBase, NETAPI_ENTRY);
+    }
+
+    /* all for convenience set a back pointer to the SOC global area
+       (in SHM) and process global in netapi_proc_global */
+    p->global = (void *) &pnetapiShm->netapi_global;
+    p->proc_global = (void *)&netapi_proc_global;
+    /* Update spinLock to point to either MP spinlock or fast spinlocks, this is 
+       for all callers of netapi_init*/
+    if(p_cfg)
+    {
+        if(p_cfg->def_multi_process)
+            p->spinLock = spinlock_mp;
+        else
+            p->spinLock= spinlock_lol;
+    }
+    else
+        p->spinLock = spinlock_lol;
+
+    /* SYS_MASTER, PROC_MASTER: save a pointer to its netapi structure
+       globably for other threads/core of process to use */
+    if ((master == NETAPI_SYS_MASTER)||(master == NETAPI_PROC_MASTER))
+    {
+        p_master=netapi_proc_master = p;
+        if (p_cfg->rmHandle)
+            pRmClientHandle = p_cfg->rmHandle;
+    }
+    else
+    {
+        /* CORE_MASTER/NO_MASTER: get system master/proc master's handle */
+        p_master=(NETAPI_HANDLE_T *) netapi_proc_master;
+    }
+
+
+    /* SYS_MASTER: The following segment should be done 1 Time per system boot by global master process */
+    /* system init */
+    if(master == NETAPI_SYS_MASTER)
+    {
+        err = netapip_systemInit(p, NETAPI_TRUE);
+        if (err < 0)
+        {
+            goto ERR_netapi_init;
+        }
+    }
+    /* PROC_MASTER case */
+    else if (master==NETAPI_PROC_MASTER)
+    {
+        /* More limited initialization */
+        err = netapip_systemInit(p,
+                                 NETAPI_FALSE);
+        if (err<0)
+        {
+            goto ERR_netapi_init;
+        }
+    }
+    /* NO_MASTER:  case */
+    else if (master == NETAPI_NO_MASTER)
+    {
+        /*Just copy master's pktio list for now */
+        p->n_pktios = p_master->n_pktios;
+        memcpy(&p->pktios[0],&p_master->pktios[0],TUNE_NETAPI_MAX_PKTIO*sizeof(PKTIO_HANDLE_T));
+        p->nwal_local=p_master->nwal_local;
+    }
+    /* this is the NETAPI_CORE_MASTER case */
+    else if (master == NETAPI_CORE_MASTER)
+    {
+        /* Start the QMSS. */
+        if (netapip_startQm(pRmClientHandle) != 1)
+        {
+            goto ERR_netapi_init;
+        }
+        netapip_startNwal(p_master->netcp_heap, 
+                          p_master->netcp_control_rx_heap,
+                          p_master->netcp_control_tx_heap, 
+                          &p->nwal_local,
+                          &pnetapiShm->netapi_global.cfg,
+                          &pnetapiShm->netapi_global.nwal_context,
+                          master);
+    }
+    else
+    {
+        goto ERR_netapi_init;
+    }
+
+    return (NETAPI_T) p;
+
+/* error handling */
+ERR_netapi_init:
+    for(i=0;i<TUNE_NETAPI_MAX_PKTIO; i++)
+    {
+        if (p->pktios[i])
+        {
+            free(p->pktios[i]);
+        }
+    }
+#ifdef NETAPI_INCLUDE_SCHED
+    if (p->p_sched)
+    {
+        free(p->p_sched);
+    }
+#endif
+    free(p);
+    return NULL;
+}
+
+/********************************************************************
+* FUNCTION PURPOSE:  API de-allocates all global resources allocated as part 
+*                                   of ref netapi_init
+ ********************************************************************
+ * DESCRIPTION:   API de-allocates all global resources allocated as part 
+*                                   of ref netapi_init
+ ********************************************************************/
+void netapi_shutdown(NETAPI_T h)
+{
+    int i;
+    hplib_shmInfo_T* pshmBase;
+    NETAPI_HANDLE_T * p = (NETAPI_HANDLE_T *) h;
+    if (!p) return;
+    void * map_base;
+    hplib_VirtMemPoolheader_T *poolHdr;
+
+    if (p->master == NETAPI_SYS_MASTER)
+    {
+    
+        /* Un-configure rules for execption packet handling */
+
+        /* close nwal master (per soc) context */
+        nwal_delete(pnetapiShm->netapi_global.nwal_context.nwalInstHandle);
+
+        /* close heaps */
+        netapi_closeHeap(h, p->netcp_heap);
+        netapi_closeHeap(h, p->netcp_control_rx_heap);
+        netapi_closeHeap(h, p->netcp_control_tx_heap);
+        netapi_closeHeap(h, netapi_get_global()->nwal_context.pa2sa_heap); 
+        netapi_closeHeap(h, netapi_get_global()->nwal_context.sa2pa_heap); 
+
+        //loop over registered heaps
+        for(i=0;i<TUNE_NETAPI_MAX_HEAPS;i++)
+        {
+            if (p->createdHeaps[i])
+            {
+                netapi_closeHeap(h,p->createdHeaps[i]);
+                p->createdHeaps[i]=NULL;
+            }
+        }
+        netapip_cleanupAtStart();  //clear 1st 50 not-specified queues
+        //netapip_cleanupAtStart();  //clear 1st 50 not-specified queues
+        //reset DDR malloc area
+        hplib_resetMallocArea(0);
+        Qmss_removeMemoryRegion(p->memRegion,0);
+        hplib_vmTeardown();
+        hplib_shmDelete();
+    }
+    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);
+        netapi_closeHeap(h, p->netcp_control_tx_heap);
+        //loop over registered heaps (again local to our process)
+        for(i=0;i<TUNE_NETAPI_MAX_HEAPS;i++)
+        {
+            if (p->createdHeaps[i])
+            {
+                netapi_closeHeap(h,p->createdHeaps[i]);
+                p->createdHeaps[i]=NULL;
+            }
+        }
+        Qmss_removeMemoryRegion(p->memRegion,0);
+        hplib_vmTeardown();
+    }
+    //TODO other master types
+    /* error handling */
+    
+    for(i=0;i<TUNE_NETAPI_MAX_PKTIO; i++)
+    {
+        if (p->pktios[i])
+        {
+            free(p->pktios[i]);
+            p->pktios[i] = NULL;
+        }
+    }
+#ifdef NETAPI_INCLUDE_SCHED
+    if (p->p_sched)
+    {
+        free(p->p_sched);
+        p->p_sched = NULL;
+    }
+#endif
+
+    free(p);
+    return;
+}
+
+/***********************************************************************
+* FUNCTION PURPOSE:  API is used to poll for NETCP configuration response messages.
+************************************************************************
+* DESCRIPTION:  This API is used to poll the netapi internal heaps and any 
+ *              application-created heaps that have been registered with 
+ *              the netapi instance. The poll function checks the garbage collection 
+ *              queue associated with the heap and returns descriptors and buffers 
+ *              when appropriate to the main free queue.
+***********************************************************************/
+void netapi_pollHeapGarbage(NETAPI_T h)
+{
+    int i;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    Pktlib_garbageCollection(n->netcp_heap);
+    //no need to do garbage collection on other internal heaps
+    for(i=0;i<TUNE_NETAPI_MAX_HEAPS;i++)
+    {
+        if (n->createdHeaps[i])
+        {
+            Pktlib_garbageCollection(n->createdHeaps[i]);
+        }
+    }
+}
+
+/****************************************************************************
+* FUNCTION PURPOSE:  API is used to poll for NETCP configuration response messages.
+****************************************************************************
+* DESCRIPTION:  This API is used to poll the netapi internal heaps and any 
+ *              application-created heaps    that have been registered with the 
+ *              netapi instance. The poll function checks the garbage collection 
+ *              queue associated with the heap and returns descriptors and buffers
+ *              when appropriate to the main free queue.
+***************************************************************************/
+void netapi_netcpPoll(NETAPI_T  p)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) p;
+    nwal_pollCtl( ((NETAPI_GLOBAL_T *) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+}
+/**************************************************************************************
+* FUNCTION PURPOSE:  API is used to return configured descriptor memory region Id.
+***************************************************************************************
+* DESCRIPTION:  This API is used to return the configured descriptor memory region Id.
+**************************************************************************************/
+int netapi_getMemoryRegionId(NETAPI_T  p)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) p;
+    if(netapi_proc_master)
+        return (netapi_proc_master->memRegion);
+    else
+        return -1;
+}
diff --git a/ti/runtime/netapi/src/netapi_init.c b/ti/runtime/netapi/src/netapi_init.c
new file mode 100755
index 0000000..eb1cf41
--- /dev/null
+++ b/ti/runtime/netapi/src/netapi_init.c
@@ -0,0 +1,1106 @@
+/****************************************************************************
+*  FILE:  netapi_init.c
+*  Global, Private initialization and cleanup routines and defines of NETAPI
+ *
+ * DESCRIPTION: Functions to initialize and cleanup framework resources 
+ *              for running NETAPI
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ***************************************************************************/
+
+#include "netapi.h"
+#include "netapi_loc.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include "ti/drv/nwal/nwal.h"
+
+/* CSL RL includes */
+#include <ti/csl/cslr_device.h>
+#include <ti/csl/cslr_qm_config.h>
+#include <ti/csl/cslr_qm_descriptor_region_config.h>
+#include <ti/csl/cslr_qm_queue_management.h>
+#include <ti/csl/cslr_qm_queue_status_config.h>
+#include <ti/csl/cslr_qm_intd.h>
+#include <ti/csl/cslr_pdsp.h>
+#include <ti/csl/csl_qm_queue.h>
+#include <ti/csl/cslr_cppidma_global_config.h>
+#include <ti/csl/cslr_cppidma_rx_channel_config.h>
+#include <ti/csl/cslr_cppidma_rx_flow_config.h>
+#include <ti/csl/cslr_cppidma_tx_channel_config.h>
+#include <ti/csl/cslr_cppidma_tx_scheduler_config.h>
+#include <ti/csl/csl_cppi.h>
+#include <ti/csl/csl_pscAux.h>
+#include <ti/csl/csl_semAux.h>
+#include <ti/csl/csl_cacheAux.h>
+#include <ti/csl/csl_xmcAux.h>
+#include <ti/drv/qmss/qmss_qm.h>
+
+
+/* pointer to NWAL local context memory block used by NWAL for local 
+   context intance*/
+void* pNwalLocCtxMem = NULL;
+extern void *pRmClientHandle;
+
+nwal_Handle gPNwalInstHandle = NULL;
+
+
+extern NETAPI_SHM_T* pnetapiShm;
+/* Global variablesto hold virtual address of various subsystems */
+extern hplib_virtualAddrInfo_T netapi_VM_VirtAddr[];
+
+/* Global variables which needs to be populated with memory pool attributes
+   which is passed to HPLIB for memory pool initialization*/
+extern hplib_memPoolAttr_T netapi_VM_MempoolAttr[];
+extern unsigned char *netapi_VM_QMemLocalDescRam;
+extern unsigned char *netapi_VM_QMemGlobalDescRam;
+extern unsigned char *netapi_VM_SaContextVaddr;
+
+extern Pktlib_HeapIfTable  netapi_pktlib_ifTable;
+extern NETAPI_PROC_GLOBAL_T netapi_proc_global;
+extern NETAPI_HANDLE_T * netapi_proc_master;
+
+
+/* TODO verify: */
+#define CACHE_LINESZ    64
+
+
+#define ALIGN(x)    __attribute__((aligned (x)))
+
+/*****************************************************************************
+ * Global Resources shared by all Cores
+ *****************************************************************************/
+uint8_t *QMemGlobDescRam = 0;
+uint8_t *cppiMemPaSaLinkBuf = 0;
+uint8_t *cppiMemSaPaLinkBuf = 0;
+
+
+
+#if 0
+/*****************************************************************************
+ * Local Resource allocated at each Core
+ *****************************************************************************/
+/* Descriptors in global shared */
+uint8_t *QMemLocDescRam = NULL;
+uint8_t *cppiMemRxPktLinkBuf = NULL;
+uint8_t *cppiMemTxPktLinkBuf = NULL;
+uint8_t *cppiMemRxCtlLinkBuf = NULL;
+uint8_t *cppiMemTxCtlLinkBuf = NULL;
+
+#endif
+
+
+
+NETCP_CFG_GLOB_DEVICE_PARAMS_T   *p_netapi_device_cfg_local;
+Qmss_MemRegInfo   memInfo;
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI function to setup the QM memory region
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAPI function to setup the QM memory region,
+ *               once per SOC
+ ********************************************************************/
+int netapip_qmSetupMemRegion(
+                      uint32_t          numDesc,
+                      uint32_t          descSize,
+                      uint32_t*         pDescMemBase,
+                      int               memRegion,
+                      int               start_index)
+{
+    //Qmss_MemRegInfo   memInfo;
+    int result;
+
+    memset(&memInfo,0,sizeof(Qmss_MemRegInfo));
+    memInfo.descBase       = pDescMemBase;
+    memInfo.descSize       = descSize;
+    memInfo.descNum        = numDesc;
+    memInfo.manageDescFlag = Qmss_ManageDesc_MANAGE_DESCRIPTOR;
+
+    if (pRmClientHandle)
+    {
+        memInfo.memRegion = -1;
+        memInfo.startIndex = QMSS_START_INDEX_NOT_SPECIFIED;
+    }
+    else
+    {
+        memInfo.memRegion = memRegion;
+        memInfo.startIndex = start_index;
+    }
+
+    memset (pDescMemBase, 0, (descSize * numDesc));
+
+    result = Qmss_insertMemoryRegion (&memInfo);
+
+    if (result < QMSS_SOK)  
+    {
+        return (-1);
+    }
+    netapi_proc_master->memRegion = memInfo.memRegion;
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI function to start QM
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAPI function to start QM
+ *               once per thread/core
+ ********************************************************************/
+int netapip_startQm(void* rmClientServiceHandle)
+{
+     int32_t          result;
+     Qmss_StartCfg    startCfg;
+
+     startCfg.rmServiceHandle = rmClientServiceHandle;
+     startCfg.pQmssGblCfgParams = NULL;
+     //result = Qmss_start();
+     result = Qmss_startCfg(&startCfg);
+     if (result != QMSS_SOK)
+     {
+         return (-1);
+     }
+     return 1;
+}
+
+
+/*** NWAL Memory Buffer Configuration ***/
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_HANDLE     3400
+//uint8_t nwalInstMem[NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_HANDLE]ALIGN(CACHE_LINESZ);
+
+
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_MAC                    256
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_IPSEC_HANDLE_PER_CHAN      256
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_IP                     128
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_PORT                   128
+#define NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_L2L3_HDR               128
+#define NWAL_CHAN_HANDLE_SIZE    ((NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_MAC * TUNE_NETAPI_MAX_NUM_MAC) + \
+                                  (NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_IPSEC_HANDLE_PER_CHAN * TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS*2) + \
+                                  (NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_IP * TUNE_NETAPI_MAX_NUM_IP) + \
+                                  (NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_PORT * TUNE_NETAPI_MAX_NUM_PORTS)+ \
+                                  (NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_PER_L2L3_HDR * TUNE_NETAPI_MAX_NUM_L2_L3_HDRS))
+
+typedef struct NETAPI_NWAL_SHM_Tag
+{
+    uint8_t nwalInstMem[NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_HANDLE]ALIGN(CACHE_LINESZ);
+    uint8_t nwalHandleMem[NWAL_CHAN_HANDLE_SIZE]ALIGN(CACHE_LINESZ);
+} NETAPI_NWAL_SHM_T;
+
+
+typedef struct NETAPI_PA_SHM_Tag
+{
+/* todo: Check if below size information can be made available from pa interface file */
+#define NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF0      512
+/* PA instance */
+/* Memory used for the PA Instance. Needs to be assigned global uncached memory for chip */
+uint8_t paBuf0[NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF0]ALIGN(CACHE_LINESZ);
+
+/* Memory used for PA handles */
+#define NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF1    128 * TUNE_NETAPI_MAX_NUM_MAC
+uint8_t paBuf1[NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF1]ALIGN(CACHE_LINESZ);
+
+#define NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF2   14592
+
+
+uint8_t paBuf2[NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF2]ALIGN(CACHE_LINESZ);
+} NETAPI_PA_SHM_T;
+
+
+typedef struct NETAPI_SA_SHM_Tag
+{
+/* Memory used for SA LLD global Handle */
+#define NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE    512
+uint8_t salldHandle[NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE]ALIGN(CACHE_LINESZ);
+
+/* Memory used by SA LLD per Channel */
+#define NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE_PER_CHAN          512
+uint8_t salldChanHandle[NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE_PER_CHAN * TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS*2]ALIGN(CACHE_LINESZ);
+} NETAPI_SA_SHM_T;
+
+
+
+
+
+
+
+
+/********************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function to gracefully cleanup when startup
+*                                  issue occurs.
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function to gracefully cleanup when startup
+*                                  issue occurs.
+ ********************************************************************/
+void netapipErrTeardown() { netapip_cleanupAtStart(); exit(-99); }
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI function to initialize NWAL subsystem
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAPI function to initialize NWAL subsytem
+ ********************************************************************/
+int netapip_initNwal(
+    int region2use,
+    Pktlib_HeapIfTable * p_table,
+    NETAPI_NWAL_GLOBAL_CONTEXT_T * p_nwal_context,
+    NETAPI_CFG_T*p_cfg)
+{
+    nwalSizeInfo_t  nwalSizeInfo;
+    nwal_RetValue   nwalRetVal;
+    nwalGlobCfg_t   nwalGlobCfg;
+    nwalBaseAddrCfg_t nwalBaseAddrCfg;
+    uint8_t         count;
+    int             sizes[nwal_N_BUFS];
+    int             aligns[nwal_N_BUFS];
+    void*           bases[nwal_N_BUFS];   
+    Pktlib_HeapCfg      heapCfg;
+    int32_t             errCode = 0;
+    void* pBase = NULL;
+    NETAPI_PA_SHM_T* paEntry = NULL;
+    NETAPI_SA_SHM_T* saEntry = NULL;
+    NETAPI_NWAL_SHM_T* nwalEntry = NULL;
+    uint32_t localCtxSize = 0;
+    memset(p_nwal_context,0,sizeof( NETAPI_NWAL_GLOBAL_CONTEXT_T) );
+    memset(&nwalGlobCfg,0,sizeof(nwalGlobCfg_t ) );
+    memset (&nwalBaseAddrCfg, 0, sizeof(nwalBaseAddrCfg_t));
+    pBase = hplib_shmOpen();
+    if (pBase)
+    {
+        if(hplib_shmAddEntry(pBase, sizeof(NETAPI_PA_SHM_T), PA_ENTRY) == hplib_OK)
+        {
+            paEntry = (NETAPI_PA_SHM_T*)hplib_shmGetEntry(pBase,PA_ENTRY);
+            nwalBaseAddrCfg.pInstPoolPaBaseAddr= (void *)paEntry;
+        }
+        else
+        {
+            return -1;
+        }
+        if(hplib_shmAddEntry(pBase, sizeof(NETAPI_SA_SHM_T), SA_ENTRY) == hplib_OK)
+        {
+            saEntry = (NETAPI_SA_SHM_T*)hplib_shmGetEntry(pBase,SA_ENTRY);
+            nwalBaseAddrCfg.pInstPoolSaBaseAddr= (void*) saEntry;
+        }
+        else
+        {
+            return -1;
+        }
+        if(hplib_shmAddEntry(pBase, sizeof(NETAPI_NWAL_SHM_T), NWAL_ENTRY) == hplib_OK)
+        {
+            nwalEntry = (NETAPI_NWAL_SHM_T*)hplib_shmGetEntry(pBase,NWAL_ENTRY);
+        }
+        else
+        {
+            return -1;
+        }
+        
+    }
+    /* Initialize Buffer Pool for NetCP PA to SA packets */
+    nwalGlobCfg.pa2SaBufPool.numBufPools = 1;
+    nwalGlobCfg.pa2SaBufPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalGlobCfg.pa2SaBufPool.bufPool[0].bufSize =  p_cfg->def_heap_buf_size;
+
+    /* Initialize the heap configuration. */
+    memset ((void *)&heapCfg, 0, sizeof(Pktlib_HeapCfg));
+    /* Populate the heap configuration */
+    heapCfg.name                = "nwal PA2SA";
+    heapCfg.memRegion           = region2use;
+    heapCfg.sharedHeap          = 0;
+    heapCfg.useStarvationQueue  = 0;
+    heapCfg.dataBufferSize      = p_cfg->def_heap_buf_size;
+    heapCfg.numPkts             = TUNE_NETAPI_CONFIG_MAX_PA_TO_SA_DESC;
+    heapCfg.numZeroBufferPackets= 0;
+    heapCfg.heapInterfaceTable.data_malloc  = p_table->data_malloc;
+    heapCfg.heapInterfaceTable.data_free    = p_table->data_free;
+    heapCfg.dataBufferPktThreshold   = 0;
+    heapCfg.zeroBufferPktThreshold   = 0;
+
+
+    nwalGlobCfg.pa2SaBufPool.bufPool[0].heapHandle = p_nwal_context->pa2sa_heap=
+                      Pktlib_createHeap(&heapCfg, &errCode);
+    if(nwalGlobCfg.pa2SaBufPool.bufPool[0].heapHandle == NULL)
+    {
+        netapipErrTeardown();
+        return -1;
+    }
+
+ /* Initialize Buffer Pool for NetCP SA to PA packets */
+    nwalGlobCfg.sa2PaBufPool.numBufPools = 1;
+    nwalGlobCfg.sa2PaBufPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalGlobCfg.sa2PaBufPool.bufPool[0].bufSize =  p_cfg->def_heap_buf_size;
+
+     /* Populate the heap configuration */
+    heapCfg.name                = "nwal SA2PA";
+    heapCfg.numPkts             = TUNE_NETAPI_CONFIG_MAX_SA_TO_PA_DESC;
+
+    nwalGlobCfg.sa2PaBufPool.bufPool[0].heapHandle = 
+        p_nwal_context->sa2pa_heap = Pktlib_createHeap(&heapCfg, &errCode);
+    if(nwalGlobCfg.sa2PaBufPool.bufPool[0].heapHandle == NULL)
+    {
+        netapipErrTeardown();
+        return -1;
+    }
+
+    nwalGlobCfg.hopLimit = 5;/* Default TTL / Hop Limit */
+    nwalGlobCfg.paPowerOn = nwal_TRUE;
+    nwalGlobCfg.saPowerOn = nwal_TRUE;
+    nwalGlobCfg.paFwActive = nwal_TRUE;
+    nwalGlobCfg.saFwActive = nwal_FALSE;
+
+
+    /* Update nwal cfg with virtual PA and SA addresses */
+
+
+    nwalBaseAddrCfg.paVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr;
+
+
+    nwalBaseAddrCfg.pSaVirtBaseAddr = (uint32_t) netapi_VM_VirtAddr->passCfgVaddr +
+                                  CSL_NETCP_CFG_SA_CFG_REGS -
+                                  CSL_NETCP_CFG_REGS;
+        ;
+    nwalGlobCfg.rxDefPktQ = QMSS_PARAM_NOT_SPECIFIED;
+
+
+    /* Get the Buffer Requirement from NWAL */
+    memset(&nwalSizeInfo,0,sizeof(nwalSizeInfo));
+    nwalSizeInfo.nMaxMacAddress = TUNE_NETAPI_MAX_NUM_MAC;
+    nwalSizeInfo.nMaxIpAddress = TUNE_NETAPI_MAX_NUM_IP;
+    nwalSizeInfo.nMaxL4Ports = TUNE_NETAPI_MAX_NUM_PORTS;
+    nwalSizeInfo.nMaxIpSecChannels = TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS;//we allocate 2 per channel
+    nwalSizeInfo.nMaxDmSecChannels = TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS;//we allocate 2 per channel
+    nwalSizeInfo.nMaxL2L3Hdr = TUNE_NETAPI_MAX_NUM_L2_L3_HDRS;
+    nwalSizeInfo.nProc = TUNE_NETAPI_NUM_CORES;
+    nwalRetVal = nwal_getBufferReq(&nwalSizeInfo,
+                                   sizes,
+                                   aligns);
+    if(nwalRetVal != nwal_OK)
+    {
+        return nwal_FALSE;
+    }
+
+/* Check for memory size requirement and update the base */
+    count = 0;
+    //bases[nwal_BUF_INDEX_INST] = (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)nwalInstMem);
+    bases[nwal_BUF_INDEX_INST] = 
+                (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)nwalEntry->nwalInstMem);
+
+    if(NETAPI_NWAL_CONFIG_BUFSIZE_NWAL_HANDLE < sizes[nwal_BUF_INDEX_INST])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+    }
+    count++;
+
+    //bases[nwal_BUF_INDEX_INT_HANDLES] = (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)nwalHandleMem);
+    bases[nwal_BUF_INDEX_INT_HANDLES] = 
+                    (uint32_t *) Osal_nwalLocToGlobAddr((uint32_t)nwalEntry->nwalHandleMem);
+
+    
+    if(NWAL_CHAN_HANDLE_SIZE  < sizes[nwal_BUF_INDEX_INT_HANDLES])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+     bases[nwal_BUF_INDEX_PA_LLD_BUF0] =
+        (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)paEntry->paBuf0);
+    if((NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF0) < sizes[nwal_BUF_INDEX_PA_LLD_BUF0])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+
+    bases[nwal_BUF_INDEX_PA_LLD_BUF1] =
+        (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)paEntry->paBuf1);
+    if((NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF1) < sizes[nwal_BUF_INDEX_PA_LLD_BUF1])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+
+    bases[nwal_BUF_INDEX_PA_LLD_BUF2] =
+        (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)paEntry->paBuf2);
+    if((NETAPI_NWAL_CONFIG_BUFSIZE_PA_BUF2) < sizes[nwal_BUF_INDEX_PA_LLD_BUF2])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+#ifdef NETAPI_ENABLE_SECURITY
+    bases[nwal_BUF_INDEX_SA_LLD_HANDLE] =
+        (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)saEntry->salldHandle);
+    if((NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE) < sizes[nwal_BUF_INDEX_SA_LLD_HANDLE])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+
+    bases[nwal_BUF_INDEX_SA_CONTEXT] = (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)netapi_VM_SaContextVaddr);
+    /* also save this here for easy access to sa_start */
+    nwalBaseAddrCfg.pScPoolBaseAddr= bases[nwal_BUF_INDEX_SA_CONTEXT];
+    count++;
+
+    bases[nwal_BUF_INDEX_SA_LLD_CHAN_HANDLE] =
+        (uint32_t *)Osal_nwalLocToGlobAddr((uint32_t)saEntry->salldChanHandle);
+    if((NETAPI_NWAL_CONFIG_BUFSIZE_SA_LLD_HANDLE_PER_CHAN * TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS*2) <
+        sizes[nwal_BUF_INDEX_SA_LLD_CHAN_HANDLE])
+    {
+        /* Resize Memory */
+        return nwal_FALSE;
+        //while(1);
+
+    }
+    count++;
+#else
+    bases[nwal_BUF_INDEX_SA_LLD_HANDLE] = 0;
+    bases[nwal_BUF_INDEX_SA_CONTEXT] = 0;
+    bases[nwal_BUF_INDEX_SA_LLD_CHAN_HANDLE] = 0;
+    count = count+3;
+#endif
+
+    /* Initialize NWAL module */
+    nwal_getLocContextBufferReq(nwalSizeInfo.nProc, &localCtxSize);
+
+    pNwalLocCtxMem = malloc(localCtxSize);
+    nwal_createProc(bases[nwal_BUF_INDEX_INST],
+                          pNwalLocCtxMem,
+                          &nwalBaseAddrCfg);
+
+    nwalGlobCfg.pBaseAddrCfg = &nwalBaseAddrCfg;
+    nwalRetVal = nwal_create(&nwalGlobCfg,
+                             &nwalSizeInfo,
+                             sizes,
+                             bases,
+                             &gPNwalInstHandle);
+    if(nwalRetVal != nwal_OK)
+    {
+        return nwal_FALSE;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI function to start  NWAL 
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAPI function to start NWAL, per thread/core
+ ********************************************************************/
+int netapip_startNwal(Pktlib_HeapHandle pkt_heap,
+                      Pktlib_HeapHandle cmd_rx_heap,
+                      Pktlib_HeapHandle cmd_tx_heap,
+                      NETAPI_NWAL_LOCAL_CONTEXT_T *p,
+                      NETAPI_CFG_T *p_cfg,
+                      NETAPI_NWAL_GLOBAL_CONTEXT_T * p_nwal_glob_context,
+                      int master)
+{
+    nwalLocCfg_t    nwalLocCfg;
+    nwalBaseAddrCfg_t nwalBaseAddrCfg;
+    int count=0;
+    static int first_time = 0;
+    nwal_RetValue       nwalRetVal;
+    void* pBase = NULL;
+    NETAPI_NWAL_SHM_T* nwalEntry = NULL;
+    void* pNwalLocCtxMem = NULL;
+
+    NETAPI_SA_SHM_T* saEntry = NULL;
+    NETAPI_PA_SHM_T* paEntry = NULL;
+
+    uint32_t            baseAddr;
+    void*               instPoolSaBaseAddr;
+    void*               pScPoolBaseAddr;
+    void*               pInstPoolPaBaseAddr;
+    void*               paVirtBaseAddr;
+    uint32_t          localCtxSize;
+
+    memset(&nwalLocCfg,0,sizeof(nwalLocCfg));
+    memset(&nwalBaseAddrCfg, 0, sizeof(nwalBaseAddrCfg_t));
+
+    /* Update the Start of Packet Offset for the default flows created 
+     * by NWAL
+     */
+    nwalLocCfg.rxSopPktOffset = p_cfg->def_flow_pkt_rx_offset;
+    nwalLocCfg.rxPktTailRoomSz = p_cfg->def_heap_tailroom_size;
+
+ /* Call back registration for the core */
+    nwalLocCfg.pRxPktCallBack = netapip_pktioNWALRxPktCallback;
+    nwalLocCfg.pCmdCallBack = netapip_netcpCfgNWALCmdCallBack;
+    nwalLocCfg.pPaStatsCallBack = netapip_netcpCfgNWALCmdPaStatsReply;
+
+    nwalLocCfg.pRxDmCallBack=  netapip_pktioNWALSBPktCallback; //sideband mode callback
+
+    /* Initialize Buffer Pool for Control packets from NetCP to Host */
+    nwalLocCfg.rxCtlPool.numBufPools = 1;
+    nwalLocCfg.rxCtlPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalLocCfg.rxCtlPool.bufPool[0].bufSize = TUNE_NETAPI_CONFIG_MAX_CTL_RXTX_BUF_SIZE;
+    nwalLocCfg.rxCtlPool.bufPool[0].heapHandle = cmd_rx_heap;
+
+    /* Initialize Buffer Pool for Control packets from Host to NetCP */
+    nwalLocCfg.txCtlPool.numBufPools = 1;
+    nwalLocCfg.txCtlPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalLocCfg.txCtlPool.bufPool[0].bufSize = TUNE_NETAPI_CONFIG_MAX_CTL_RXTX_BUF_SIZE;
+    nwalLocCfg.txCtlPool.bufPool[0].heapHandle =  cmd_tx_heap;
+
+/* Initialize Buffer Pool for L4 Packets from NetCP to Host */
+    nwalLocCfg.rxPktPool.numBufPools = 1;
+    nwalLocCfg.rxPktPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalLocCfg.rxPktPool.bufPool[0].bufSize =  p_cfg->def_heap_buf_size;
+    nwalLocCfg.rxPktPool.bufPool[0].heapHandle = pkt_heap;
+
+/* Initialize Buffer Pool for Packets from Host to NetCP */
+    nwalLocCfg.txPktPool.numBufPools = 1;
+    nwalLocCfg.txPktPool.bufPool[0].descSize = TUNE_NETAPI_DESC_SIZE;
+    nwalLocCfg.txPktPool.bufPool[0].bufSize =  p_cfg->def_heap_buf_size;
+    nwalLocCfg.txPktPool.bufPool[0].heapHandle = pkt_heap;
+
+
+
+
+    memcpy(&p->nwalLocCfg,&nwalLocCfg,sizeof(nwalLocCfg_t));
+    while(1)
+    {
+        if(master == NETAPI_PROC_MASTER)
+        {
+            pBase = hplib_shmOpen();
+            nwalEntry = (NETAPI_NWAL_SHM_T*)hplib_shmGetEntry(pBase,NWAL_ENTRY);
+
+                baseAddr = (void*) netapi_VM_VirtAddr->passCfgVaddr +
+                                              CSL_NETCP_CFG_SA_CFG_REGS -
+                                              CSL_NETCP_CFG_REGS;
+                 saEntry = (NETAPI_SA_SHM_T*)hplib_shmGetEntry(pBase,SA_ENTRY);
+                 instPoolSaBaseAddr = (void*) saEntry;
+            
+                 pScPoolBaseAddr = Osal_nwalLocToGlobAddr((uint32_t)netapi_VM_SaContextVaddr);
+
+
+                 paVirtBaseAddr = (void*) netapi_VM_VirtAddr->passCfgVaddr;
+                 paEntry = (NETAPI_PA_SHM_T*)hplib_shmGetEntry(pBase,PA_ENTRY);
+                 pInstPoolPaBaseAddr = (void *)paEntry;
+
+            nwal_getLocContextBufferReq(TUNE_NETAPI_NUM_CORES, &localCtxSize);
+            pNwalLocCtxMem = malloc(localCtxSize);
+            if (pNwalLocCtxMem == NULL)
+            {
+                return -1;
+            }
+            nwalBaseAddrCfg.pSaVirtBaseAddr = baseAddr;
+            nwalBaseAddrCfg.pInstPoolSaBaseAddr = instPoolSaBaseAddr;
+            nwalBaseAddrCfg.pScPoolBaseAddr = pScPoolBaseAddr;
+            nwalBaseAddrCfg.paVirtBaseAddr = paVirtBaseAddr;
+            nwalBaseAddrCfg.pInstPoolPaBaseAddr = pInstPoolPaBaseAddr;
+            /* this is 1 time per process */
+            nwal_createProc(nwalEntry,
+                            pNwalLocCtxMem,
+                            &nwalBaseAddrCfg);
+        }
+        /* this is for every thread including 1st thread of the process */
+        netapi_proc_master->spinLock.lock(&pnetapiShm->netapi_util_lock);
+        nwalRetVal = nwal_start(gPNwalInstHandle,&nwalLocCfg);
+        netapi_proc_master->spinLock.unlock(&pnetapiShm->netapi_util_lock);
+        if(nwalRetVal == nwal_ERR_INVALID_STATE)
+        {
+            continue;
+        }
+        break;
+    }
+
+    if(nwalRetVal != nwal_OK)
+    {
+        return -1;
+    }
+    p->state = NETAPI_NW_CXT_LOC_ACTIVE;
+    return 1;
+
+
+}
+/***********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI function to initialize the 64 bit timer.
+ ***********************************************************************
+ * DESCRIPTION:  Internal NETAPI function to initialize the 64 bit timer. for tci6614 ONLY
+ **********************************************************************/
+int netapip_initTimer(void)
+{
+#ifdef CORTEX_A8
+        return t64_start();
+#else
+    return 0;
+#endif
+}
+
+
+
+
+/***************************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function for virtual memory allocation.
+ ***************************************************************************
+ * DESCRIPTION:  NETAPI internal function for virtual memory allocation.
+ **************************************************************************/
+
+static uint8_t* netapip_sharedMemoryMalloc(uint32_t size)
+{
+    return  (uint8_t *)hplib_vmMemAlloc(size + 
+                                    pnetapiShm->netapi_global.cfg.def_heap_extra_size ,
+                                    128,
+                                    0); 
+}
+
+/********************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function for virtual memory free.
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function for virtual memory free.
+ ********************************************************************/
+static void netapip_sharedMemoryFree(uint8_t* ptr, uint32_t size)
+{
+    /* Do Nothing. */
+    return;
+}
+
+//defensive: clean out stuff hanging around
+//
+//  open a bunch of free queues and zap them
+#define NQUEUES2CLEAR 35
+static Qmss_QueueHnd tempQH[NQUEUES2CLEAR];
+void netapip_cleanupAtStart(void)
+{
+    int i;
+    uint8_t         isAllocated;
+
+    for(i=0;i<NQUEUES2CLEAR;i++) 
+    {
+        tempQH[i] = Qmss_queueOpen(Qmss_QueueType_GENERAL_PURPOSE_QUEUE,
+                                                  QMSS_PARAM_NOT_SPECIFIED, &isAllocated);
+        netapip_zapQ(tempQH[i]);
+    }
+
+    for(i=0;i<NQUEUES2CLEAR;i++)
+    {
+        Qmss_queueClose(tempQH[i]);
+    }
+}
+
+
+
+/********************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function system initialization
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function system initialization
+ ********************************************************************/
+int netapip_systemInit(NETAPI_HANDLE_T * handle,
+                       Bool global_master_process)
+{
+
+    int32_t             result;
+    Pktlib_HeapHandle   sharedHeapHandle;
+    Pktlib_HeapHandle   controlRxHeapHandle,controlTxHeapHandle;
+    Pktlib_HeapCfg      heapCfg;
+    int32_t             errCode = 0;
+    int count=0;
+
+#ifdef NETAPI_USE_DDR
+    /* Init attributes for DDR */
+    netapi_VM_MempoolAttr[0].attr = HPLIB_ATTR_KM_CACHED0;
+    netapi_VM_MempoolAttr[0].phys_addr = 0;
+    netapi_VM_MempoolAttr[0].size = 0;
+
+#ifdef NETAPI_USE_DDR_AND_MSMC
+       /* Init attributes for un-cached MSMC */
+    netapi_VM_MempoolAttr[1].attr = HPLIB_ATTR_UN_CACHED;
+    netapi_VM_MempoolAttr[1].phys_addr = CSL_MSMC_SRAM_REGS;
+    netapi_VM_MempoolAttr[1].size = TUNE_NETAPI_PERM_MEM_SZ;
+#endif
+#else
+       /* Init attributes for un-cached MSMC */
+    netapi_VM_MempoolAttr[0].attr = HPLIB_ATTR_UN_CACHED;
+    netapi_VM_MempoolAttr[0].phys_addr = CSL_MSMC_SRAM_REGS;
+    netapi_VM_MempoolAttr[0].size = TUNE_NETAPI_PERM_MEM_SZ;
+#ifdef NETAPI_USE_DDR_AND_MSMC
+    netapi_VM_MempoolAttr[1].attr = HPLIB_ATTR_KM_CACHED0;
+    netapi_VM_MempoolAttr[1].phys_addr = 0;
+    netapi_VM_MempoolAttr[1].size = 0;
+#endif
+#endif
+    /* initialize all the memory we are going to use
+       - chunk for buffers, descriptors
+       - memory mapped peripherals we use, such as QMSS, PA, etc */
+#ifdef NETAPI_USE_DDR_AND_MSMC
+    result = hplib_vmInit(&netapi_VM_VirtAddr[0],
+                          2,
+                          &netapi_VM_MempoolAttr[0]);
+#else
+    result = hplib_vmInit(&netapi_VM_VirtAddr[0],
+                           1,
+                           &netapi_VM_MempoolAttr[0]);
+#endif
+
+    if (result != hplib_OK)
+    {
+        return -1;
+    }
+
+    if (global_master_process == NETAPI_TRUE)
+    {
+        hplib_initMallocArea(0);
+#ifdef  NETAPI_USE_DDR_AND_MSMC
+        hplib_initMallocArea(1);
+#endif
+#ifdef NETAPI_ENABLE_SECURITY
+#define SEC_CONTEXT_SZ 384  //not tunable
+        /* allocate 2x number of tunnels since we need one for inflow and one for data mode */
+        netapi_VM_SaContextVaddr = hplib_vmMemAlloc((TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS*2 *
+                                        SEC_CONTEXT_SZ), 128, 0);
+        if (!netapi_VM_SaContextVaddr)
+        {
+            return (-1);
+        }
+#else
+            netapi_VM_SaContextVaddr= (char *) NULL;
+#endif
+
+        /* (3) Allocate 2 QM regions from continguous chunk above */
+        netapi_VM_QMemGlobalDescRam = 
+                (void *)hplib_vmMemAlloc((TUNE_NETAPI_NUM_GLOBAL_DESC *
+                TUNE_NETAPI_DESC_SIZE),
+                128,
+                0);
+
+        netapi_VM_QMemLocalDescRam =
+                (void *)hplib_vmMemAlloc((TUNE_NETAPI_NUM_LOCAL_DESC *
+                TUNE_NETAPI_DESC_SIZE),
+                128,
+                0);
+        /* Initialize Queue Manager Sub System */
+        result = netapip_initQm (pnetapiShm->netapi_global.cfg.def_max_descriptors,
+                                 pRmClientHandle);
+        
+        if (result != 1)
+        {
+            return -1;
+        }
+        /* Start the QMSS. */
+        if (netapip_startQm(pRmClientHandle) != 1)
+        {
+            return -1;
+        }
+
+        //clean our old junk in 1st bunch of queues that will be allocated to us
+        netapip_cleanupAtStart();
+         /* Initialize the global descriptor memory region. */
+        result= netapip_qmSetupMemRegion( 
+                           pnetapiShm->netapi_global.cfg.def_tot_descriptors_for_us,
+                           TUNE_NETAPI_DESC_SIZE,
+                           (unsigned int *) netapi_VM_QMemGlobalDescRam,
+                           pnetapiShm->netapi_global.cfg.memoryRegion,
+                           pnetapiShm->netapi_global.cfg.start_index);
+        if(result <0)
+        {
+            return -1;
+        }
+        /* Initialize CPPI CPDMA */
+        result = netapip_initCppi(pRmClientHandle);
+        if (result != 1)
+        {
+            return -1;
+        }
+        /* CPPI and Queue Manager are initialized. */
+
+        /* create main pkt heap */
+        /* Initialize the Shared Heaps. */
+        Pktlib_sharedHeapInit();
+        /* Populate the heap interface table. */
+        netapi_pktlib_ifTable.data_malloc             = netapip_sharedMemoryMalloc;
+        netapi_pktlib_ifTable.data_free               = netapip_sharedMemoryFree;
+        /* Initialize the heap configuration. */
+        memset ((void *)&heapCfg, 0, sizeof(Pktlib_HeapCfg));
+        /* Populate the heap configuration */
+        heapCfg.name                = "netapi";
+        heapCfg.memRegion = memInfo.memRegion;
+        heapCfg.sharedHeap          = 1;
+        heapCfg.useStarvationQueue  = 0;
+        heapCfg.dataBufferSize      = pnetapiShm->netapi_global.cfg.def_heap_buf_size;
+        heapCfg.numPkts             = pnetapiShm->netapi_global.cfg.def_heap_n_descriptors;
+        heapCfg.numZeroBufferPackets= pnetapiShm->netapi_global.cfg.def_heap_n_zdescriptors;
+        heapCfg.heapInterfaceTable.data_malloc  = netapi_pktlib_ifTable.data_malloc;
+        heapCfg.heapInterfaceTable.data_free    = netapi_pktlib_ifTable.data_free;
+        heapCfg.dataBufferPktThreshold   = 0;
+        heapCfg.zeroBufferPktThreshold   = 0;
+
+        /* Create Shared Heap with specified configuration. */
+        sharedHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+        if (!sharedHeapHandle) { return -1;}
+        handle->netcp_heap= sharedHeapHandle;
+        /* Update for Control */
+        heapCfg.name                = "netapi_control_rx";
+        heapCfg.sharedHeap          = 1;
+        heapCfg.dataBufferSize      = TUNE_NETAPI_CONFIG_MAX_CTL_RXTX_BUF_SIZE;
+        heapCfg.numPkts             = TUNE_NETAPI_CONFIG_NUM_CTL_RX_BUF;
+        heapCfg.numZeroBufferPackets= 0;
+    
+        controlRxHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+        //todo -> cleanup on failure
+        if (!controlRxHeapHandle) { return -1;}
+        handle->netcp_control_rx_heap= controlRxHeapHandle;
+    
+    
+        heapCfg.name                = "netapi_control_tx";
+        heapCfg.numPkts             = TUNE_NETAPI_CONFIG_NUM_CTL_TX_BUF;
+    
+        controlTxHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+    //todo -> cleanup on failure
+    if (!controlTxHeapHandle) { return -1;}
+    handle->netcp_control_tx_heap= controlTxHeapHandle;
+             /* now NWAL */
+        result = netapip_initNwal(memInfo.memRegion,
+                              &netapi_pktlib_ifTable,
+                              &pnetapiShm->netapi_global.nwal_context,
+                              &pnetapiShm->netapi_global.cfg);
+        if (result<0) { return -1; }
+        /* Common Initialization for all cores */
+        while(count < TUNE_NETAPI_MAX_NUM_TRANS)
+        {
+            netapi_proc_global.nwal_context.transInfos[count].transId = count;
+            count++;
+        }
+        result = netapip_startNwal(sharedHeapHandle, 
+                                   controlRxHeapHandle,
+                                   controlTxHeapHandle,
+                                   &handle->nwal_local,
+                                   &pnetapiShm->netapi_global.cfg,
+                                   &pnetapiShm->netapi_global.nwal_context,
+                                   handle->master);
+        if (result<0) { return -1; }
+    }
+    else
+    {
+        if (hplib_checkMallocArea(0) != hplib_OK)
+            return -1;
+        if (hplib_checkMallocArea(1) != hplib_OK)
+            return -1;
+
+#ifdef NETAPI_ENABLE_SECURITY
+                /* allocate 2x number of tunnels since we need one for inflow and one for data mode */
+                netapi_VM_SaContextVaddr = hplib_vmMemAlloc((TUNE_NETAPI_MAX_NUM_IPSEC_CHANNELS*2 *
+                                                SEC_CONTEXT_SZ), 128, 0);
+                if (!netapi_VM_SaContextVaddr)
+                {
+                    return (-1);
+                }
+#else
+                netapi_VM_SaContextVaddr= (char *) NULL;
+#endif
+
+
+
+        /* (3) Allocate 2 QM regions from continguous chunk above */
+        netapi_VM_QMemGlobalDescRam = 
+                (void *)hplib_vmMemAlloc((TUNE_NETAPI_NUM_GLOBAL_DESC *
+                TUNE_NETAPI_DESC_SIZE),
+                128,
+                0);
+
+        netapi_VM_QMemLocalDescRam =
+                (void *)hplib_vmMemAlloc((TUNE_NETAPI_NUM_LOCAL_DESC *
+                TUNE_NETAPI_DESC_SIZE),
+                128,
+                0);
+
+        /****************************************************
+         * partial initialization.  For process, not for SOC
+         ***************************************************/
+        result = netapip_initQm (pnetapiShm->netapi_global.cfg.def_max_descriptors,
+                                 pRmClientHandle);
+        if (result != 1)
+        {
+            return -1;
+        }
+
+        /* Start the QMSS. */
+        if (netapip_startQm(pRmClientHandle) != 1)
+        {
+            return -1;
+        }
+
+        result= netapip_qmSetupMemRegion( 
+                           pnetapiShm->netapi_global.cfg.def_tot_descriptors_for_us,
+                           TUNE_NETAPI_DESC_SIZE,
+                           (unsigned int *) netapi_VM_QMemGlobalDescRam,
+                           pnetapiShm->netapi_global.cfg.memoryRegion,
+                           pnetapiShm->netapi_global.cfg.start_index);
+        if(result <0)
+        {
+            return -1;
+        }
+        /* Initialize CPPI CPDMA */
+        result = netapip_initCppi(pRmClientHandle);
+        if (result != 1)
+        {
+            return -1;
+        }
+        /* CPPI and Queue Manager are initialized. */
+
+        /* create main pkt heap for this process */
+        /* Initialize the Shared Heaps. */
+        Pktlib_sharedHeapInit();
+        /* Populate the heap interface table. */
+        netapi_pktlib_ifTable.data_malloc             = netapip_sharedMemoryMalloc;
+        netapi_pktlib_ifTable.data_free               = netapip_sharedMemoryFree;
+        /* Initialize the heap configuration. */
+        memset ((void *)&heapCfg, 0, sizeof(Pktlib_HeapCfg));
+        /* Populate the heap configuration */
+        heapCfg.name                = "netapi";
+        //heapCfg.memRegion           = TUNE_NETAPI_QM_GLOBAL_REGION;
+        heapCfg.memRegion = memInfo.memRegion;
+        heapCfg.sharedHeap          = 1;
+        heapCfg.useStarvationQueue  = 0;
+        heapCfg.dataBufferSize      = pnetapiShm->netapi_global.cfg.def_heap_buf_size;
+        heapCfg.numPkts             = pnetapiShm->netapi_global.cfg.def_heap_n_descriptors;
+        heapCfg.numZeroBufferPackets= pnetapiShm->netapi_global.cfg.def_heap_n_zdescriptors;
+        heapCfg.heapInterfaceTable.data_malloc  = netapi_pktlib_ifTable.data_malloc;
+        heapCfg.heapInterfaceTable.data_free    = netapi_pktlib_ifTable.data_free;
+        heapCfg.dataBufferPktThreshold   = 0;
+        heapCfg.zeroBufferPktThreshold   = 0;
+        
+        /* Create Shared Heap with specified configuration. */
+        sharedHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+        //todo -> cleanup on failure
+        if (!sharedHeapHandle) { return -1;}
+        handle->netcp_heap= sharedHeapHandle;
+
+        //open shared heap handle but create new controlRx & Tx heaps for this
+        //process
+        /* Update for Control */
+        heapCfg.name                = "netapi_control_rx";/*todo:add random#*/
+        heapCfg.sharedHeap          = 1;
+        heapCfg.dataBufferSize      = TUNE_NETAPI_CONFIG_MAX_CTL_RXTX_BUF_SIZE;
+        heapCfg.numPkts             = TUNE_NETAPI_CONFIG_NUM_CTL_RX_BUF;
+        heapCfg.numZeroBufferPackets= 0;
+        controlRxHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+        if (!controlRxHeapHandle) { return -1;}
+
+        handle->netcp_control_rx_heap= controlRxHeapHandle;
+        heapCfg.name                = "netapi_control_tx";
+        heapCfg.numPkts             = TUNE_NETAPI_CONFIG_NUM_CTL_TX_BUF;
+        controlTxHeapHandle = Pktlib_createHeap(&heapCfg, &errCode);
+        if (!controlTxHeapHandle) { return -1;}
+        handle->netcp_control_tx_heap= controlTxHeapHandle;
+
+        /* Common Initialization for all threads in process */
+        while(count < TUNE_NETAPI_MAX_NUM_TRANS)
+        {
+          netapi_proc_global.nwal_context.transInfos[count].transId = count;
+          count++;
+        }
+        result = netapip_startNwal(sharedHeapHandle,
+                               controlRxHeapHandle,
+                               controlTxHeapHandle,
+                               &handle->nwal_local,
+                               &pnetapiShm->netapi_global.cfg,
+                               &pnetapiShm->netapi_global.nwal_context,
+                               handle->master);
+        if (result<0)
+        {
+            return -1;
+        }
+    }
+
+    //get timer running
+#ifdef CORTEX_A8
+        netapip_initTimer();
+#endif
+
+
+
+    return 0;
+}
+
+
+/****************************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function which performs clean for linux user space
+ ****************************************************************************
+ * DESCRIPTION:  NETAPI internal function which performs clean for linux user space
+ ***************************************************************************/
+void netapip_zapQ(int queueNum)
+{
+    int i;
+    if (!queueNum) 
+    {
+        return;
+    }
+    for (i=0;;i+=1 )
+    {
+        /* Pop descriptor from source queue */
+        if (pktio_mQmssQueuePopRaw(queueNum) == NULL)
+        {
+            break;
+        }
+    }
+}
+
+
+/****************************************************************************
+* FUNCTION PURPOSE:  NETAPI internal function to display internal heap stats.
+ ****************************************************************************
+ * DESCRIPTION:  NETAPI internal function to display internal heap stats.
+ ***************************************************************************/
+void netapi_dump_internal_heap_stats(void)
+{
+    Pktlib_HeapStats    pktLibHeapStats;
+    Pktlib_getHeapStats(netapi_get_global()->nwal_context.pa2sa_heap,&pktLibHeapStats);
+    printf("PA2SA(ingress) stats>  #free=%d #zb=%d #garbage=%d\n", pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets, pktLibHeapStats.numPacketsinGarbage);
+    printf("               >  #dataBufThreshStatus=%d #dataBufStarvCounter=%d #zBufThreshStatus=%d #zBufStarvCounter=%d \n",
+                        pktLibHeapStats.dataBufferThresholdStatus,pktLibHeapStats.dataBufferStarvationCounter,
+                        pktLibHeapStats.zeroDataBufferThresholdStatus, pktLibHeapStats.zeroDataBufferStarvationCounter);
+    Pktlib_getHeapStats(netapi_get_global()->nwal_context.sa2pa_heap,&pktLibHeapStats);
+    printf("SA2PA stats>  #free=%d #zb=%d #garbage=%d\n", pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets, pktLibHeapStats.numPacketsinGarbage);
+    printf("               >  #dataBufThreshStatus=%d #dataBufStarvCounter=%d #zBufThreshStatus=%d #zBufStarvCounter=%d \n",
+                        pktLibHeapStats.dataBufferThresholdStatus,pktLibHeapStats.dataBufferStarvationCounter,
+                        pktLibHeapStats.zeroDataBufferThresholdStatus, pktLibHeapStats.zeroDataBufferStarvationCounter);
+
+}
+
diff --git a/ti/runtime/netapi/src/netapi_loc.h b/ti/runtime/netapi/src/netapi_loc.h
new file mode 100755
index 0000000..3b047cf
--- /dev/null
+++ b/ti/runtime/netapi/src/netapi_loc.h
@@ -0,0 +1,454 @@
+/*****************************************
+ * file: netapi_loc.h
+ * purpose:  internal netapi stuff
+ ****************************************/
+
+#ifndef __NETAPI_LOC__H
+#define __NETAPI_LOC__H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "ti/drv/nwal/nwal_util.h"
+#include "ti/drv/nwal/nwal.h"
+#include "ti/runtime/hplib/hplib.h"
+#include "ti/runtime/netapi/pktio.h"
+#include "ti/runtime/netapi/netcp_cfg.h"
+#include "ti/runtime/netapi/netapi_tune.h"
+
+
+extern hplib_virtualAddrInfo_T netapi_VM_VirtAddr[HPLIB_MAX_MEM_POOLS];
+extern unsigned char *netapi_VM_SaContextVaddr;
+//extern NETAPI_SHM_T* pnetapiShm;
+
+#define     NETAPI_FALSE 0
+#define     NETAPI_TRUE 1
+/***********************************************
+ *  GLOBAL AREA
+ *   short term:  this is global to process
+ *         (multi-process not supported)
+ *   long term:  this structure gets put in shared memory 
+ ***********************************************/
+
+/* list of global pktio channels that have been created
+   (NETCP_TX, RX are intrinsic so won't be here) */
+typedef struct PKTIO_ENTRY_tag
+{
+   char name[PKTIO_MAX_NAME+1];
+   Qmss_Queue qn;         // -1 => slot is free
+} PKTIO_ENTRY_T;
+
+/* to hold an IP on an interface */
+typedef struct NETCP_INTERFACE_IP_Tag
+{
+        int in_use;
+        void * nwal_handle;
+        nwal_IpType  ip_type;
+        nwalIpAddr_t  ip_addr;
+        nwalIpOpt_t ip_qualifiers;
+        void * user_data;
+} NETCP_INTERFACE_IP_T;
+
+/* to hold a classifier */
+typedef struct NETCP_INTERFACE_CLASSIFIER_Tag
+{
+    int  in_use;
+    int  class_type;   //see netcp_cfg.h
+    void * nwal_L2_handle;
+    void * nwal_L3_handle;
+    void * nwal_L4_handle;
+    void * user_data;
+} NETCP_INTERFACE_CLASSIFIER_T;
+
+/* to hold an ipsec rx policy */
+typedef struct NETCP_IPSEC_POLICY_Tag
+{
+    int in_use;
+    int tunnel; //associated tunnel
+    void * nwal_handle;  //handle associated with this RX Policy
+    void * user_data; // user data associtaed with this RX Policy
+} NETCP_IPSEC_POLICY_T;
+
+/* to hold a tunnel */
+typedef struct NETCP_IPSEC_SA_Tag
+{
+    int in_use;
+    int inbound;  //true if inbound
+       
+    int  sa_mode;  //mode we are going to use 
+#define NETCP_IPSEC_SA_MODE_INFLOW 0
+#define NETCP_IPSEC_SA_MODE_SIDEBAND 1
+ 
+    void * sa_handle_inflow;   //for inflow mode
+    void * sa_handle_sideband; //for sideband mode
+    int iface;     //associated interface
+    nwalTxDmPSCmdInfo_t     dmPSCmdInfo;
+    uint32_t    swInfo0;
+    uint32_t    swInfo1;
+    void*   user_data;
+} NETCP_IPSEC_SA_T;
+
+/* to hold a netcp 'interface' */
+typedef struct NETCP_INTERFACE_Tag
+{
+   int in_use;  /* 1 for valid */
+   int state;  /* 0=down, 1=up,  future.. */
+   void * nwal_handle;  //handle associated with this interface
+   unsigned char mac[6];  // mac address
+   unsigned int vlan;   //future
+} NETCP_INTERFACE_T;
+
+/*to keep track of netcp config transactions */
+typedef struct {
+    nwal_Bool_t             inUse;
+    uint16_t                transType;
+#define NETAPI_NWAL_HANDLE_TRANS_NONE             0
+#define NETAPI_NWAL_HANDLE_TRANS_MAC              1
+#define NETAPI_NWAL_HANDLE_TRANS_IP               2
+#define NETAPI_NWAL_HANDLE_TRANS_PORT             3
+#define NETAPI_NWAL_HANDLE_TRANS_SA               4
+#define NETAPI_NWAL_HANDLE_TRANS_SA_POLICY        5
+#define NETAPI_NWAL_HANDLE_STAT_REQUEST           6
+
+    uint16_t                state;
+#define NETAPI_NWAL_HANDLE_STATE_IDLE             0
+#define NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING     1
+#define NETAPI_NWAL_HANDLE_STATE_OPEN             2
+#define NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING    3
+#define NETAPI_NWAL_HANDLE_STATE_ERR                        4
+    nwal_Handle             handle;
+    uint64_t                transId;
+    NETAPI_T                netapi_handle; //the thread making the transaction
+}  NetapiNwalTransInfo_t;
+
+/* to hold user defined flows */
+typedef struct NETCP_REGISTERED_FLOWS_Tag
+{
+    int                 in_use;  //1=> in use
+    void*               handle; //cppi handle to resource (internal)
+    NETCP_CFG_FLOW_T    flow;
+} NETCP_REGISTERED_FLOWS_T;
+
+/******************************
+ *    nwal global context : for SOC
+ *  (shared over all process instances)
+ *******************************/
+typedef struct
+{
+    int                             state;
+#define NETAPI_NW_CXT_GLOB_INACTIVE               0x0
+#define NETAPI__CXT_GLOB_ACTIVE                   0x1
+#define NETAPI_NW_CXT_GLOB_RES_ALLOC_COMPLETE     0x3
+
+    nwal_Handle                     nwalInstHandle;  //created instance 
+    //internal heaps used just by netcp (sa<->pa). SW doesn't touch these
+    Pktlib_HeapHandle               sa2pa_heap;
+    Pktlib_HeapHandle               pa2sa_heap;
+    //stats
+    paSysStats_t                    paStats;
+    NETCP_INTERFACE_T               interfaces[TUNE_NETAPI_MAX_NUM_MAC];        //interfaces
+    NETCP_INTERFACE_CLASSIFIER_T    classi[TUNE_NETAPI_MAX_CLASSIFIERS]; //classifiers
+    NETCP_REGISTERED_FLOWS_T        flows[TUNE_NETAPI_MAX_FLOWS]; //flows
+    NETCP_IPSEC_SA_T                tunnel[TUNE_NETAPI_MAX_SA];           //tunnels
+    NETCP_IPSEC_POLICY_T            policy[TUNE_NETAPI_MAX_POLICY];  //policies
+    NETCP_INTERFACE_IP_T            ips[TUNE_NETAPI_MAX_NUM_IP];           //ips
+} NETAPI_NWAL_GLOBAL_CONTEXT_T;
+/************************************/
+/* global instance for this process */
+/************************************/
+typedef struct
+{
+    int                             state; /* see above*/
+    int                             numCmdPass;
+    int                             numCmdFail;
+    int                             numBogusTransIds;
+    NetapiNwalTransInfo_t           transInfos[TUNE_NETAPI_MAX_NUM_TRANS]; 
+} NETAPI_NWAL_GLOBAL_PROC_CONTEXT_T;
+
+/* NWAL Local context (per core/thread)  */
+typedef struct
+{
+#define NETAPI_NW_CXT_LOC_INACTIVE     0x0
+#define NETAPI_NW_CXT_LOC_ACTIVE       0x2
+    int                     state;
+
+    int                     numPendingCfg;
+    NETCP_CFG_STATS_CB      stats_cb;
+
+/* stats */
+    int                     numL2PktsRecvd;
+    int                     numL3PktsRecvd;
+    int                     numL4PktsRecvd;
+    int                     numL4PktsSent;
+    int                     TxErrDrop;
+
+    /* local config */
+    nwalLocCfg_t           nwalLocCfg;
+} NETAPI_NWAL_LOCAL_CONTEXT_T;
+
+/* the global: for SOC, accross all processes */
+typedef struct NETAPI_GLOBAL_tag
+{
+#define NETAPI_MAX_PKTIO (TUNE_NETAPI_MAX_PKTIO) 
+    PKTIO_ENTRY_T                   pktios[NETAPI_MAX_PKTIO];
+    /* configuration */
+    NETAPI_CFG_T                    cfg;
+    /* nwal context */
+    NETAPI_NWAL_GLOBAL_CONTEXT_T    nwal_context;
+    //NETAPI_T                        p_master;  // save p'masters handle 
+} NETAPI_GLOBAL_T;
+
+/* the process global: one per process */
+typedef struct NETAPI_PROC_GLOBAL_tag
+{
+    /* nwal context */
+    NETAPI_NWAL_GLOBAL_PROC_CONTEXT_T    nwal_context;
+
+    //NETAPI_T                        p_master;  // save p'masters handle 
+} NETAPI_PROC_GLOBAL_T;
+/************************************
+ * this is a per thread structure.
+ * It contains stuff local to thread
+ *  and pointer to global stuff
+ *  that is shared over all threads,
+ **************************************/
+typedef struct NETAPI_HANDLE_Tag
+{
+    int                         master; //master type
+
+    void*                       global;  /* pointer to the soc global area */
+    void*                       proc_global;  /* pointer to the proc global area */
+
+    /* heap  handles */
+    Pktlib_HeapHandle           netcp_heap;    /* internal default */
+    Pktlib_HeapHandle           netcp_control_rx_heap; /* for control messages */
+    Pktlib_HeapHandle           netcp_control_tx_heap; /* for control messages */
+    Pktlib_HeapHandle           createdHeaps[TUNE_NETAPI_MAX_HEAPS];  /* created by app and registered */
+
+    /* pktios defined */
+    int                         n_pktios; /* #of pktios that are active for this instance */
+    void*                       pktios[NETAPI_MAX_PKTIO]; /* the list of pktios */
+
+    /* scheduler stuff.  unallocated if NETAPI_INCLUDE_SCHED not set */
+    void*                       p_sched;
+
+    /* nwal local context */
+    NETAPI_NWAL_LOCAL_CONTEXT_T nwal_local;
+
+    /* thread cookie */
+    void*                      cookie;  /*set by calling thread */
+    HPLIB_SPINLOCK_IF_T        spinLock;
+    int                         memRegion;
+} NETAPI_HANDLE_T;
+
+typedef struct NETAPI_SHM_Tag
+{
+    NETAPI_GLOBAL_T     netapi_global;
+    hplib_spinLock_T    netapi_pktio_lock;
+    hplib_spinLock_T    netapi_netcp_cfg_lock;
+    hplib_spinLock_T    netapi_util_lock;
+    hplib_spinLock_T    netapi_netcp_cfg_l3_classi_lock;
+} NETAPI_SHM_T;
+
+//internal initialization routines */
+int netapip_initQm(int max_descriptors, void* rmClientServiceHandle);
+
+int netapip_initCppi(void* rmClientServiceHandle);
+
+int netapip_startQm(void* rmClientServiceHandle);
+int netapip_initNwal(int region2use,
+                     Pktlib_HeapIfTable * p_table,
+                     NETAPI_NWAL_GLOBAL_CONTEXT_T * p_nwal_context,
+                     NETAPI_CFG_T *p_cfg);
+int netapip_startNwal(Pktlib_HeapHandle             pkt_heap,
+                      Pktlib_HeapHandle             cmd_heapRx,
+                      Pktlib_HeapHandle             cmd_heapTx,
+                      NETAPI_NWAL_LOCAL_CONTEXT_T*  p,
+                      NETAPI_CFG_T*                 p_cfg,
+                      NETAPI_NWAL_GLOBAL_CONTEXT_T* p_nwal_glob_context,
+                      int                          master);
+
+int netapip_initTimer(void);
+int netapip_qmSetupMemRegion(unsigned int          numDesc,
+                             unsigned int          descSize,
+                             unsigned int*         pDescMemBase,
+                             int                   memRegion,
+                             int                   start_index);
+
+
+//nwal callbacks
+void netapip_pktioNWALRxPktCallback(uint32_t          appCookie,
+                                    uint16_t          numPkts,
+                                    nwalRxPktInfo_t*  pPktInfo,
+                                    uint64_t          timestamp,
+                                    nwal_Bool_t*      pFreePkt);
+
+void netapip_netcpCfgNWALCmdCallBack (nwal_AppId        appHandle,
+                                      uint16_t          trans_id,
+                                      nwal_RetValue     ret);
+
+void netapip_netcpCfgNWALCmdPaStatsReply (nwal_AppId        appHandle,
+                                          nwal_TransID_t    trans_id,
+                                          paSysStats_t      *stats);
+
+void netapip_pktioNWALSBPktCallback     (uint32_t                   appCookie,
+                                         uint16_t                   numPkts,
+                                         nwalDmRxPayloadInfo_t*     pDmRxPktInfo,
+                                        nwal_Bool_t*                pFreePkt);
+
+
+//***********************************
+//internal utilities
+//*************************************
+
+//return the list of pktios for this instance
+static inline void ** netapi_get_pktio_list(NETAPI_T p)
+{
+NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+return &pp->pktios[0];
+}
+
+//get scheduler block handle
+static inline void * netapi_get_scheduler(NETAPI_T p)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    return pp->p_sched;
+}
+
+/* return pointer to global area */
+NETAPI_GLOBAL_T * netapi_get_global(void);
+NETAPI_PROC_GLOBAL_T * netapi_get_proc_global(void);
+
+//add a pktio name (and queue) to global list
+static inline int  netapip_addGlobalPktio(NETAPI_T p, char *name, Qmss_Queue * qn)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    PKTIO_ENTRY_T *pe;
+    int i;
+    /* find a free slot */
+     pe = &((NETAPI_GLOBAL_T *)(pp->global))->pktios[0];
+
+    for(i=0;i<NETAPI_MAX_PKTIO; i++)
+    {
+        pe = &((NETAPI_GLOBAL_T *)(pp->global))->pktios[i];
+        if (pe->qn.qNum ==  -1)
+        {
+            pe->qn.qNum=qn->qNum;
+            pe->qn.qMgr=qn->qMgr;
+            strncpy(pe->name, name, PKTIO_MAX_NAME);
+            return 1;
+        }
+    }
+    return 0;  //no room
+}
+
+//delete a pktio name (and queue) to global list
+static inline int  netapi_del_global_pktio(NETAPI_T p, char *name)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    PKTIO_ENTRY_T *pe;
+    int i;
+
+    /* find slot */
+
+
+    for(i=0;i<NETAPI_MAX_PKTIO; i++)
+    {
+        pe = &((NETAPI_GLOBAL_T *)(pp->global))->pktios[i];
+        if (pe->qn.qNum == -1)
+            continue;
+        if (!strncmp(name, pe->name, PKTIO_MAX_NAME))
+        {
+            pe->qn.qNum=-1;
+            pe->name[0]='\0';
+            return 1;
+        }
+    }
+     return 0;  //no room
+}
+
+
+/* get list of global pktios that have been created */
+static inline  Qmss_Queue*  netapip_findGlobalPktio(NETAPI_T p, char *name)
+{
+    NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+    PKTIO_ENTRY_T *pe;
+    int i;
+
+    /* find slot */
+    for(i=0;i<NETAPI_MAX_PKTIO; i++)
+    {
+        pe = &((NETAPI_GLOBAL_T *)(pp->global))->pktios[i];
+        if (pe->qn.qNum  == -1) continue;
+        if (!strncmp(name, pe->name, PKTIO_MAX_NAME))
+        {
+            return &pe->qn;
+        }
+    }
+    return NULL;  //not found
+}
+
+/* return the nwal global instance handle */
+static inline nwal_Handle netapip_returnNwalInstanceHandle(NETAPI_T p)
+{
+
+NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
+return ((NETAPI_GLOBAL_T *)(pp->global))->nwal_context.nwalInstHandle;
+}
+
+
+
+//utility to clear out a queue
+void netapip_zapQ(int queueNum);
+void netapip_netcpCfgBuildRoute(NETCP_CFG_ROUTE_T * p_route,
+                                int16_t * p_flow,
+                                Qmss_QueueHnd * p_q,
+                                nwalRouteType_t *p_type);
+
+//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,
+                          int mode,
+                          void * temp1,
+                          void * temp2,
+                          void * handle_inflow,
+                          void * handle_sideband,
+                          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);
+void *netapip_netcpCfgGetIpHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,int iface_no,int ip_slot);
+NetapiNwalTransInfo_t *  netapip_getFreeTransInfo(NETAPI_HANDLE_T *p_handle,
+                                                  NETAPI_PROC_GLOBAL_T *p_global,
+                                                  nwal_TransID_t *pTransId);
+void netapip_freeTransInfo(NetapiNwalTransInfo_t* pTransInfo);
+void *netapip_netcpCfgGetPolicy( NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                          int policy_slot);
+nwalTxDmPSCmdInfo_t* netapip_netcpCfgGetSaSBInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                      NETCP_CFG_SA_T    sa_app_id);
+int netapip_netcpCfgGetSaInflowInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                      NETCP_CFG_SA_T    sa_app_id,
+                                      uint32_t *swInfo0,
+                                      uint32_t *swInfo1);
+
+int netapip_systemInit(NETAPI_HANDLE_T  *handle,
+                       Bool             global_master_process);
+
+
+void netapip_cleanupAtStart(void);
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/ti/runtime/netapi/src/netapi_sched.c b/ti/runtime/netapi/src/netapi_sched.c
new file mode 100755
index 0000000..6c079d5
--- /dev/null
+++ b/ti/runtime/netapi/src/netapi_sched.c
@@ -0,0 +1,221 @@
+/****************************************
+ * File: netapi_sched.c
+ * Purpose:  netapi scheduling module
+ * NOTE: This sample right now.
+ **************************************************************
+ * FILE: netapi_sched.c
+ * 
+ * DESCRIPTION:  netapi sample scheduler source file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ****************************************/
+
+#include "netapi_sched.h"
+
+#define NO_TIMER  //turn off timer related scheduling
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to get scheduling context statistics
+ ********************************************************************
+ * DESCRIPTION:  API to get scheduling context statistics
+ ********************************************************************/
+void netapi_schedGetStats(NETAPI_SCHED_HANDLE_T *s, 
+                          unsigned long long * p_pkts, 
+                          unsigned long long * p_cycles,
+                          unsigned long long * p_cache_cycles)
+{
+   *p_pkts= s->stats.num_pkts;
+   *p_cycles= s->stats.busy_cycles;
+   *p_cache_cycles= s->stats.cache_cycles;
+   return;
+}
+/****************************************/
+/************API************************/
+/**************************************/
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to open a scheduling context
+ ********************************************************************
+ * DESCRIPTION:  API to open a scheduling context
+ ********************************************************************/
+NETAPI_SCHED_HANDLE_T * netapi_schedOpen(NETAPI_T n, 
+                                         NETAPI_SCHED_CONFIG_T * p_config,
+                                         int *p_err)
+{
+    *p_err=0;
+     NETAPI_SCHED_HANDLE_T * ph = (NETAPI_SCHED_HANDLE_T *) netapi_get_scheduler(n);
+    if(!ph)
+    {
+        *p_err= NETAPI_ERR_NOMEM;
+        return NULL;
+    }
+    if(!p_config)
+    {
+        *p_err=  NETAPI_ERR_BAD_INPUT; 
+        return NULL;
+    }
+    memcpy(&ph->config,p_config,sizeof(NETAPI_SCHED_CONFIG_T));
+    ph->start =   hplib_mUtilGetTimestamp();
+    ph->back = (void *) n;
+    if (ph->config.valid_flags & NETAPI_SCHED_DURATION)
+    {
+        if (ph->config.duration == NETAPI_SCHED_FOREVER) 
+        {
+            ph->shutdown_time=(uint64_t) -1; 
+        }
+        else
+        {
+            ph->shutdown_time = ph->start + ph->config.duration;
+        }
+    }
+    else
+    {
+        ph->shutdown_time = (uint64_t) -1;
+    }
+    ph->state =NETAPI_SCHED_STATE_OPEN; 
+    return(ph);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to re-configure a scheduling context, FUTURE, 
+ *                                  not implemented
+ ********************************************************************
+ * DESCRIPTION:  API to re-configure a scheduling context, FUTURE, 
+ *                                  not implemented
+ ********************************************************************/
+
+int netapi_schedControl(NETAPI_SCHED_HANDLE_T *s,
+                        NETAPI_SCHED_CONFIG_T *p_config,
+                        int *p_err)
+{
+    /* NOT_IMPLEMENTED */
+    return 0;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API for main entry point to scheduler
+ ********************************************************************
+ * DESCRIPTION:  API to get NETAPI scheduling context statistics
+ ********************************************************************/
+/* main entry point.  caller gives up control to scheduler */
+int netapi_schedRun(NETAPI_SCHED_HANDLE_T *s,
+                    int *p_err)
+{
+    int err;
+    *p_err=0;
+    unsigned long long t =  hplib_mUtilGetTimestamp();
+    int next_house;
+    volatile int pkts;
+    volatile unsigned long t1;
+    volatile unsigned long t2;
+    volatile unsigned long long cache_op_b2;
+    volatile unsigned long long n_c_ops;
+
+    next_house =  s->config.interval;
+    /* loop for duration or until shutdown */
+    for(;t< s->shutdown_time;)
+    {
+#ifndef NO_TIMER
+        t = hplib_mUtilGetTimestamp();
+#endif
+        next_house -=1;
+
+         cache_op_b2= Osal_cache_op_measure(&n_c_ops);
+         t1=hplib_mUtilGetPmuCCNT();
+         /* poll all  pktio channels we have open in RX mode */
+         pkts=netapi_pktioPollAll((NETAPI_T) s->back, NULL, &err);
+         if (!pkts  && (s->config.yield == NETAPI_TRUE))
+         {
+            sched_yield();
+         }
+         t2=hplib_mUtilGetPmuCCNT();
+         if (pkts)
+         {
+            s->stats.num_pkts+= (unsigned long long) pkts;
+            s->stats.busy_cycles += (unsigned long long) (t2-t1);
+            cache_op_b2=  Osal_cache_op_measure(&n_c_ops)- cache_op_b2;
+            s->stats.cache_cycles += (unsigned long long) cache_op_b2;
+         }
+
+        /* poll pktlib garbage collections for registered heaps */
+        if (NETAPI_TRUE == s->config.pollGarbageQ)
+        {
+            netapi_pollHeapGarbage((NETAPI_T) s->back);
+        }
+
+
+        /*poll NETCP/PA control channels */
+        if (NETAPI_TRUE == s->config.pollCtrlQ)
+        {
+            netapi_netcpPoll((NETAPI_T) s->back);
+        }
+
+        /* see if time to do a house keeping callback */
+        if ((s->config.valid_flags & NETAPI_SCHED_CBV) && s->config.house_cb)
+        if (next_house<=0)
+        {
+            s->config.house_cb(s);
+            next_house = s->config.interval;
+        }
+        /* see if we were closed and/or its time to close */
+        if (s->state!= NETAPI_SCHED_STATE_OPEN) 
+        {
+            s->state=NETAPI_SCHED_STATE_CLOSE;
+            break;
+        }
+
+    }
+    return 1;
+}
+/********************************************************************
+ * FUNCTION PURPOSE:  API to close a scheduling context
+ ********************************************************************
+ * DESCRIPTION:  API to close a scheduling context
+ ********************************************************************/
+/* shutdown scheduler context */
+int netapi_schedClose(NETAPI_SCHED_HANDLE_T * s, 
+                      NETAPI_SCHED_SHUTDOWN_T * p_close,
+                      int * p_err)
+{
+    *p_err=0;
+    if (p_close->shutdown_type == NETAPI_SCHED_SHUTDOWN_NOW)
+    {
+        s->state=NETAPI_SCHED_STATE_CLOSE_IN_PROGRESS;
+    }
+  return 1;
+}
+
+
diff --git a/ti/runtime/netapi/src/netapi_sec.c b/ti/runtime/netapi/src/netapi_sec.c
new file mode 100644
index 0000000..cd936be
--- /dev/null
+++ b/ti/runtime/netapi/src/netapi_sec.c
@@ -0,0 +1,900 @@
+/**************************************************************
+ * FILE PURPOSE :  NETAPI SECURITY CONFIGURATION-
+ *         user space access to security transport resources on SOC
+ **************************************************************
+ * @file netapi_sec.c
+ * 
+ * @brief DESCRIPTION:  netapi security cfg file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
+#include "netapi.h"
+
+NETAPI_SA_INFO_LOCAL_T netapi_sa_db[TUNE_NETAPI_MAX_SA];
+/********************************************************************
+ * FUNCTION PURPOSE:  API to add an IPSEC SA
+ ********************************************************************
+ * DESCRIPTION:  API to add an IPSEC SA
+ ********************************************************************/
+NETCP_CFG_SA_T netapi_secAddSAInternal(NETAPI_T h,
+                                       int iface_no,
+                                       NETAPI_SEC_SA_INFO_T *sa_info,
+                                       nwalSecKeyParams_t * key_params,
+                                       int inflow_mode,
+                                       NETCP_CFG_ROUTE_HANDLE_T  route,
+                                       void **p_data_mode_handle,
+                                       void **p_inflow_mode_handle,
+                                       void * p_user_data,
+                                       NETCP_CFG_IP_T ip_rule,
+                                       int * perr)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    unsigned int appId = NETAPI_NETCP_MATCH_IPSEC | iface_no;
+    int tunnelId;
+    nwalSaIpSecId_t  saInfo;
+    int have_to_wait=1;
+    nwalTxDmPSCmdInfo_t     dmPSCmdInfo;
+    nwalSaIpSecId_t nwalSaIpSecId;
+    uint32_t    swInfo0 = 0;
+    uint32_t    swInfo1 = 0;
+    int sa_db_slot;
+    int free_sa_db_slot = 0;
+    int ip_slot = 0;
+    void * handle;
+    nwalCreateSAParams_t    createParam =
+    {
+        /* mac handle */
+        NULL,  //to be filled in
+        4,
+        /*nwalSaIpSecParam_t */
+            {
+                0,/* validParams */
+                nwal_SA_MODE_TUNNEL,  //update from input
+                64,/* replayWindow */\
+                NWAL_SA_DIR_INBOUND,
+                0,
+                0,
+                NWAL_SA_AALG_HMAC_SHA1,/* update from input */
+                NWAL_SA_EALG_AES_CTR,  /* update from input */
+                { 0x00},      /* remMacAddr:  NA */
+                12,             /* update from input, mac size */
+                NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,/* Continue parsing to next route for match */
+                NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,/* For next route fail action by default is route to host */
+                CPPI_PARAM_NOT_SPECIFIED,         /* Use default flow configured to NWAL  if packet is routed to host */
+                QMSS_PARAM_NOT_SPECIFIED,         /* Use default queue configured to NWAL if packet is routed to host */
+                0                                 /* route type */
+           },
+           /* nwalSaIpSecKeyParams_t */
+           {0}
+    };
+
+    /* Get IP slot for IP rule. */
+    if (ip_rule)
+    {
+        ip_slot = netapi_cfgGetMatchId(ip_rule);
+        handle = netapip_netcpCfgGetIpHandle(&netapi_get_global()->nwal_context,iface_no,ip_slot);
+    }
+    else
+    {
+        handle = netapip_netcpCfgGetMacHandle(&netapi_get_global()->nwal_context,iface_no);
+    }
+
+    *perr =NETAPI_ERR_OK;
+    if ((!n) || (!sa_info)  ||  (!p_data_mode_handle))
+    {
+        *perr = NETAPI_ERR_BAD_INPUT;
+        return -1;
+    }
+
+    /* prior to building table, will need to store SA entry in local database,
+     * and make sure this SA has not been already offloaded, if already off-loaded,
+     * just return app_id associated with the SA */
+
+    for(sa_db_slot=0; sa_db_slot < TUNE_NETAPI_MAX_SA; sa_db_slot++)
+    {
+        if (netapi_sa_db[sa_db_slot].inUse)
+        {
+            if (sa_info->ipType == nwal_IPV4)
+            {
+                if (netapi_sa_db[sa_db_slot].spi != sa_info->spi)
+                    continue;
+                if(memcmp(&netapi_sa_db[sa_db_slot].dst.ipv4,
+                          &sa_info->dst.ipv4, sizeof(sa_info->dst.ipv4)))
+                    continue;
+
+                netapi_sa_db[sa_db_slot].ref_count++;
+                return netapi_sa_db[sa_db_slot].app_id;
+            }
+            else if (sa_info->ipType == nwal_IPV6)
+            {
+                if (netapi_sa_db[sa_db_slot].spi != sa_info->spi)
+                    continue;
+                if(memcmp(&netapi_sa_db[sa_db_slot].dst.ipv6,
+                          &sa_info->dst.ipv6, sizeof(sa_info->dst.ipv6)))
+                    continue;
+
+                netapi_sa_db[sa_db_slot].ref_count++;
+                return netapi_sa_db[sa_db_slot].app_id;
+            }
+            else
+            {
+                *perr = NETAPI_ERR_BAD_INPUT;
+                return -1;
+            }
+        }
+        else
+        {
+            /* found free slot */
+            free_sa_db_slot = sa_db_slot;
+        }
+    }
+    saInfo.spi = sa_info->spi;
+
+    memcpy(&saInfo.dst, &sa_info->dst, sizeof( nwalIpAddr_t));
+    
+    /* reserve a slot */
+    tunnelId = netapip_netcpCfgFindSaSlot(n,
+                                          &netapi_get_global()->nwal_context,
+                                          iface_no);
+
+    if (tunnelId <0)
+    {
+        *perr= NETAPI_ERR_NOMEM;
+        return -1;
+    }
+    appId |=  (tunnelId << NETAPI_NETCP_MATCH_ID_SHIFT);
+
+    *p_data_mode_handle= NULL;  
+    *p_inflow_mode_handle= NULL;
+
+
+
+    if (inflow_mode & NETAPI_SEC_SA_INFLOW)
+    {
+        pTransInfo = netapip_getFreeTransInfo(n,
+                                              (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                               &trans_id);
+        if (!pTransInfo)
+        {
+            *perr =  NETAPI_ERR_BUSY;
+            netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
+            return -1;
+        }
+        pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA;
+        pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING;
+        pTransInfo->inUse = nwal_TRUE;
+        pTransInfo->netapi_handle = h;
+
+        /* build SA parameters */
+        saInfo.spi = sa_info->spi;
+        memcpy(&saInfo.dst, &sa_info->dst, sizeof( nwalIpAddr_t));
+        memcpy(&saInfo.src, &sa_info->src, sizeof( nwalIpAddr_t));
+        saInfo.proto = sa_info->proto;
+        createParam.h.handle = handle;
+        createParam.ipType = sa_info->ipType;
+        createParam.saIpSecParam.dir = sa_info->dir;
+        createParam.saIpSecParam.saMode = sa_info->saMode;
+        createParam.saIpSecParam.replayWindow = sa_info->replayWindow;
+        createParam.saIpSecParam.authMode = sa_info->authMode;
+        createParam.saIpSecParam.cipherMode = sa_info->cipherMode;
+        createParam.saIpSecParam.esnLo = sa_info->esnLo;
+        createParam.saIpSecParam.esnHi = sa_info->esnHi;
+        if ((sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) ||
+            (sa_info->cipherMode == NWAL_SA_EALG_AES_CCM) ||
+            (sa_info->authMode == NWAL_SA_AALG_GMAC)      ||
+            (sa_info->authMode == NWAL_SA_AALG_HMAC_SHA2_256)      ||
+            (sa_info->authMode == NWAL_SA_AALG_HMAC_SHA2_256_RFC4868))
+        {
+            createParam.saIpSecParam.macSize = 16;
+        }
+        if  ((sa_info->authMode == NWAL_SA_AALG_NULL) && 
+            (!((sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) || 
+               (sa_info->cipherMode == NWAL_SA_EALG_AES_CCM))))
+        {
+            createParam.saIpSecParam.replayWindow = 0;
+            createParam.saIpSecParam.macSize = 0;
+        }
+        memcpy(&createParam.keyParam,key_params,sizeof(nwalSecKeyParams_t));
+
+        if (route != NULL)
+        {
+            if((route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+                NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+            {
+               createParam.saIpSecParam.validParams |= 
+                        NWAL_SA_INFO_VALID_PARAM_ROUTE_TYPE;
+            }
+            netapip_netcpCfgBuildRoute(route,
+                                       &createParam.saIpSecParam.appRxPktFlowId,
+                                       &createParam.saIpSecParam.appRxPktQueue,
+                                       &createParam.saIpSecParam.routeType);
+        }
+
+        /* fire off config message */
+        retValue = nwal_setSecAssoc (((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                        trans_id,
+                                        (nwal_AppId) appId,
+                                        &saInfo,
+                                        &createParam,
+                                        &pTransInfo->handle);
+        if(retValue == nwal_TRANS_COMPLETE)
+        {
+            have_to_wait=0;
+        }
+        else if(retValue !=  nwal_OK)
+        {
+            *perr = NETAPI_ERR_NWAL_ERR0;
+            netapip_freeTransInfo(pTransInfo);
+            netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
+            return -1;
+        }
+
+        if((trans_id != NWAL_TRANSID_SPIN_WAIT)&&(have_to_wait))
+        {
+            n->nwal_local.numPendingCfg++;
+            while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                    (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
+            {
+                nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+            }
+            if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+            {
+                pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_IDLE;
+                pTransInfo->inUse = nwal_FALSE;
+                *perr = NETAPI_ERR_PA_FW;
+                netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
+                return -1;
+            }
+        }
+
+        *p_inflow_mode_handle=pTransInfo->handle;
+        netapip_freeTransInfo(pTransInfo);
+
+        if (sa_info->dir == NWAL_SA_DIR_OUTBOUND)
+        {
+            memset(&nwalSaIpSecId, 0, sizeof(nwalSaIpSecId_t));
+            nwalSaIpSecId.spi = sa_info->spi;
+            memcpy(&(nwalSaIpSecId.src), &sa_info->src,sizeof( nwalIpAddr_t));
+            memcpy(&(nwalSaIpSecId.dst), &sa_info->dst,sizeof( nwalIpAddr_t));
+            nwalSaIpSecId.proto = sa_info->proto;
+            if (nwal_getSecAssoc(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                     &nwalSaIpSecId, 
+                                     NWAL_SA_DIR_OUTBOUND,
+                                     p_inflow_mode_handle,
+                                     &swInfo0,
+                                     &swInfo1) != nwal_TRUE)
+                netapi_Log("netapisecAddSA: call to nwal_getSecAssoc() returned error\n");
+        }
+    }
+
+    /* sideband mode */
+    if (inflow_mode &NETAPI_SEC_SA_SIDEBAND)
+    {
+        nwalCreateDmSAParams_t  dmSaParam;
+        void * dm_handle;
+        memset(&dmSaParam,0,sizeof(nwalCreateDmSAParams_t));
+        dmSaParam.dmSaParam.dmChnType= (sa_info->dir==NWAL_SA_DIR_INBOUND)?  NWAL_DM_CHAN_DECRYPT: NWAL_DM_CHAN_ENCRYPT; /**direction*/ 
+        dmSaParam.dmSaParam.replayWindow=sa_info->replayWindow;
+        dmSaParam.dmSaParam.authMode=sa_info->authMode;
+        dmSaParam.dmSaParam.cipherMode=sa_info->cipherMode;
+        dmSaParam.dmSaParam.macSize=12;
+        dmSaParam.dmSaParam.aadSize=0;
+        dmSaParam.dmSaParam.enc1st =  (sa_info->dir ==NWAL_SA_DIR_OUTBOUND) ? nwal_TRUE : nwal_FALSE;  //encypt 1st for outbound
+        if ((sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) ||
+            (sa_info->cipherMode == NWAL_SA_EALG_AES_CCM) ||
+            (sa_info->authMode == NWAL_SA_AALG_GMAC))
+        {
+            dmSaParam.dmSaParam.macSize = 16;
+            dmSaParam.dmSaParam.aadSize=8;
+            /* Enc1st needs to always be true for combined mode algorithms */
+            dmSaParam.dmSaParam.enc1st = nwal_TRUE;
+        }
+       else
+        {
+            dmSaParam.dmSaParam.macSize=12;
+            dmSaParam.dmSaParam.aadSize=0;
+        }
+
+       if  (sa_info->authMode == NWAL_SA_AALG_NULL)
+       {
+            dmSaParam.dmSaParam.enc1st = nwal_TRUE;
+       }
+        /* todo; allow app q for Sideband return */
+        memcpy(&dmSaParam.keyParam,key_params,sizeof(nwalSecKeyParams_t));
+        retValue = nwal_setDMSecAssoc(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                  (nwal_AppId)appId,
+                                  &dmSaParam,
+                                  &dm_handle);
+        if(retValue != nwal_OK)
+        {
+            *perr = NETAPI_ERR_NWAL_ERR0;
+            netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
+            return -1;
+        }
+
+        *p_data_mode_handle = dm_handle;
+        memset(&dmPSCmdInfo, 0, sizeof(nwalTxDmPSCmdInfo_t));
+        retValue =  nwal_initDMPSCmdInfo(netapip_returnNwalInstanceHandle(h),
+                                         *p_data_mode_handle,
+                                         &dmPSCmdInfo); 
+    }
+
+    netapip_netcpCfgInsertSa(&netapi_get_global()->nwal_context,
+                          tunnelId,
+                          (sa_info->dir ==   NWAL_SA_DIR_INBOUND) ? NETAPI_TRUE: NETAPI_FALSE,
+                          inflow_mode,
+                          &saInfo,
+                          &createParam,
+                          *p_inflow_mode_handle,
+                          *p_data_mode_handle,
+                          &dmPSCmdInfo,
+                          swInfo0,
+                          swInfo1,
+                          p_user_data);
+    netapi_sa_db[free_sa_db_slot].app_id = appId;
+    netapi_sa_db[free_sa_db_slot].inUse = 1;
+    netapi_sa_db[free_sa_db_slot].spi = sa_info->spi;
+    netapi_sa_db[free_sa_db_slot].ref_count++;
+    memcpy(&(netapi_sa_db[free_sa_db_slot].dst), &sa_info->dst,sizeof( nwalIpAddr_t));
+    return  (appId);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to add an IPSEC SA
+ ********************************************************************
+ * DESCRIPTION:  API to add an IPSEC SA
+ ********************************************************************/
+NETCP_CFG_SA_T netapi_secAddSA(NETAPI_T h,
+                                 int iface_no,
+                                 NETAPI_SEC_SA_INFO_T *sa_info,
+                                 nwalSecKeyParams_t * key_params,
+                                 int inflow_mode,
+                                 NETCP_CFG_ROUTE_HANDLE_T  route,
+                                 void **p_data_mode_handle,
+                                 void **p_inflow_mode_handle,
+                                 void * p_user_data,
+                                 int * perr)
+{
+        *perr = 0;
+        return netapi_secAddSAInternal(h,
+                                       iface_no,
+                                       sa_info,
+                                       key_params,
+                                       inflow_mode,
+                                       route,
+                                       p_data_mode_handle,
+                                       p_inflow_mode_handle,
+                                       p_user_data,
+                                       0,
+                                       perr);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API IP handle to add an IPSEC SA
+ ********************************************************************
+ * DESCRIPTION:  API to add an IPSEC SA.
+ *               Piggy back off perr for IP handle flag and IP slot.
+ ********************************************************************/
+NETCP_CFG_SA_T netapi_secAddSAIP(NETAPI_T h,
+                                 int iface_no,
+                                 NETAPI_SEC_SA_INFO_T *sa_info,
+                                 nwalSecKeyParams_t * key_params,
+                                 int inflow_mode,
+                                 NETCP_CFG_ROUTE_HANDLE_T  route,
+                                 void **p_data_mode_handle,
+                                 void **p_inflow_mode_handle,
+                                 void * p_user_data,
+                                 NETCP_CFG_IP_T ip_rule,
+                                 int * perr)
+{
+        *perr = 0;
+        return netapi_secAddSAInternal(h,
+                                       iface_no,
+                                       sa_info,
+                                       key_params,
+                                       inflow_mode,
+                                       route,
+                                       p_data_mode_handle,
+                                       p_inflow_mode_handle,
+                                       p_user_data,
+                                       ip_rule,
+                                       perr);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function  to dynamically switch between inflow
+ *                                  and sideband mode
+ ********************************************************************
+ * DESCRIPTION:  Internal function  to dynamically switch between inflow
+ *                                  and sideband mode
+ ********************************************************************/
+void netapi_secInflowMode(int iface,
+                          NETCP_CFG_SA_T sa,
+                          int on)
+{
+    /* NOT_IMPLEMENTED */
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function  to delete an IPSEC SA
+ ********************************************************************
+ * DESCRIPTION:  Internal function to delete an IPSEC SA
+ ********************************************************************/
+static void netapi_secDelSA_internal(NETAPI_T h,
+                                     int iface_no,
+                                     NETCP_CFG_SA_T sa_app_id,
+                                     int flags,
+                                     int *perr)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    int tunnelId = (sa_app_id >> NETAPI_NETCP_MATCH_ID_SHIFT) &NETAPI_NETCP_MATCH_ID_MASK;
+    void * handle_inflow;
+    void * handle_sideband;
+    int have_to_wait = 1;
+    int sa_db_slot;
+
+    *perr =0;
+    for(sa_db_slot=0; sa_db_slot < TUNE_NETAPI_MAX_SA; sa_db_slot++)
+    {
+            if((netapi_sa_db[sa_db_slot].inUse) &&
+            (netapi_sa_db[sa_db_slot].app_id == sa_app_id))
+            {
+                if(!netapi_sa_db[sa_db_slot].ref_count)
+                {
+                    *perr = NETAPI_ERR_NOTFOUND;
+                    return;
+                }
+                netapi_sa_db[sa_db_slot].ref_count--;
+                if(netapi_sa_db[sa_db_slot].ref_count)
+                {
+                    return;
+                }
+                else
+                {
+                    netapi_sa_db[sa_db_slot].inUse = 0;
+                    break;
+                }
+            }
+    }
+    handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
+                                          tunnelId, &handle_sideband);
+
+
+    if(handle_inflow)
+    {
+    /* get a transaction id */
+        pTransInfo = netapip_getFreeTransInfo(n,
+                                              (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                              &trans_id);
+        if (!pTransInfo)
+        {
+            *perr =  NETAPI_ERR_BUSY;
+            return;
+        }
+        pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA;
+        pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
+        pTransInfo->inUse = nwal_TRUE;
+        pTransInfo->netapi_handle = h;
+
+        retValue = nwal_delSecAssoc(
+                ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                trans_id,
+                handle_inflow);
+        if(retValue == nwal_TRANS_COMPLETE)
+        {
+           have_to_wait=0;
+        }
+        else if(retValue !=  nwal_OK)
+        {
+                *perr = NETAPI_ERR_NWAL_ERR0;
+                netapip_freeTransInfo(pTransInfo);
+                netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context,tunnelId);
+        }
+        if((trans_id != NWAL_TRANSID_SPIN_WAIT)&&(have_to_wait))
+        {
+            n->nwal_local.numPendingCfg++;
+
+            while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                    (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
+            {
+                nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+            }
+            if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+            {
+                netapip_freeTransInfo(pTransInfo);
+                *perr = NETAPI_ERR_PA_FW;
+                 if (!flags) 
+                    netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context, tunnelId);
+                return;
+           }
+        }
+        netapip_freeTransInfo(pTransInfo);
+    }
+    if (handle_sideband)
+    {
+        retValue=nwal_delDMSecAssoc( ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                    handle_sideband);
+        if(retValue !=  nwal_OK)
+        {
+            *perr = NETAPI_ERR_NWAL_ERR0;
+        }
+    }
+
+    /* zap the entry */
+    if (!flags)
+        netapip_netcpCfgDeleteSa(&netapi_get_global()->nwal_context, tunnelId);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to delete an IPSEC SA
+ ********************************************************************
+ * DESCRIPTION:  API to delete an IPSEC SA
+ ********************************************************************/
+void netapi_secDelSA(NETAPI_T h,
+                     int iface_no,
+                     NETCP_CFG_SA_T sa_app_id,
+                     int *perr)
+{
+    netapi_secDelSA_internal( h, iface_no,  sa_app_id, 0x00, perr);
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to add a receive security policy
+ ********************************************************************
+ * DESCRIPTION:  API to add a receive security policy
+ ********************************************************************/
+NETCP_CFG_IPSEC_POLICY_T netapi_secAddRxPolicy(NETAPI_T h, 
+                                               NETCP_CFG_SA_T sa,
+                                               nwal_IpType ipType,
+                                               nwalIpAddr_t * src_ip_addr,
+                                               nwalIpAddr_t * dst_ip_addr,
+                                               nwalIpOpt_t * ip_qualifiers,
+                                               NETCP_CFG_ROUTE_HANDLE_T  route,
+                                               void * user_data,
+                                               int * perr)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    unsigned int appId = NETAPI_NETCP_MATCH_IPSEC_POLICY;
+    int policyId;
+    int tunnelId= netapi_cfgGetMatchId(sa);
+    void * blah;
+    int iface_no = netapi_cfgGetMatchLogicalMacIface(sa);
+
+    nwalSecPolParams_t createParam =
+    {
+        0,  /* handle */
+        0,  /* valid params */
+        NWAL_SA_DIR_INBOUND,
+        4,      /* IP Type */
+        {0},  /* dst */
+        {0},  /* src */
+        {0 },/* IP Options */
+        NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,       /* Continue parsing to next route for match */
+        NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,            /* For next route fail action by default is route to host */
+        CPPI_PARAM_NOT_SPECIFIED,                    /* Use default flow configured to NWAL  if packet is routed to host */
+        QMSS_PARAM_NOT_SPECIFIED,                    /* Use default queue configured to NWAL if packet is routed to host */
+        0                                            /* Optional: route type */
+    };
+
+    void * sa_handle = NULL;
+    *perr =0;
+    
+    if ((!n) )
+    {
+        *perr = NETAPI_ERR_BAD_INPUT;
+        return -1;
+    }
+
+    sa_handle = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,tunnelId,&blah);
+    if (!sa_handle)
+    {
+        *perr = NETAPI_ERR_BAD_INPUT;
+        return -1;
+    }
+
+    /* get a transaction id */
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *perr =  NETAPI_ERR_BUSY;
+        return -1;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA_POLICY;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+    createParam.handle = sa_handle;
+    createParam.ipType = ipType;
+    if (dst_ip_addr) memcpy(&createParam.dst, dst_ip_addr, sizeof(nwalIpAddr_t)); 
+    if (src_ip_addr) memcpy(&createParam.src, src_ip_addr, sizeof(nwalIpAddr_t)); 
+    if (ip_qualifiers) memcpy(&createParam.ipOpt,ip_qualifiers ,sizeof(nwalIpOpt_t));
+    if (route != NULL)
+    {
+        if((route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+            NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+        {
+           createParam.validParams |= 
+                    NWAL_SET_SEC_POLICY_VALID_PARAM_ROUTE_TYPE;
+        }
+        netapip_netcpCfgBuildRoute(route,
+                                   &createParam.appRxPktFlowId,
+                                   &createParam.appRxPktQueue,
+                                   &createParam.routeType);
+    }
+    /* reserve a slot */
+    policyId = netapip_netcpCfgFindPolicySlot(n,
+                                              &netapi_get_global()->nwal_context,
+                                              tunnelId);
+    if (policyId <0) 
+    {
+        *perr= NETAPI_ERR_NOMEM;
+        netapip_freeTransInfo(pTransInfo);
+        return -1;
+    }
+    appId |=  (policyId <<8);
+
+    /* fire off config message */
+    retValue = nwal_setSecPolicy (((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                  trans_id,
+                                  (nwal_AppId) appId,
+                                  &createParam,
+                                  &pTransInfo->handle);
+    if(retValue !=  nwal_OK)
+    {
+        *perr = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        
+        netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context,policyId);
+        return -1;
+    }
+
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
+        {
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *perr = NETAPI_ERR_PA_FW;
+            netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context,policyId);
+            return -1;
+        }
+    }
+
+    /* save stuff */
+    netapip_netcpCfgInsertPolicy(&netapi_get_global()->nwal_context,
+                           policyId,
+                          (void *) pTransInfo->handle,
+                          user_data);
+    netapip_freeTransInfo(pTransInfo);
+    return  (appId);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to delete a receive security policy
+ ********************************************************************
+ * DESCRIPTION:  Internal function to delete a receive security policy
+ ********************************************************************/
+static void netapi_secDelRxPolicy_internal(NETAPI_T h,
+                                           NETCP_CFG_IPSEC_POLICY_T policy_app_id,
+                                           int flags,
+                                           int *perr)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    int policyId = netapi_cfgGetMatchId(policy_app_id);
+    void * handle_policy=NULL;
+
+    handle_policy = netapip_netcpCfgGetPolicy(&netapi_get_global()->nwal_context,policyId);
+                                          ;
+    if (!handle_policy)
+    {
+        *perr = NETAPI_ERR_BAD_INPUT;
+        goto ERR_netapi_secDelRxPolicy_internal;
+     }
+    *perr =0;
+
+    /* get a transaction id */
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                         (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                         &trans_id);
+    if (!pTransInfo)
+    {
+        *perr =  NETAPI_ERR_BUSY;
+        goto ERR_netapi_secDelRxPolicy_internal;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_SA_POLICY;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+
+    /* issue request */
+    retValue = nwal_delSecPolicy(
+                ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                trans_id,
+                handle_policy);
+    if(retValue !=  nwal_OK)
+    {
+        *perr = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        goto ERR_netapi_secDelRxPolicy_internal;
+    }
+
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                    (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
+        {
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *perr = NETAPI_ERR_PA_FW;
+            //zap the entry
+            if (!flags)
+                netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context, policyId);
+            goto ERR_netapi_secDelRxPolicy_internal;
+            
+        }
+    }
+    netapip_freeTransInfo(pTransInfo);
+    /* zap the entry */
+    if (!flags)
+    {
+        netapip_netcpCfgDeletePolicy(&netapi_get_global()->nwal_context, policyId);
+    }
+ERR_netapi_secDelRxPolicy_internal:
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to delete a receive security policy
+ ********************************************************************
+ * DESCRIPTION:  API to delete a receive security policy
+ ********************************************************************/
+void netapi_secDelRxPolicy(NETAPI_T h,
+                           NETCP_CFG_IPSEC_POLICY_T policy_app_id,
+                           int *perr)
+{
+    netapi_secDelRxPolicy_internal(h,  policy_app_id, 0, perr);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to retrieve SA statistics via NWAL
+ ********************************************************************
+ * DESCRIPTION:  API to retrieve SA statistics via NWAL
+ ********************************************************************/
+void  netapi_getSaStats (NETAPI_T               h, 
+                         NETCP_CFG_SA_T         handle,
+                         NETAPI_SA_STATS_T*     pSaStats)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * handle_inflow;
+    void * handle_sideband;
+    int tunnelId = (handle >> NETAPI_NETCP_MATCH_ID_SHIFT) &0xffff;
+    int have_to_wait = 1;
+    handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
+                                          tunnelId, &handle_sideband);
+    if(handle_inflow)
+    {
+        nwal_getSecAssocStats(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, 
+                                                handle_inflow, &(pSaStats->saIpsecStats));
+        pSaStats->validParams |= NETAPI_IPSEC_STAT_VALID;
+    }
+    if(handle_sideband)
+    {
+        nwal_getDataModeStats(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, 
+                                                handle_sideband, &(pSaStats->dataModeStats));
+        pSaStats->validParams |= NETAPI_SIDEBAND_DATA_MODE_STAT_VALID;
+    }
+}
+
+
+/**********************************************************************************
+ * FUNCTION PURPOSE:  API to  API to retrieve local channel context information
+ **********************************************************************************
+ * DESCRIPTION:  API to retrieve API to retrieve local channel context information
+ *********************************************************************************/
+void netapi_secGetChanCtxInfo(NETAPI_T h,
+                           NETCP_CFG_APP_ID_T appId,
+                           nwalChanCxtInfo_t* pInfo)
+{
+
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * handle_inflow;
+    void * handle_sideband = NULL;
+    void * handle_policy=NULL;
+    nwalChanCxtInfo_t info;
+    uint32_t stage = 0;
+    int policyId;
+    int tunnelId;
+
+    if(!pInfo)
+        return;
+    memset(pInfo, 0, sizeof(nwalChanCxtInfo_t));
+
+    stage = netapi_cfgGetMatchStage(appId);
+
+    switch (stage)
+    {
+        case 1:
+            /* this is for SA, need SA and OUTER IP handle */
+            tunnelId = netapi_cfgGetMatchId(appId);
+            handle_inflow = netapip_netcpCfgGetSaHandles(&netapi_get_global()->nwal_context,
+                                          tunnelId, &handle_sideband);
+            if(handle_inflow)
+            {
+                nwal_getChanCxtInfo(&netapi_get_global()->nwal_context,
+                            handle_inflow,
+                            pInfo);
+            }
+            break;
+        case 2:
+            /* this is for policy, need SA inner IP */
+            policyId = netapi_cfgGetMatchId(appId);
+            handle_policy = netapip_netcpCfgGetPolicy(&netapi_get_global()->nwal_context,
+                                                          policyId);
+            if (handle_policy)
+            {
+                nwal_getChanCxtInfo(&netapi_get_global()->nwal_context,
+                            handle_policy,
+                            pInfo);
+            }
+            break;
+        default:
+            break;
+    }
+    return;
+}
diff --git a/ti/runtime/netapi/src/netcp_cfg.c b/ti/runtime/netapi/src/netcp_cfg.c
new file mode 100755
index 0000000..3f04d1a
--- /dev/null
+++ b/ti/runtime/netapi/src/netcp_cfg.c
@@ -0,0 +1,2041 @@
+/**********************************************************
+ * file: netcp_cfg.c
+ * purpose: netcp configurations routines
+ **************************************************************
+ * FILE: netcp_cfg.c
+ * 
+ * DESCRIPTION:  netcp configuration main source file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ******************************************************/
+
+#include "netapi.h"
+
+extern NETAPI_SHM_T* pnetapiShm;
+
+/******************************************************************
+ ********************Netapi internal*************************************
+*******************************************************************/
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get a free transaction id
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to get a free transaction id.
+ ********************************************************************/
+NetapiNwalTransInfo_t * netapip_getFreeTransInfo(NETAPI_HANDLE_T *p_handle,
+                                                 NETAPI_PROC_GLOBAL_T *p_proc_global,
+                                                 nwal_TransID_t *pTransId)
+{
+    uint16_t    count=0;
+
+    count=0;
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    while(count < TUNE_NETAPI_MAX_NUM_TRANS)
+    {
+        if((p_proc_global->nwal_context.transInfos[count].inUse) != nwal_TRUE)
+        {
+            p_proc_global->nwal_context.transInfos[count].inUse = nwal_TRUE;
+            *pTransId = count;
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return(&p_proc_global->nwal_context.transInfos[count]);
+        }
+        count++;
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    /* trouble.  need to wait for one to free up*/
+    /* to do: handle this by forcing a poll of cntrl queue*/
+    return NULL;
+
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to free a transaction id
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to free a transaction id
+ ********************************************************************/
+void netapip_freeTransInfo(NetapiNwalTransInfo_t *pTransInfo)
+{
+    pTransInfo->inUse = nwal_FALSE;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_IDLE;
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_NONE;
+}
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to build a route
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to build a route
+ ********************************************************************/
+void netapip_netcpCfgBuildRoute(NETCP_CFG_ROUTE_T * p_route,
+                                int16_t *p_flow,
+                                Qmss_QueueHnd *p_q,
+                                nwalRouteType_t *p_type)
+{
+    if (!p_route) return;
+    if (p_route->p_flow)  *p_flow= p_route->p_flow->flowid;
+    else *p_flow = CPPI_PARAM_NOT_SPECIFIED;
+
+    if (p_route->p_dest_q) *p_q = netapi_pktioGetQ(p_route->p_dest_q);
+    else *p_q=QMSS_PARAM_NOT_SPECIFIED;
+
+    *p_type = p_route->routeType;
+}
+
+
+/******************************************************/
+/*----------------database management stuff           */
+/******************************************************/
+
+/*=====================POLICIES=============================*/
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a free slot for an SA
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to find a free slot for an SA
+ ********************************************************************/
+int netapip_netcpCfgFindPolicySlot(NETAPI_HANDLE_T *p_handle,
+                                   NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                   int tunnel)
+{
+    int i;
+    if ((tunnel <0 ) || (tunnel >=TUNE_NETAPI_MAX_SA))
+        return -1;
+
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    //find a free entry
+    for(i=0;i<TUNE_NETAPI_MAX_POLICY;i++)
+    {
+        if (!p->policy[i].in_use)
+        {
+            p->policy[i].in_use = 2; //pending
+            p->policy[i].tunnel= tunnel; //save tunnel this is linked to
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return i;
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to delete a policy from policy list
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to delete a policy from policy list
+ ********************************************************************/
+void netapip_netcpCfgDeletePolicy(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                  int policy_slot)
+{
+    if ((policy_slot <0 ) || (policy_slot >= TUNE_NETAPI_MAX_POLICY))
+    {
+        return ;
+    }
+    p->policy[policy_slot].in_use=0;
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to insert a policy to the policy list
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to insert a policy to the policy list
+ ********************************************************************/
+void netapip_netcpCfgInsertPolicy(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                  int policy_slot,
+                                  void * handle,
+                                  void * user_data)
+{
+    p->policy[policy_slot].in_use=1;
+    p->policy[policy_slot].nwal_handle = handle;
+    p->policy[policy_slot].user_data = user_data;
+    return;
+}
+
+/************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function which returns NWAL handle for a policy
+ ************************************************************************
+ * DESCRIPTION:  Netapi internal function which returns NWAL handle for a policy
+ ************************************************************************/
+void *netapip_netcpCfgGetPolicy(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                int policy_slot)
+{
+    if ((policy_slot <0 ) || (policy_slot >= TUNE_NETAPI_MAX_POLICY))
+        return NULL;
+    if (!p->policy[policy_slot].in_use)
+        return NULL;
+    return p->policy[policy_slot].nwal_handle;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a free slot in SA list for a SA
+ ********************************************************************
+ * DESCRIPTION:  Netapi internal function to find a free slot in SA list for an SA
+ ********************************************************************/
+int netapip_netcpCfgFindSaSlot(NETAPI_HANDLE_T *p_handle,
+                               NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                               int iface)
+{                                    
+   int i;
+   if (iface != NETCP_CFG_NO_INTERFACE)
+   {
+   if ((iface <0 ) || (iface >=TUNE_NETAPI_MAX_NUM_MAC)) return -1;
+   }
+   p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+   //find a free entry
+   for(i=0;i<TUNE_NETAPI_MAX_SA;i++)
+   {                       
+       if (!p->tunnel[i].in_use)
+       {
+           p->tunnel[i].in_use = 2; //pending
+           p->tunnel[i].iface= iface; //save iface
+           p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+           return i;
+       }
+   }
+   p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+   return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to delete an SA from SA list
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to delete an SA from SA list 
+ ********************************************************************/
+void netapip_netcpCfgDeleteSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                              int sa_slot)
+{
+    if ((sa_slot <0 ) || (sa_slot >= TUNE_NETAPI_MAX_SA))
+    {
+        return ;
+    }
+    p->tunnel[sa_slot].in_use=0;
+    return;
+}
+
+
+/****************************************************************************
+ * FUNCTION PURPOSE:  Internal function to retrieve SB command info template
+ **************************************************************************
+ * DESCRIPTION:  Internal function to retrieve SB command info template
+ ***************************************************************************/
+nwalTxDmPSCmdInfo_t* netapip_netcpCfgGetSaSBInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                                 NETCP_CFG_SA_T    sa_app_id)
+{
+     int sa_slot = netapi_cfgGetMatchId(sa_app_id);
+    if ((sa_slot <0 ) || (sa_slot >= TUNE_NETAPI_MAX_SA))
+    {
+        return NULL;
+    }
+    return (&p->tunnel[sa_slot].dmPSCmdInfo);
+}
+
+/****************************************************************************
+ * FUNCTION PURPOSE:  Internal function to retrieve Inflow mode 
+ *                    software information required to transmit packet
+ **************************************************************************
+ * DESCRIPTION:  Internal function to retrieve Inflow mode 
+ *                    software information required to transmit packet
+ ***************************************************************************/
+int netapip_netcpCfgGetSaInflowInfo(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                    NETCP_CFG_SA_T    sa_app_id,
+                                    uint32_t *swInfo0,
+                                    uint32_t *swInfo1)
+{
+    int sa_slot = netapi_cfgGetMatchId(sa_app_id);
+    if ((sa_slot <0 ) || (sa_slot >= TUNE_NETAPI_MAX_SA))
+    {
+        return 0;
+    }
+    *swInfo0 = p->tunnel[sa_slot].swInfo0;
+    *swInfo1 = p->tunnel[sa_slot].swInfo1;
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to insert an SA to the SA list
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to insert an SA to the SA list 
+ ********************************************************************/
+void netapip_netcpCfgInsertSa(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                              int sa_slot,
+                              int dir,
+                              int mode,
+                              void * temp1,
+                              void * temp2,
+                              void * handle_inflow,
+                              void * handle_sideband,
+                              nwalTxDmPSCmdInfo_t *dmPSCmdInfo,
+                              uint32_t swInfo0,
+                              uint32_t swInfo1,
+                              void* user_data)
+{
+    p->tunnel[sa_slot].in_use=1;
+    p->tunnel[sa_slot].inbound = dir;
+    p->tunnel[sa_slot].sa_mode = mode;
+    p->tunnel[sa_slot].sa_handle_inflow = handle_inflow;
+    p->tunnel[sa_slot].sa_handle_sideband = handle_sideband;
+    p->tunnel[sa_slot].swInfo0 = swInfo0;
+    p->tunnel[sa_slot].swInfo1 = swInfo1;
+    p->tunnel[sa_slot].user_data = user_data;
+
+    if (dmPSCmdInfo)
+    {
+        memcpy(&p->tunnel[sa_slot].dmPSCmdInfo, dmPSCmdInfo, sizeof(nwalTxDmPSCmdInfo_t));
+    }
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to return NWAL handles for an SA
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to return NWAL handles for an SA
+ ********************************************************************/
+ void *netapip_netcpCfgGetSaHandles(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                    int sa_slot,
+                                    void ** p_sideband)
+{
+    if ((sa_slot <0 ) || (sa_slot >= TUNE_NETAPI_MAX_SA))
+        return NULL;
+    if (!p->tunnel[sa_slot].in_use)
+        return NULL;
+    *p_sideband = p->tunnel[sa_slot].sa_handle_sideband;
+    return p->tunnel[sa_slot].sa_handle_inflow;
+}
+
+
+/*==============================FLOWS=============================*/
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a free slot for a flow
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to find a free slot for a flow
+ ********************************************************************/
+static int netapip_netcpCfgFindFlowSlot(NETAPI_HANDLE_T *p_handle,
+                                        NETAPI_NWAL_GLOBAL_CONTEXT_T *p)
+{
+    int i;
+    //find a free entry
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_FLOWS;i++)
+    {
+        if (!p->flows[i].in_use)
+        {
+            p->flows[i].in_use = 2; /* pending */
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return i;
+        }
+    }
+   p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find delete a flow from flow list
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to find delete a flow from flow list
+ ********************************************************************/
+static void netapip_netcpCfgDeleteFlow(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                       int slot)
+{
+    if ((slot >=0 ) && (slot < TUNE_NETAPI_MAX_FLOWS))
+    {
+        p->flows[slot].in_use = 0;
+    }
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to  insert a flow to the  flow list
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to  delete a flow from flow list
+ ********************************************************************/
+static NETCP_CFG_FLOW_HANDLE_T netapip_netcpCfgInsertFlow(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                                          int slot,
+                                                          int dma_engine,
+                                                          void * handle)
+{
+    p->flows[slot].in_use=1;
+    p->flows[slot].handle = handle;
+    p->flows[slot].flow.flowid  = Cppi_getFlowId(handle);
+    p->flows[slot].flow.dma_engine  = dma_engine;
+        return (NETCP_CFG_FLOW_HANDLE_T) &p->flows[slot].flow;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find entry matching the flowid
+ ********************************************************************
+ * DESCRIPTION: Netapi internal function to find entry matching the flowid. Returns
+ * the slot number and the cPPI handle.
+ ********************************************************************/
+static int netapip_netcpCfgFindFlow(NETAPI_HANDLE_T *p_handle,
+                                    NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                    int flowid,  
+                                    int dma_engine,
+                                    void ** handle) 
+{
+    int i;
+    *handle=NULL;
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_FLOWS;i++)
+    {
+       if ((p->flows[i].in_use)&&
+           (p->flows[i].flow.flowid == flowid)&&
+           (p->flows[i].flow.dma_engine == dma_engine))
+        {
+            *handle = p->flows[i].handle;
+             p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return i;
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    return -1;
+}
+
+
+
+/*============================IP ADDRESSES==========================*/
+
+/***************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a free slot for IP rule in IP slot list
+ ***************************************************************************
+ * DESCRIPTION: NNetapi internal function to find a free slot for IP rule in IP slot list
+ ***************************************************************************/
+static int netapip_netcpCfgFindIpSlot(NETAPI_HANDLE_T *p_handle,
+                                      NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                      int iface_no)
+{
+    int i;
+
+    //find a free entry
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_NUM_IP;i++)
+    {
+        if (!p->ips[i].in_use)
+        {
+            p->ips[i].in_use = 2; //pending
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return i;
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    return -1;
+}
+
+/***************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to insert an IP address into interface
+ ***************************************************************************
+ * DESCRIPTION: Netapi internal function to insert an IP address into interface
+ ***************************************************************************/
+static void netapip_netcpCfgInsertIp(NETAPI_NWAL_GLOBAL_CONTEXT_T *p, 
+                                     nwal_IpType ipType,
+                                     nwalIpAddr_t *ip_addr, 
+                                     nwalIpOpt_t *ip_qualifiers, 
+                                     int iface_no,
+                                     int ip_slot,
+                                     void * handle,
+                                     void * user_data)
+{
+    p->ips[ip_slot].in_use=1;
+    memcpy(&p->ips[ip_slot].ip_addr, ip_addr, sizeof(nwalIpAddr_t));
+    if(ip_qualifiers)
+    {
+        memcpy(&p->ips[ip_slot].ip_qualifiers, ip_qualifiers, sizeof(nwalIpOpt_t));
+    }
+    else
+    {
+        memset(&p->ips[ip_slot].ip_qualifiers, 0, sizeof(nwalIpOpt_t));
+    }
+    p->ips[ip_slot].ip_type = ipType;
+    p->ips[ip_slot].nwal_handle = handle;
+    p->ips[ip_slot].user_data = user_data;
+}
+
+/***************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to free IP slot associated with IP address
+ ***************************************************************************
+ * DESCRIPTION: Netapi internal function to free IP slot associated with IP address
+ ***************************************************************************/
+static void netapip_netcpCfgDeleteIp(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                     int iface_no,
+                                     int ip_slot)
+{
+    if ((ip_slot >=0) &&(ip_slot < TUNE_NETAPI_MAX_NUM_IP))
+    {
+        p->ips[ip_slot].in_use=0;
+    }
+}
+
+/***************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get IP handle associated with IP address
+ ***************************************************************************
+ * DESCRIPTION: Netapi internal function to get IP handle associated with IP address
+ ***************************************************************************/
+void *netapip_netcpCfgGetIpHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                         int iface_no,
+                                         int ip_slot)
+{
+    if ((ip_slot <0)||(ip_slot>=TUNE_NETAPI_MAX_NUM_IP))
+        return NULL;
+    if (!p->ips[ip_slot].in_use)
+        return NULL;
+    return (void *) p->ips[ip_slot].nwal_handle;
+}
+
+/*==========================MAC INTERFACES======================*/
+
+
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to insert an interface to the interface list
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to insert an interface to the interface list
+ *******************************************************************************/
+static void netapip_netcpCfgInsertMac(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                      unsigned char * p_mac,
+                                      int iface_no, 
+                                      int state, NETCP_CFG_VLAN_T vlan, 
+                                      void * handle)
+{
+    if ((iface_no >=0 ) && (iface_no < TUNE_NETAPI_MAX_NUM_MAC))
+    {
+        memset(&p->interfaces[iface_no],0,sizeof(NETCP_INTERFACE_T));
+        p->interfaces[iface_no].in_use = 1;
+        memcpy(&p->interfaces[iface_no].mac[0], p_mac,6);
+        p->interfaces[iface_no].state = state;
+        //todo p->interfaces[iface_no].vlan = vlan;
+        p->interfaces[iface_no].nwal_handle = handle; //save handle assoicated with this rule
+
+    }
+}
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get handle associated with interface
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to get handle associated with interface
+ *******************************************************************************/
+void* netapip_netcpCfgGetMacHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                   int iface_no)
+{
+    if (iface_no == NETCP_CFG_NO_INTERFACE)
+    {
+        return NULL;
+    }
+    if ((iface_no <0 ) || (iface_no >= TUNE_NETAPI_MAX_NUM_MAC))
+    {
+        return NULL;
+    }
+    else if ( p->interfaces[iface_no].in_use)
+    {
+      return (void *) p->interfaces[iface_no].nwal_handle;
+    }
+    //no valid entry in slot
+    return NULL;
+}
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to delete interface from interface list
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to delete interface from interface list
+ *******************************************************************************/
+static void netapip_netcpCfgDeleteMac(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                      int iface_no)
+{
+    if ((iface_no >=0 ) && (iface_no < TUNE_NETAPI_MAX_NUM_MAC))
+    {
+        p->interfaces[iface_no].in_use = 0;
+    }
+}
+
+/*========================CLASSIFIERS==========================*/
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a free slot for classifier rule
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to find a free slot for classifier rule
+ *******************************************************************************/
+static int netapip_netcpCfgFindClassSlot(NETAPI_HANDLE_T *p_handle,
+                                         NETAPI_NWAL_GLOBAL_CONTEXT_T *p)
+{
+    int i;
+    p_handle->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_lock);
+    for(i=0;i<TUNE_NETAPI_MAX_CLASSIFIERS;i++)
+    {
+        if (!p->classi[i].in_use)
+        {
+            p->classi[i].in_use = 2; //pending
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+            return i;
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_lock);
+    return -1;
+}
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a delete a classifer from classifer list
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to find a delete a classifer from classifer list
+ *******************************************************************************/
+static void netapip_netcpCfgDeleteClass(
+         NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+         int class_slot )
+{
+    if ((class_slot <0 ) || (class_slot >= TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        return;
+    }
+    p->classi[class_slot].in_use=0;
+}
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to find a insert a classifer to classifer list
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to find a insert a classifer to classifer list
+ *******************************************************************************/
+static void netapip_netcpCfgInsertClass(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                        int class_slot,
+                                        int class_type,
+                                        void * L2_handle,
+                                        void * L3_handle,
+                                        void * L4_handle,
+                                        void * user_data)
+{
+    if ((class_slot >=0 ) && (class_slot < TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        p->classi[class_slot].in_use=1;
+        p->classi[class_slot].nwal_L2_handle = L2_handle;
+        p->classi[class_slot].nwal_L3_handle = L3_handle;
+        p->classi[class_slot].nwal_L4_handle = L4_handle;
+        p->classi[class_slot].class_type = class_type;
+        p->classi[class_slot].user_data = user_data;
+    }
+}
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get L4 nwal handle for classifier
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to get L4 nwal handle for classifier
+ *******************************************************************************/
+static void *netapip_netcpCfgGetL4Handle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                         int class_slot)
+{
+    if ((class_slot <0 ) || (class_slot >= TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        return NULL;
+    }
+    if (!p->classi[class_slot].in_use)
+    {
+        return NULL;
+    }
+    return p->classi[class_slot].nwal_L4_handle;
+}
+
+
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get L3 nwal handle for classifier
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to get L3 nwal handle for classifier
+ *******************************************************************************/
+static int cfgOkToDeleteL3ClassiHandle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                         void*  l3_handle)
+{
+    int i;
+    int count=0;
+
+    if(l3_handle == NULL)
+        return NETAPI_FALSE;
+    for(i=0; i< TUNE_NETAPI_MAX_CLASSIFIERS;i++)
+    {
+        if (!p->classi[i].in_use)
+        {
+            continue;
+        }
+        if (l3_handle == p->classi[i].nwal_L3_handle)
+        {
+            count++;
+        }
+    }
+    if (count > 0)
+        return NETAPI_FALSE;
+
+    return NETAPI_TRUE;
+}
+
+/*******************************************************************************
+ * FUNCTION PURPOSE:  Netapi internal function to get L3 nwal handle for classifier
+ *******************************************************************************
+ * DESCRIPTION:  Netapi internal function to get L3 nwal handle for classifier
+ *******************************************************************************/
+static void *netapip_netcpCfgGetL3Handle(NETAPI_NWAL_GLOBAL_CONTEXT_T *p,
+                                         int class_slot)
+{
+    if ((class_slot <0 ) || (class_slot >= TUNE_NETAPI_MAX_CLASSIFIERS))
+    {
+        return NULL;
+    }
+    if (!p->classi[class_slot].in_use)
+    {
+        return NULL;
+    }
+    return p->classi[class_slot].nwal_L3_handle;
+}
+
+
+/***********************************************************************************/
+/****************************************API****************************************/
+/***********************************************************************************/
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to request statistics from NETCP
+ ********************************************************************
+ * DESCRIPTION:  API to request statistics from NETCP
+ ********************************************************************/
+void netapi_netcpCfgReqStats(NETAPI_T  h, 
+                             NETCP_CFG_STATS_CB cb,
+                             int doClear,
+                             int *err)
+{
+    nwal_RetValue ret;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     transId;
+
+    paSysStats_t netcp_stats;
+    if ((!n) || (!cb))
+    {
+        *err = NETAPI_ERR_BAD_INPUT;
+        return ;
+    }
+    *err =0;
+
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &transId);
+    if (!pTransInfo) { *err =  NETAPI_ERR_BUSY; return ;}
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_STAT_REQUEST;
+    pTransInfo->netapi_handle = h;
+    n->nwal_local.stats_cb = cb;
+
+    memset(&netcp_stats, 0, sizeof(paSysStats_t));
+    ret = nwal_getPAStats( ((NETAPI_GLOBAL_T *) n->global)->nwal_context.nwalInstHandle,
+                              transId,
+                              &netcp_stats,
+                              doClear);
+    if(ret !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_BUSY;  //no resources??
+        netapip_freeTransInfo(pTransInfo);
+        return;
+    }
+#if defined(DEVICE_K2E) || defined(DEVICE_K2L)
+    if (cb)
+    {
+        cb(h, &netcp_stats);
+    }
+#endif
+    netapip_freeTransInfo(pTransInfo);
+}
+/********************************************************************
+ * FUNCTION PURPOSE:  API to create a MAC interface
+ ********************************************************************
+ * DESCRIPTION:  API to create a MAC interface
+ ********************************************************************/
+NETCP_CFG_MACIF_T  netapi_netcpCfgCreateMacInterface(NETAPI_T  h,
+                                                     uint8_t *p_mac,
+                                                     uint8_t *p_mac_remote,
+                                                     int  iface_no, /* index, from 0 to n */
+                                                     int switch_port,
+                                                     NETCP_CFG_ROUTE_HANDLE_T  route,
+                                                     NETCP_CFG_VLAN_T  vlan,  //future
+                                                     uint16_t etherType,
+                                                     int state,  //0=down, 1=up  //ignored
+                                                     int * err)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwalMacParam_t   macInfo=
+    {
+        0,      /* validParams */
+        0,      /* ifNum */
+        0,      /* vlanId      */
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },      /* Local mac */
+        { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },      /* Remote mac */
+        NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,       /* Continue parsing to next route for match */
+        NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,            /* For next route fail action by default is route to host */
+        CPPI_PARAM_NOT_SPECIFIED,                    /* Use default flow configured to NWAL  if packet is routed to host */
+        QMSS_PARAM_NOT_SPECIFIED,                     /* Use default queue configured to NWAL if packet is routed to host */
+        0,
+        0,
+        0
+    };
+
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    nwal_AppId         appId;
+    if ((!n) || (!p_mac)) {*err = NETAPI_ERR_BAD_INPUT; return -1;}
+    *err =0;
+
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *err =  NETAPI_ERR_BUSY;
+        return -1;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_MAC;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+
+    /* set up MacInfo */
+    memcpy(&macInfo.macAddr,p_mac,6);
+
+    if(p_mac_remote)
+    {
+        macInfo.validParams |=  NWAL_SET_MAC_VALID_PARAM_REMOTE_MAC;
+        memcpy(&macInfo.remMacAddr,p_mac_remote,6);
+    }
+    /* todo: vlan */
+    if (switch_port)
+    {
+        macInfo.validParams |= NWAL_SET_MAC_VALID_PARAM_IFNUM ;
+        macInfo.ifNum = switch_port;
+    }
+
+    if(etherType)
+    {
+        macInfo.validParams |= NWAL_SET_MAC_VALID_PARAM_ETHER_TYPE;
+        macInfo.etherType = etherType;
+    }
+
+    if (route != NULL)
+    {
+        if((route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+            NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+        {
+           macInfo.validParams |= 
+                    NWAL_SET_MAC_VALID_PARAM_ROUTE_TYPE;
+
+           if(route->routeType == NWAL_ROUTE_PKTTYPE_EQOS)
+           {
+                macInfo.egress_switch_port = route->egress_swith_port;
+                macInfo.routeType = NWAL_ROUTE_PKTTYPE_EQOS;
+                macInfo.matchAction = NWAL_MATCH_ACTION_HOST;
+           }
+        }
+        if((route->valid_params & NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST) ==
+            NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST)
+        {
+            macInfo.matchAction = route->match_destination;
+        }
+        if((route->valid_params & NETCP_CFG_VALID_PARAM_FAIL_ACTION_DEST) ==
+            NETCP_CFG_VALID_PARAM_FAIL_ACTION_DEST)
+        {
+            macInfo.failAction = route->fail_destination;
+        }
+
+        netapip_netcpCfgBuildRoute(route,
+                                   &macInfo.appRxPktFlowId,
+                                   &macInfo.appRxPktQueue,
+                                   &macInfo.routeType);
+    }
+
+
+    appId = (nwal_AppId) (NETAPI_NETCP_MATCH_GENERIC_MAC | iface_no);
+
+    retValue = nwal_setMacIface( ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                  trans_id,
+                                  appId,
+                                  &macInfo,
+                                  &pTransInfo->handle);
+    if(retValue !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        return -1;
+    }
+
+    //wait here until its done since scheduler isn't running yet most likely..
+    // todo:  make this handled by scheduler poll later ??
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
+        {
+            // if response is there, then this poll squirts out in the CTl poll callback, 
+            // which handles the rest (including decrmenting #pending!!
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *err = NETAPI_ERR_PA_FW;
+            return -1;
+        }
+
+    }
+    netapip_netcpCfgInsertMac(&netapi_get_global()->nwal_context, 
+                          p_mac, iface_no, state,vlan,
+                          (void *) pTransInfo->handle);
+    netapip_freeTransInfo(pTransInfo);
+    return (NETCP_CFG_MACIF_T)appId;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to delete MAC  interface
+ ********************************************************************
+ * DESCRIPTION:  API to delete MAC  interface
+ ********************************************************************/
+void netapi_netcpCfgDelMac(NETAPI_T h,
+                           int iface_no,
+                           int *err)
+{
+    nwal_RetValue ret;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * ifHandle;
+
+    //get the nwal handle assoicated with this iface
+    ifHandle = netapip_netcpCfgGetMacHandle(&netapi_get_global()->nwal_context, iface_no );
+    if(!ifHandle) 
+    {
+        *err = NETAPI_ERR_BAD_INPUT; return ;
+    }
+    *err =0;
+
+    //get a transaction id
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *err =  NETAPI_ERR_BUSY;
+        return ;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_MAC;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+
+    //issue request
+    ret = nwal_delMacIface(
+                ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                trans_id,
+                ifHandle);
+    if(ret !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        return;
+    }
+    //wait here until its done since scheduler isn't running yet most likely..
+    // todo:  make this handled by scheduler poll later ??
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
+        {
+            // if response is there, then this poll squirts out in the CTl poll callback, 
+            // which handles the rest (including decrmenting #pending!!
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *err = NETAPI_ERR_PA_FW;
+            netapip_netcpCfgDeleteMac(&netapi_get_global()->nwal_context,  iface_no);
+            return;
+        }
+    }
+    netapip_freeTransInfo(pTransInfo);
+    //zap the entry
+    netapip_netcpCfgDeleteMac(&netapi_get_global()->nwal_context,  iface_no);
+    return ;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  NETAPi internal function to Add IP to MAC interface
+ ********************************************************************
+ * DESCRIPTION:  NETAPi internal function to Add IP to MAC interface
+ ********************************************************************/
+static NETCP_CFG_IP_T  netapip_netcpCfgAddIpInternal(NETAPI_T  h,
+                                                     int  iface_no,
+                                                     nwal_IpType ipType,
+                                                     nwalIpAddr_t  * ip_addr,
+                                                     nwalIpAddr_t  *ip_rem_addr,
+                                                     nwalIpOpt_t * ip_qualifiers,
+                                                     NETCP_CFG_ROUTE_HANDLE_T  route,/*NULL for default*/
+                                                     void * user_data,
+                                                     int * err,
+                                                     int  flag) /*TRUE: add IP to iface,
+                                                     FALSE: add IP as part of classifier */
+{
+    static unsigned char zeroIP6[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * n_handle=NULL;
+    nwalIpParam_t    nwalIpParam= {
+    0,
+    pa_IPV4,      /* IP Type */
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* Dest IP */
+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* Source IP */
+    { 0x0,0,0,0},/* IP Options */
+    NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,       /* Continue parsing to next route for match */
+    NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,            /* For next route fail action by default is route to host */
+    CPPI_PARAM_NOT_SPECIFIED,                    /* Use default flow configured to NWAL  if packet is routed to host */
+    QMSS_PARAM_NOT_SPECIFIED,                     /* Use default queue configured to NWAL if packet is routed to host */
+    0
+};
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    int ip_slot=-1;
+    NETCP_CFG_IP_T ip_rule_id;
+    NETCP_CFG_IP_T temp;
+
+    //verify that iface has been configured 
+    if (iface_no != NETCP_CFG_NO_INTERFACE)
+    {
+        if ((iface_no<0) || (iface_no>= TUNE_NETAPI_MAX_NUM_MAC)) {*err = NETAPI_ERR_BAD_INPUT; return -1;}
+    }
+
+    if (iface_no != NETCP_CFG_NO_INTERFACE)
+    {
+        if(netapi_get_global()->nwal_context.interfaces[iface_no].in_use)
+        {
+            n_handle =  netapi_get_global()->nwal_context.interfaces[iface_no].nwal_handle;
+        }
+        else
+        {
+            *err = NETAPI_ERR_BAD_INPUT;
+            return -1;
+        }
+    }
+    if (flag) //if adding IP to MAC then reserve a slot to save info
+    {
+        //find free slot for IP & reserve
+         ip_slot= netapip_netcpCfgFindIpSlot(n,
+                                             &netapi_get_global()->nwal_context, 
+                                             iface_no);
+        if (ip_slot <0) 
+        {
+            *err= NETAPI_ERR_NOMEM;  //no room 
+            return -1;
+        }
+    }
+
+    //get a transaction object for config action
+    pTransInfo = netapip_getFreeTransInfo(n, 
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *err =  NETAPI_ERR_BUSY;
+        if (flag)
+        {
+            netapip_netcpCfgDeleteIp(&netapi_get_global()->nwal_context,
+                         iface_no,
+                         ip_slot);
+        }
+        return -1;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_IP;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+
+    //build nwalIpParam
+    memcpy(&nwalIpParam.locIpAddr,ip_addr, sizeof(nwalIpAddr_t));
+    if (ip_rem_addr)
+    {
+        if (ipType == nwal_IPV4)
+        {
+            if(memcmp(ip_rem_addr, zeroIP6, sizeof(nwalIpv4Addr_t)))
+            {
+                nwalIpParam.validParams |= NWAL_SET_IP_VALID_PARAM_REMOTE_IP;
+                memcpy(&nwalIpParam.remIpAddr,ip_rem_addr, sizeof(nwalIpAddr_t));
+            }
+        }
+        else
+        {
+            if(memcmp(ip_rem_addr, zeroIP6, sizeof(nwalIpv6Addr_t)))
+            {
+                nwalIpParam.validParams |= NWAL_SET_IP_VALID_PARAM_REMOTE_IP;
+                memcpy(&nwalIpParam.remIpAddr,ip_rem_addr, sizeof(nwalIpAddr_t));
+            }
+        }
+    }
+    nwalIpParam.ipType=ipType;
+    if(route)
+    {
+        if((route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+            NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+        {
+           nwalIpParam.validParams |= 
+                    NWAL_SET_IP_VALID_PARAM_ROUTE_TYPE;
+        }
+        netapip_netcpCfgBuildRoute(route,
+                                   &nwalIpParam.appRxPktFlowId,
+                                   &nwalIpParam.appRxPktQueue,
+                                   &nwalIpParam.routeType);
+    }
+    else{} //use nwal defaults
+
+    if (ip_qualifiers)
+        memcpy(&nwalIpParam.ipOpt,ip_qualifiers, sizeof(nwalIpOpt_t)); 
+    else
+        memset(&nwalIpParam.ipOpt,0, sizeof(nwalIpOpt_t));
+
+    //build the rule id that will be returned when a packet matches 
+    if (flag)
+        ip_rule_id = NETAPI_NETCP_MATCH_GENERIC_IP | iface_no | ((ip_slot&& NETAPI_NETCP_MATCH_ID_MASK) << NETAPI_NETCP_MATCH_ID_SHIFT);
+    else
+        ip_rule_id = (NETAPI_NETCP_MATCH_CLASS_L3 | iface_no);
+
+    retValue = nwal_setIPAddr(   netapi_get_global()->nwal_context.nwalInstHandle,
+                                  trans_id,
+                                  (nwal_AppId) (ip_rule_id),
+                                  n_handle,
+                                  &nwalIpParam,
+                                  &pTransInfo->handle);
+
+    if(retValue !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        //zap the entry
+        if (flag)
+        {
+            netapip_netcpCfgDeleteIp(&netapi_get_global()->nwal_context,
+                         iface_no,
+                         ip_slot);
+        }
+        return -1;
+    }
+    //wait here until its done since scheduler isn't running yet most likely..
+    // todo:  make this handled by scheduler poll later ??
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+        (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
+        {
+            // if response is there, then this poll squirts out in the CTl poll callback, 
+            // which handles the rest (including decrmenting #pending!!
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *err = NETAPI_ERR_PA_FW;
+            return -1;
+        }
+    }
+    if (flag)
+    {
+        netapip_netcpCfgInsertIp(&netapi_get_global()->nwal_context,
+                                 ipType, 
+                                 ip_addr,
+                                 ip_qualifiers,
+                                 iface_no,
+                                 ip_slot,
+                                 pTransInfo->handle,
+                                 user_data);
+    }
+
+    temp = (NETCP_CFG_IP_T) pTransInfo->handle;
+    netapip_freeTransInfo(pTransInfo);
+    return  (flag ? ip_rule_id:  temp);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to Add IP to MAC interface
+ ********************************************************************
+ * DESCRIPTION:  API to Add IP to MAC interface
+ ********************************************************************/
+NETCP_CFG_IP_T  netapi_netcpCfgAddIp(NETAPI_T                  h,
+                                     int                       iface_no,
+                                     nwal_IpType               ipType,
+                                     nwalIpAddr_t*             ip_addr,
+                                     nwalIpAddr_t*             ip_rem_addr,
+                                     nwalIpOpt_t*              ip_qualifiers,
+                                     NETCP_CFG_ROUTE_HANDLE_T  route,  //NULL for default
+                                     void*                     user_data,
+                                     int*                      err)
+{
+    return netapip_netcpCfgAddIpInternal(h,
+                                         iface_no,
+                                         ipType,
+                                         ip_addr,
+                                         ip_rem_addr,
+                                         ip_qualifiers, 
+                                         route, 
+                                         user_data,
+                                         err,
+                                         1);
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  NETAPI internal function to detach IP from MAC interface
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function to detach IP from MAC interface
+ ********************************************************************/
+static void netapip_netcpCfgDelIpInternal(NETAPI_T h, 
+                                          int iface_no,
+                                          nwal_IpType ipType,
+                                          nwalIpAddr_t  * ip_addr,
+                                          nwalIpOpt_t * ip_qualifiers, 
+                                          NETCP_CFG_IP_T  ip_rule_id,
+                                          int *err, 
+                                          void * handle,   /* if flag==0, handle must be valid */
+                                          int flag)        /* flag==0 => delete IP rule that was part of classifier, not interface */
+{
+    nwal_RetValue ret;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * ifHandle;
+    int ip_slot = netapi_cfgGetMatchId(ip_rule_id);
+    /* get the nwal handle assoicated with this ip */
+    if (flag)
+    {
+        ifHandle = netapip_netcpCfgGetIpHandle(&netapi_get_global()->nwal_context,
+                                                iface_no,
+                                                ip_slot);
+    }
+    else 
+    {
+        ifHandle = handle;
+    }
+    if(!ifHandle)
+    {
+        *err = NETAPI_ERR_BAD_INPUT;
+        return ;
+    }
+    *err =0;
+
+    //get a transaction id
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *err =  NETAPI_ERR_BUSY;
+        return;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_IP;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+    //issue request
+    ret = nwal_delIPAddr(
+                ((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                trans_id,
+                ifHandle);
+    if(ret !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_ERR0;
+        netapip_freeTransInfo(pTransInfo);
+        return ;
+    }
+    //wait here until its done since scheduler isn't running yet most likely..
+    // todo:  make this handled by scheduler poll later ??
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
+        {
+            // if response is there, then this poll squirts out in the CTl poll callback, 
+            // which handles the rest (including decrmenting #pending!!
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+        if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+        {
+            netapip_freeTransInfo(pTransInfo);
+            *err = NETAPI_ERR_PA_FW;
+            return;
+        }
+    }
+
+    netapip_freeTransInfo(pTransInfo);
+
+    //zap the entry
+    if (flag)
+        netapip_netcpCfgDeleteIp(&netapi_get_global()->nwal_context,  
+                         iface_no,
+                         ip_slot);
+    return ;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to detach IP from MAC interface
+ ********************************************************************
+ * DESCRIPTION:  API  to detach IP from MAC interface
+ ********************************************************************/
+void netapi_netcpCfgDelIp(NETAPI_T              h,
+                          int                   iface_no,
+                          nwal_IpType           ipType,
+                          nwalIpAddr_t*         ip_addr,
+                          nwalIpOpt_t*          ip_qualifiers,
+                          NETCP_CFG_IP_T        ip_rule_id,
+                          int*                  err)
+{
+    netapip_netcpCfgDelIpInternal( h, iface_no, ipType,
+                  ip_addr, ip_qualifiers, ip_rule_id,
+                  err, NULL, 1);
+    return;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to attach a classifier rule to NETCP
+ ********************************************************************
+ * DESCRIPTION:  API to attach a classifier rule to NETCP
+ ********************************************************************/
+NETCP_CFG_CLASS_T netapi_netcpCfgAddClass(NETAPI_T                  h,
+                                          NETCP_CFG_CLASSIFIER_T*   p_class,
+                                          NETCP_CFG_ROUTE_HANDLE_T  route,
+                                          int                       action, 
+                                          void*                     user_data, 
+                                          int*                      err)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void * l3_handle=NULL;  //ip handle
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    int class_slot=-1;
+    int iface_no;
+    int ip_slot=-1;
+    NETCP_CFG_CLASS_T  classHandle;  //returned by us
+    nwal_appProtoType_t proto;
+    nwalRxConnCfg_t tempCfg=
+    {
+        0,  //nwal_handle: to be filled in
+        0, // l4 ports: to be filled in
+        0,  //core id (NA)
+        0, //action
+        CPPI_PARAM_NOT_SPECIFIED, //flow id
+        QMSS_PARAM_NOT_SPECIFIED, //dest queue
+        0,
+        0, // l4 ports: to be filled in
+    };
+
+    *err = NETAPI_ERR_OK;
+
+    if(!p_class)
+    {
+        *err=NETAPI_ERR_BAD_INPUT;
+        return -1;
+    }
+    switch(p_class->classType)
+    {
+        default:
+            break;
+        case(NETCP_CFG_CLASS_TYPE_L3_L4):
+            n->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+        case(NETCP_CFG_CLASS_TYPE_L4):
+            //assume just type l4 only (L2, L3 defined by iface, l3 id )
+            iface_no = p_class->u.c_l4.iface;
+            if (p_class->classType== NETCP_CFG_CLASS_TYPE_L4)
+            {
+                ip_slot = netapi_cfgGetMatchId(p_class->u.c_l4.ip);
+            }
+
+            //verify that iface has been configured 
+            if (iface_no != NETCP_CFG_NO_INTERFACE)
+            {
+                if(!netapi_get_global()->nwal_context.interfaces[iface_no].in_use)
+                {
+                    *err = NETAPI_ERR_BAD_INPUT;
+                    if(p_class->classType== NETCP_CFG_CLASS_TYPE_L3_L4)
+                        n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                    return -1;
+                }
+            }
+
+            if (p_class->classType== NETCP_CFG_CLASS_TYPE_L4)
+            {
+                //verify that ip has been configured and get its handle
+                l3_handle = netapip_netcpCfgGetIpHandle(
+                      &netapi_get_global()->nwal_context, iface_no,
+                      ip_slot );
+            }
+            else
+            {
+                nwalIpParam_t tempParam=
+                {
+                    0,
+                    pa_IPV4,      /* IP Type */
+                    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* Dest IP */
+                    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },  /* Source IP */
+                    { 0x0,0,0,0},/* IP Options */
+                    NWAL_MATCH_ACTION_CONTINUE_NEXT_ROUTE,       /* Continue parsing to next route for match */
+                    NWAL_NEXT_ROUTE_FAIL_ACTION_HOST,            /* For next route fail action by default is route to host */
+                    CPPI_PARAM_NOT_SPECIFIED,                    /* Use default flow configured to NWAL  if packet is routed to host */
+                    QMSS_PARAM_NOT_SPECIFIED,                    /* Use default queue configured to NWAL if packet is routed to host */
+                    0
+                };
+                //build nwalIpParam
+                memcpy(&tempParam.locIpAddr,p_class->u.c_l3_l4.ip_addr, sizeof(nwalIpAddr_t));
+                tempParam.ipType=p_class->u.c_l3_l4.ipType;
+                //use nwal defauls for route
+                if (p_class->u.c_l3_l4.ip_qualifiers)
+                    memcpy(&tempParam.ipOpt,p_class->u.c_l3_l4.ip_qualifiers, sizeof(nwalIpOpt_t));
+                else
+                    memset(&tempParam.ipOpt,0, sizeof(nwalIpOpt_t));
+
+                //find if we have a matching L3 handle for IP classifier; if not create it
+                retValue =  nwal_getIPAddr (((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                            &tempParam,
+                            netapip_netcpCfgGetMacHandle(&netapi_get_global()->nwal_context, iface_no ),
+                            &l3_handle); 
+                if (retValue != nwal_TRUE) 
+                {
+                    int ret;
+                    //**NEW IP RULE  
+                    //need to attach this IP RULE to the MAC
+                    l3_handle= (void *) netapip_netcpCfgAddIpInternal(
+                                      h, iface_no, 
+                                      p_class->u.c_l3_l4.ipType,
+                                      p_class->u.c_l3_l4.ip_addr,
+                                      NULL,
+                                      p_class->u.c_l3_l4.ip_qualifiers,
+                                      p_class->u.c_l3_l4.p_fail_route,
+                                      user_data,
+                                      &ret,
+                                      NETAPI_FALSE);
+                    if(!ret)
+                    {
+                        l3_handle=NULL;
+                    }
+                }
+            }
+            if(!l3_handle)
+            {
+                *err = NETAPI_ERR_BAD_INPUT; 
+                if(p_class->classType == NETCP_CFG_CLASS_TYPE_L3_L4)
+                        n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                return -1 ;
+            }
+
+            //find free slot for CLASS & reserve
+            class_slot= netapip_netcpCfgFindClassSlot(n,
+                                                      &netapi_get_global()->nwal_context);
+            if(class_slot<0) 
+            {
+                *err = NETAPI_ERR_NOMEM;
+                if(p_class->classType == NETCP_CFG_CLASS_TYPE_L3_L4)
+                        n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                return -1;
+                }
+            classHandle = NETAPI_NETCP_MATCH_CLASS |
+                          (class_slot << NETAPI_NETCP_MATCH_ID_SHIFT) | 
+                          (iface_no & NETAPI_NETCP_MATCH_LOGICAL_MAC_IFACE_MASK);
+            //build request from template
+            tempCfg.inHandle=l3_handle;
+            if (p_class->classType== NETCP_CFG_CLASS_TYPE_L4)
+            {
+                memcpy(&tempCfg.appProto,&p_class->u.c_l4.appProto,sizeof(nwalAppProto_t));
+                proto = p_class->u.c_l4.proto;
+            }
+            else
+            {
+                memcpy(&tempCfg.appProto,&p_class->u.c_l3_l4.appProto,sizeof(nwalAppProto_t));
+                proto = p_class->u.c_l3_l4.proto;
+            }
+
+            tempCfg.matchAction = (action==NETCP_CFG_ACTION_TO_SW)  ? NWAL_MATCH_ACTION_HOST : NWAL_MATCH_ACTION_DISCARD;
+            if (route)
+            {
+                if((route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+                    NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+                {
+                    tempCfg.validParams |= 
+                        NWAL_SET_CONN_VALID_PARAM_ROUTE_TYPE;
+                }
+                netapip_netcpCfgBuildRoute(route,
+                                           &tempCfg.appRxPktFlowId,
+                                           &tempCfg.appRxPktQueue,
+                                           &tempCfg.routeType);
+            }
+
+
+            //get a transaction id
+            pTransInfo = netapip_getFreeTransInfo(n,
+                                                  (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                                  &trans_id);
+            if (!pTransInfo)
+            {
+                *err =  NETAPI_ERR_BUSY;
+                if(p_class->classType == NETCP_CFG_CLASS_TYPE_L3_L4)
+                    n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                return -1;
+            }
+            pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_PORT;
+            pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING;
+            pTransInfo->inUse = nwal_TRUE;
+            pTransInfo->netapi_handle = h;
+                //issue request
+            retValue = nwal_addConn(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                            trans_id,
+                            (nwal_AppId) classHandle,
+                            proto,
+                            &tempCfg,
+                            NULL,
+                            &pTransInfo->handle);
+            if(retValue !=  nwal_OK)
+            {
+                *err = NETAPI_ERR_NWAL_ERR0;
+                netapip_freeTransInfo(pTransInfo);
+                netapip_netcpCfgDeleteClass(&netapi_get_global()->nwal_context, class_slot);
+                if(p_class->classType== NETCP_CFG_CLASS_TYPE_L3_L4)
+                    n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                return -1;
+            }
+            //wait here until its done since scheduler isn't running yet most likely..
+           // todo:  make this handled by scheduler poll later ??
+            if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+            {
+                n->nwal_local.numPendingCfg++;
+                while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                    (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_OPEN))
+                {
+                    // if response is there, then this poll squirts out in the CTl poll callback, 
+                    // which handles the rest (including decrmenting #pending!!
+                    nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+                }
+                if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+                {
+                    netapip_freeTransInfo(pTransInfo);
+                    *err = NETAPI_ERR_PA_FW;
+                    netapip_netcpCfgDeleteClass(&netapi_get_global()->nwal_context, class_slot);
+                    if(p_class->classType== NETCP_CFG_CLASS_TYPE_L3_L4)
+                        n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+                    return -1;
+                }
+            }
+            netapip_netcpCfgInsertClass(&netapi_get_global()->nwal_context, 
+                                   class_slot,
+                                 p_class->classType, 
+                                NULL,  //L2 we have
+                                (p_class->classType== NETCP_CFG_CLASS_TYPE_L3_L4? l3_handle : NULL),
+                                  pTransInfo->handle,
+                                  user_data);
+
+            netapip_freeTransInfo(pTransInfo);
+            if(p_class->classType== NETCP_CFG_CLASS_TYPE_L3_L4)
+                n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+            return classHandle;
+    } //end switch
+
+return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to delete a preconfigured classifier
+ ********************************************************************
+ * DESCRIPTION:  API to delete a preconfigured classifier
+ ********************************************************************/
+void netapi_netcpCfgDelClass(NETAPI_T           h,
+                             NETCP_CFG_CLASS_T  classId,
+                             int*               err)
+{
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    void *L4_handle = NULL;  //class handle -> L4
+    void *L3_handle = NULL;  //class handle -> L3
+    nwal_RetValue       retValue;
+    NetapiNwalTransInfo_t *pTransInfo;
+    nwal_TransID_t     trans_id;
+    int class_slot=-1;
+
+    class_slot = netapi_cfgGetMatchId(classId);
+    L4_handle=netapip_netcpCfgGetL4Handle(&netapi_get_global()->nwal_context, class_slot);
+    if(!L4_handle)
+    {
+        *err = NETAPI_ERR_BAD_INPUT; 
+        goto ERR_netapi_netcpCfgDelClass;
+    }
+    L3_handle = netapip_netcpCfgGetL3Handle( &netapi_get_global()->nwal_context,
+                                            class_slot);
+    /* l3 handle might be NULL, depending on type of classifier */
+
+    if(L3_handle)
+    {
+        // grab l3 lock
+        n->spinLock.lock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+    }
+    netapip_netcpCfgDeleteClass(
+                        &netapi_get_global()->nwal_context,
+                        class_slot );
+    //get a transaction id
+    pTransInfo = netapip_getFreeTransInfo(n,
+                                          (NETAPI_PROC_GLOBAL_T *) n->proc_global,
+                                          &trans_id);
+    if (!pTransInfo)
+    {
+        *err =  NETAPI_ERR_BUSY; 
+        goto ERR_netapi_netcpCfgDelClass;
+    }
+    pTransInfo->transType = NETAPI_NWAL_HANDLE_TRANS_PORT;
+    pTransInfo->state = NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING;
+    pTransInfo->inUse = nwal_TRUE;
+    pTransInfo->netapi_handle = h;
+    //issue request for L4
+    retValue = nwal_delConn(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,
+                                                 trans_id,
+                                                 L4_handle);
+    if(retValue !=  nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_ERR0;
+         netapip_freeTransInfo(pTransInfo);
+         goto ERR_netapi_netcpCfgDelClass;  /* todo: what about the L3? */
+    }
+    //wait here until its done since scheduler isn't running yet most likely..
+    // todo:  make this handled by scheduler poll later ??
+    if(trans_id != NWAL_TRANSID_SPIN_WAIT)
+    {
+        n->nwal_local.numPendingCfg++;
+        while ((pTransInfo->state  !=NETAPI_NWAL_HANDLE_STATE_ERR) &&
+                (pTransInfo->state !=NETAPI_NWAL_HANDLE_STATE_IDLE))
+        {
+            // if response is there, then this poll squirts out in the CTl poll callback, 
+            // which handles the rest (including decrmenting #pending!!
+            nwal_pollCtl(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle,NULL,NULL);
+        }
+    }
+    if (pTransInfo->state == NETAPI_NWAL_HANDLE_STATE_ERR)
+    {
+        netapip_freeTransInfo(pTransInfo);
+        *err = NETAPI_ERR_PA_FW;
+         goto ERR_netapi_netcpCfgDelClass;
+    }
+    pTransInfo->state =  NETAPI_NWAL_HANDLE_STATE_IDLE;
+    pTransInfo->inUse = nwal_FALSE;
+
+    /* delete L3 if we have to */
+    if (cfgOkToDeleteL3ClassiHandle(h, L3_handle))
+    {
+        netapip_netcpCfgDelIpInternal(h,
+                                      0,
+                                      0,
+                                      NULL,
+                                      NULL,
+                                      0,
+                                      err,
+                                      L3_handle,
+                                      0);
+    }
+    netapip_freeTransInfo(pTransInfo);
+
+ERR_netapi_netcpCfgDelClass:
+    if(L3_handle)
+        n->spinLock.unlock(&pnetapiShm->netapi_netcp_cfg_l3_classi_lock);
+
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to add a flow
+ ********************************************************************
+ * DESCRIPTION:  API to add a flow
+ ********************************************************************/
+/*--------------flow management--------*/
+// ADD A Flow
+NETCP_CFG_FLOW_HANDLE_T netapi_netcpCfgAddFlow(NETAPI_T                 h,
+                                               int                      n,
+                                               Pktlib_HeapHandle        handles[],
+                                               int                      sizes[],
+                                               NETCP_CFG_FLOW_CONFIG_T* p_cfg,
+                                               int*                     err )
+{
+    Cppi_RxFlowCfg  rxFlowCfg;
+    Uint8           isAlloc;
+    Qmss_QueueHnd   rxBufQ[TUNE_NETAPI_MAX_BUF_POOLS_IN_FLOW];
+    Uint32          rxBufSize[TUNE_NETAPI_MAX_BUF_POOLS_IN_FLOW];
+    int             i;
+    Cppi_FlowHnd FlowHnd;
+    int  slot;
+    NETCP_CFG_FLOW_HANDLE_T retVal;
+    NETAPI_HANDLE_T * pHandle = (NETAPI_HANDLE_T *) h;
+    *err= 0;  /* ok */
+    if (!p_cfg)
+    {
+        *err= NETAPI_ERR_BAD_INPUT;
+        return NULL;
+    }
+    //get a slot to save new flow
+    slot = netapip_netcpCfgFindFlowSlot(pHandle,
+                                        &netapi_get_global()->nwal_context);
+
+    if (slot<0) { *err= NETAPI_ERR_NOMEM;  return NULL; }
+
+    //configure flow
+    memset(&rxFlowCfg,0,sizeof(Cppi_RxFlowCfg));
+    for (i = 0; i < TUNE_NETAPI_MAX_BUF_POOLS_IN_FLOW; i++)
+    {
+        if (i >= n)
+        {
+            rxBufQ[i] = 0;
+            rxBufSize[i] = 0;
+        }
+        else
+        {
+            rxBufQ[i] =   Pktlib_getInternalHeapQueue(handles[i]);
+            //todo: verity sizes< heapsize
+            //todo: verify order
+            rxBufSize[i]= sizes[i];
+        }
+       if (i && (rxBufQ[i] <= 0))
+       {
+            rxBufQ[i] = rxBufQ[i-1];
+            rxBufSize[i] = 0;
+       }
+    }
+
+    /* Configure Rx flow */
+    rxFlowCfg.flowIdNum      = p_cfg->flow_index;/*CPPI_PARAM_NOT_SPECIFIED*/;
+    rxFlowCfg.rx_dest_qnum   = netapi_pktioGetQ(p_cfg->p_dest_q);
+    rxFlowCfg.rx_dest_qmgr   = Qmss_getQueueNumber(rxFlowCfg.rx_dest_qnum).qMgr; 
+    rxFlowCfg.rx_sop_offset  = p_cfg->recv_offset;
+    rxFlowCfg.rx_ps_location = Cppi_PSLoc_PS_IN_DESC;
+    rxFlowCfg.rx_desc_type   = Cppi_DescType_HOST;
+    rxFlowCfg.rx_error_handling = p_cfg->block;
+
+    rxFlowCfg.rx_psinfo_present = 1;
+    rxFlowCfg.rx_einfo_present  = 1;
+
+    rxFlowCfg.rx_dest_tag_lo = 0;
+    rxFlowCfg.rx_dest_tag_hi = 0;
+    rxFlowCfg.rx_src_tag_lo  = 0;
+    rxFlowCfg.rx_src_tag_hi  = 0;
+
+    rxFlowCfg.rx_size_thresh0_en = rxBufSize[1] ? 1 : 0;
+    rxFlowCfg.rx_size_thresh1_en = rxBufSize[2] ? 1 : 0;
+    rxFlowCfg.rx_size_thresh2_en = rxBufSize[3] ? 1 : 0;
+
+  if (p_cfg->dma_index==NETAPI_DMA_NETCP )
+    rxFlowCfg.rx_dest_tag_lo_sel =0;
+  else
+    rxFlowCfg.rx_dest_tag_lo_sel = 0x4;
+    rxFlowCfg.rx_dest_tag_hi_sel = 0;
+    rxFlowCfg.rx_src_tag_lo_sel  = 0;
+    rxFlowCfg.rx_src_tag_hi_sel  = 0;
+
+    rxFlowCfg.rx_fdq1_qnum = rxBufQ[1];
+    rxFlowCfg.rx_fdq1_qmgr = (rxBufQ[1] ? Qmss_getQueueNumber(rxBufQ[1]).qMgr: 0);
+    rxFlowCfg.rx_fdq2_qnum = rxBufQ[2];
+    rxFlowCfg.rx_fdq2_qmgr = (rxBufQ[2] ? Qmss_getQueueNumber(rxBufQ[2]).qMgr: 0);
+    rxFlowCfg.rx_fdq3_qnum = rxBufQ[3];
+    rxFlowCfg.rx_fdq3_qmgr = (rxBufQ[3] ? Qmss_getQueueNumber(rxBufQ[3]).qMgr: 0);
+
+    rxFlowCfg.rx_size_thresh0 = rxBufSize[1] ? rxBufSize[0] : 0;
+    rxFlowCfg.rx_size_thresh1 = rxBufSize[2] ? rxBufSize[1] : 0;
+    rxFlowCfg.rx_size_thresh2 = rxBufSize[3] ? rxBufSize[2] : 0;
+
+    rxFlowCfg.rx_fdq0_sz0_qnum = rxBufQ[0];
+    rxFlowCfg.rx_fdq0_sz0_qmgr =  (rxBufQ[0] ? Qmss_getQueueNumber(rxBufQ[0]).qMgr: 0);
+    rxFlowCfg.rx_fdq0_sz1_qnum = rxBufQ[1];
+    rxFlowCfg.rx_fdq0_sz1_qmgr =  (rxBufQ[1] ? Qmss_getQueueNumber(rxBufQ[1]).qMgr:0);
+    rxFlowCfg.rx_fdq0_sz2_qnum = rxBufQ[2];
+    rxFlowCfg.rx_fdq0_sz2_qmgr =  (rxBufQ[2] ? Qmss_getQueueNumber(rxBufQ[2]).qMgr:0);
+    rxFlowCfg.rx_fdq0_sz3_qnum = rxBufQ[3];
+    rxFlowCfg.rx_fdq0_sz3_qmgr =  (rxBufQ[3] ? Qmss_getQueueNumber(rxBufQ[3]).qMgr:0);
+    {
+        //todo: replace this with a nwal call to get global cntx info
+        Cppi_CpDmaInitCfg cpdmaCfg;
+        Cppi_Handle cppiHnd;
+        memset(&cpdmaCfg,0,sizeof(Cppi_CpDmaInitCfg));
+        cpdmaCfg.dmaNum   = (p_cfg->dma_index==NETAPI_DMA_NETCP ) ?Cppi_CpDma_PASS_CPDMA: Cppi_CpDma_QMSS_CPDMA;
+        cppiHnd= Cppi_open (&cpdmaCfg);
+        if (cppiHnd == NULL)
+        {
+              netapip_netcpCfgDeleteFlow(&netapi_get_global()->nwal_context, slot);
+              *err= NETAPI_ERR_NORES;
+              return NULL;
+        }
+        FlowHnd = Cppi_configureRxFlow (cppiHnd, &rxFlowCfg, &isAlloc);
+    }
+    if (FlowHnd == NULL)
+    {
+        *err= NETAPI_ERR_NORES;
+        netapip_netcpCfgDeleteFlow(&netapi_get_global()->nwal_context, slot);
+        return (NULL);
+    }
+
+    //update slot
+    retVal = netapip_netcpCfgInsertFlow(&netapi_get_global()->nwal_context,
+                                        slot,
+                                        p_cfg->dma_index,
+                                        (void*) FlowHnd);
+    return (retVal);
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API to delete a flow
+ ********************************************************************
+ * DESCRIPTION:  API to delete a flow
+ ********************************************************************/
+void netapi_netcpCfgDelFlow(NETAPI_T                h,
+                            NETCP_CFG_FLOW_HANDLE_T f,
+                            int*                    err)
+{
+    int slot;
+    void * handle;
+    *err=0;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    /* find entry */
+        slot = netapip_netcpCfgFindFlow(n,
+                                        &netapi_get_global()->nwal_context,
+                                        ((NETCP_CFG_FLOW_T *) f) ->flowid,
+                                        ((NETCP_CFG_FLOW_T *) f) ->dma_engine,
+                                        &handle);
+    if (slot<0)
+    {
+        *err = NETAPI_ERR_BAD_INPUT;
+        return;
+    }
+    if ((Cppi_closeRxFlow( (Cppi_FlowHnd) handle)) == 0)
+    {
+        netapip_netcpCfgDeleteFlow(&netapi_get_global()->nwal_context,
+                               slot);
+    }
+    return;
+}
+
+/******************************************************************************
+ * FUNCTION PURPOSE:  API to configure NETCP with global rules for exception packet handling
+ ******************************************************************************
+ * DESCRIPTION:  API to configure NETCP with global rules for exception packet handling
+ *****************************************************************************/
+NETCP_CFG_EXCEPTION_PKT_T netapi_netcpCfgExceptions(NETAPI_T                    h,
+                                                    int                         exception_id,
+                                                    nwal_matchAction_t          action,
+                                                    NETCP_CFG_ROUTE_HANDLE_T    p_route)
+{
+    nwalCtlInfo_t   ctrl;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    nwal_RetValue retVal = 0;
+    memset(&ctrl, 0, sizeof(nwalCtlInfo_t));
+
+    if (p_route != NULL)
+    {
+        if((p_route->valid_params & NETCP_CFG_VALID_PARAM_ROUTE_TYPE) ==
+            NETCP_CFG_VALID_PARAM_ROUTE_TYPE)
+        {
+           ctrl.validParams |= 
+                    NWAL_CONTROL_VALID_PARAM_ROUTE_TYPE;
+           ctrl.routeType = p_route->routeType;
+        }
+        netapip_netcpCfgBuildRoute(p_route,
+                                   &ctrl.appRxPktFlowId,
+                                   &ctrl.appRxPktQueue,
+                                   &ctrl.routeType);
+    }
+    else
+    {
+        ctrl.appRxPktFlowId = NWAL_FLOW_NOT_SPECIFIED;
+        ctrl.appRxPktQueue = NWAL_QUEUE_NOT_SPECIFIED;
+    }
+
+    ctrl.appId = (void*)(NETAPI_NETCP_CFG_MATCH_EXCEPTION | exception_id);
+
+    ctrl.matchAction = action;
+
+    if (exception_id == NETCP_CFG_ALL_EXCEPTIONS)
+    {
+        ctrl.pktCtl = NWAL_CTRL_CFG_ALL_EXCEPTIONS;
+    }
+    else
+    {
+            ctrl.pa_EROUTE_Id = exception_id;
+            ctrl.pktCtl = NWAL_CTRL_CFG_SINGLE_EXCEPTION;
+    }
+
+    retVal = nwal_control(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &ctrl);
+
+
+    return (NETCP_CFG_EXCEPTION_PKT_T) ctrl.appId;
+}
+
+/*************************************************************************/
+/*********************************INTERNAL*******************************/
+/************************************************************************/
+
+/********************************************************************
+ * FUNCTION PURPOSE:  NETAPI internal function, NETCP command reply callback
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function, NETCP command reply callback
+ ********************************************************************/
+void netapip_netcpCfgNWALCmdCallBack(nwal_AppId        appHandle,
+                            uint16_t            trans_id,
+                            nwal_RetValue     ret)
+{
+    NetapiNwalTransInfo_t * p_trans;
+    NETAPI_NWAL_LOCAL_CONTEXT_T *p_local=NULL;
+
+    if(trans_id == NWAL_TRANSID_SPIN_WAIT)
+    {
+        netapi_get_proc_global()->nwal_context.numBogusTransIds++;
+        return;
+    }
+
+    p_trans= &netapi_get_proc_global()->nwal_context.transInfos[trans_id];
+    p_local =&((NETAPI_HANDLE_T*) (p_trans->netapi_handle))->nwal_local;
+
+    if(ret != nwal_OK)
+    {
+        // update error code that is fialed  in p_trans */
+        //todo: atomic inc
+        p_trans->state = NETAPI_NWAL_HANDLE_STATE_ERR;
+        netapi_get_proc_global()->nwal_context.numCmdFail++;
+    }
+    else
+    {
+        //todo: atomic inc
+        netapi_get_proc_global()->nwal_context.numCmdPass++;
+        switch(p_trans->transType)
+        {
+            case NETAPI_NWAL_HANDLE_TRANS_MAC:
+            {
+                if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_OPEN;
+                }
+                else if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_IDLE;
+                }
+                break;
+            }
+            case NETAPI_NWAL_HANDLE_TRANS_IP:
+            {
+                 if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING)
+                {
+                    p_trans->state = NETAPI_NWAL_HANDLE_STATE_OPEN;
+                }
+                else if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_IDLE;
+                }
+                break;
+            }
+            case NETAPI_NWAL_HANDLE_TRANS_PORT:
+            {
+                if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_OPEN;
+                }
+                else if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_IDLE;
+                }
+                break;
+            }
+            case NETAPI_NWAL_HANDLE_TRANS_SA:
+            {
+                if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_OPEN;
+                }
+                else if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_IDLE;
+                }
+                break;
+            }
+            case NETAPI_NWAL_HANDLE_TRANS_SA_POLICY:
+            {
+                if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_OPEN_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_OPEN;
+                }
+                else if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_CLOSE_PENDING)
+                {
+                    p_trans->state =NETAPI_NWAL_HANDLE_STATE_IDLE;
+                }
+                break;
+            }
+            default:
+            {
+                break;
+            }
+        }
+    }
+
+    p_local->numPendingCfg--;
+
+    if(p_trans->state == NETAPI_NWAL_HANDLE_STATE_IDLE)
+    {
+        p_trans->inUse = nwal_FALSE;
+    }
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  NETAPI internal function, PA stats reply callback
+ ********************************************************************
+ * DESCRIPTION:  NETAPI internal function, PA stats reply callback
+ ********************************************************************/
+void netapip_netcpCfgNWALCmdPaStatsReply(nwal_AppId        appHandle,
+                                nwal_TransID_t    trans_id,
+                                paSysStats_t      *stats)
+{
+    NetapiNwalTransInfo_t * p_trans;
+    NETAPI_NWAL_LOCAL_CONTEXT_T *p_local=NULL;
+
+    if(trans_id == NWAL_TRANSID_SPIN_WAIT)
+    {
+        netapi_get_proc_global()->nwal_context.numBogusTransIds++;
+        return;
+    }
+
+    p_trans= &netapi_get_proc_global()->nwal_context.transInfos[trans_id];
+    p_trans->inUse = nwal_FALSE;
+    p_local =&((NETAPI_HANDLE_T*) (p_trans->netapi_handle))->nwal_local;
+
+    //save a local copy  of some stuff*/
+    p_local->numL2PktsRecvd=stats->classify1.nPackets;
+    p_local->numL3PktsRecvd=stats->classify1.nIpv4Packets;
+
+    //callout result to application !!
+    if (p_local->stats_cb)
+    {
+        (*p_local->stats_cb)(p_trans->netapi_handle,stats);
+    }
+}
+
diff --git a/ti/runtime/netapi/src/pdkv2/netapi_navig.c b/ti/runtime/netapi/src/pdkv2/netapi_navig.c
new file mode 100755
index 0000000..35069b5
--- /dev/null
+++ b/ti/runtime/netapi/src/pdkv2/netapi_navig.c
@@ -0,0 +1,303 @@
+/************************************************
+*  FILE:  netapi_device.c
+ *  Device specific initialization for NETAPI
+ *
+ * DESCRIPTION: Functions to initialize multicore navigator related global
+ *              resources
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ***********************************************/
+
+#include "netapi.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <ti/csl/cslr_device.h>
+#include <ti/drv/qmss/qmss_qm.h>
+
+//pull in device config for qmss, cppi
+#include "qmss_device.c"
+#include "cppi_device.c"
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI macro to convert to IP Register
+ *                    Virtual Address from a mapped base Virtual
+ *                    Address.
+ ********************************************************************
+ * DESCRIPTION:  Arguments:
+ *      virtBaseAddr: Virtual base address mapped using mmap for IP
+ *       phyBaseAddr: Physical base address for the IP
+ *       phyRegAddr:  Physical register address
+ ********************************************************************/
+
+
+static inline void* NETAPI_GET_REG_VADDR (void *    virtBaseAddr,
+                                          uint32_t  phyBaseAddr,
+                                          uint32_t  phyRegAddr)
+{
+    return((void *)((uint8_t *)virtBaseAddr + (phyRegAddr - phyBaseAddr)));
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAI function ti initialize CPPI. 
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAI function ti initialize CPPI
+ ********************************************************************/
+int netapip_initCppi(void* rmClientServiceHandle)
+{
+    int32_t result, i;
+    Cppi_GlobalConfigParams     netapi_cppiGblCfgParams[CPPI_MAX_CPDMA];
+    Cppi_StartCfg               netapi_cppiStartCfg;
+
+    memset(&netapi_cppiStartCfg, 0, sizeof(Cppi_StartCfg));
+
+    for (i=0; i<CPPI_MAX_CPDMA; i++)
+        netapi_cppiGblCfgParams[i] = cppiGblCfgParams[i];
+
+    /* SRIO CPDMA regs */
+    netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].gblCfgRegs =
+     NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
+                        CSL_SRIO_CONFIG_REGS,
+                        (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].gblCfgRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txChRegs =
+     NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
+                          CSL_SRIO_CONFIG_REGS,
+                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxChRegs =
+     NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
+                          CSL_SRIO_CONFIG_REGS,
+                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txSchedRegs =
+     NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
+                          CSL_SRIO_CONFIG_REGS,
+                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].txSchedRegs);
+
+   netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxFlowRegs =
+     NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->srioCfgVaddr,
+                          CSL_SRIO_CONFIG_REGS,
+                          (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_SRIO_CPDMA].rxFlowRegs);
+
+    /* PASS CPDMA regs */
+    netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].gblCfgRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                           CSL_PA_SS_CFG_REGS,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].gblCfgRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txChRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                           CSL_PA_SS_CFG_REGS,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxChRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                           CSL_PA_SS_CFG_REGS,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txSchedRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                           CSL_PA_SS_CFG_REGS,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].txSchedRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxFlowRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                           CSL_PA_SS_CFG_REGS,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_PASS_CPDMA].rxFlowRegs);
+
+   /* QMSS CPDMA regs */
+    netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txChRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxChRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxChRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txSchedRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].txSchedRegs);
+
+    netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_cppiGblCfgParams[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs);
+
+    result = Cppi_init (netapi_cppiGblCfgParams);
+    if (result != CPPI_SOK)
+    {
+      return (-1);
+    }
+    if (rmClientServiceHandle)
+    {
+      netapi_cppiStartCfg.rmServiceHandle = rmClientServiceHandle;
+      Cppi_startCfg(&netapi_cppiStartCfg);
+    }
+     return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAI function ti initialize QM. 
+ ********************************************************************
+ * DESCRIPTION:  Internal NETAI function ti initialize QM (once per SOC)
+ ********************************************************************/
+int netapip_initQm(int max_descriptors, void* rmClientServiceHandle))
+{
+    Qmss_InitCfg     qmssInitConfig;
+    int32_t          result;
+    Qmss_GlobalConfigParams netapi_qmssGblCfgParams;
+
+    memset (&qmssInitConfig, 0, sizeof (Qmss_InitCfg));
+
+    /* Use Internal Linking RAM for optimal performance */
+    qmssInitConfig.linkingRAM0Base = 0;
+    qmssInitConfig.linkingRAM0Size = 0;
+    qmssInitConfig.linkingRAM1Base = 0;
+    qmssInitConfig.maxDescNum      = max_descriptors;
+    qmssInitConfig.qmssHwStatus =QMSS_HW_INIT_COMPLETE; //bypass some of the hw init
+    netapi_qmssGblCfgParams = qmssGblCfgParams[0];
+
+    netapi_qmssGblCfgParams.qmConfigReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmConfigReg);
+
+    netapi_qmssGblCfgParams.qmDescReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmDescReg);
+
+    netapi_qmssGblCfgParams.qmQueMgmtReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmQueMgmtReg);
+
+    netapi_qmssGblCfgParams.qmQueMgmtProxyReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmQueMgmtProxyReg);
+
+    netapi_qmssGblCfgParams.qmQueStatReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmQueStatReg);
+
+    netapi_qmssGblCfgParams.qmQueIntdReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmQueIntdReg);
+
+    netapi_qmssGblCfgParams.qmPdspCmdReg[0] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspCmdReg[0]);
+
+    netapi_qmssGblCfgParams.qmPdspCmdReg[1] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspCmdReg[1]);
+
+    netapi_qmssGblCfgParams.qmPdspCtrlReg[0] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspCtrlReg[0]);
+
+    netapi_qmssGblCfgParams.qmPdspCtrlReg[1] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspCtrlReg[1]);
+
+    netapi_qmssGblCfgParams.qmPdspIRamReg[0] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspIRamReg[0]);
+
+    netapi_qmssGblCfgParams.qmPdspIRamReg[1] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmPdspIRamReg[1]);
+
+    netapi_qmssGblCfgParams.qmStatusRAM =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmStatusRAM);
+
+    netapi_qmssGblCfgParams.qmLinkingRAMReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmLinkingRAMReg);
+
+    netapi_qmssGblCfgParams.qmMcDMAReg =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmMcDMAReg);
+
+    netapi_qmssGblCfgParams.qmTimer16Reg[0] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[0]);
+
+    netapi_qmssGblCfgParams.qmTimer16Reg[1] =
+      NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                           QMSS_CFG_BASE_ADDR,
+                           (uint32_t)netapi_qmssGblCfgParams.qmTimer16Reg[1]);
+
+    netapi_qmssGblCfgParams.qmQueMgmtDataReg = 
+                                                      (void *)((uint32_t)netapi_VM_VirtAddr->qmssDataVaddr);
+
+
+    if (rmClientServiceHandle)
+        netapi_qmssGblCfgParams.qmRmServiceHandle = rmClientServiceHandle;
+
+    netapi_qmssGblCfgParams.qmQueMgmtProxyDataReg = NULL;
+    result = Qmss_init (&qmssInitConfig, &netapi_qmssGblCfgParams);
+    if (result != QMSS_SOK)  {
+        return (nwal_FALSE);
+    }
+    return 1;
+}
diff --git a/ti/runtime/netapi/src/pdkv3/netapi_navig.c b/ti/runtime/netapi/src/pdkv3/netapi_navig.c
new file mode 100755
index 0000000..11ed60e
--- /dev/null
+++ b/ti/runtime/netapi/src/pdkv3/netapi_navig.c
@@ -0,0 +1,267 @@
+/************************************************
+*  FILE:  netapi_device.c
+ *  Device specific initialization for NETAPI
+ *
+ * DESCRIPTION: Functions to initialize multicore navigator related global
+ *              resources
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ***********************************************/
+
+#include "netapi.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <ti/csl/cslr_device.h>
+#include <ti/drv/qmss/qmss_qm.h>
+
+//pull in device config for qmss, cppi
+
+
+extern Qmss_GlobalConfigParams qmssGblCfgParams;
+extern Cppi_GlobalConfigParams cppiGblCfgParams;
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal NETAPI macro to convert to IP Register
+ *                    Virtual Address from a mapped base Virtual
+ *                    Address.
+ ********************************************************************
+ * DESCRIPTION:  Arguments:
+ *      virtBaseAddr: Virtual base address mapped using mmap for IP
+ *       phyBaseAddr: Physical base address for the IP
+ *       phyRegAddr:  Physical register address
+ ********************************************************************/
+static inline void* NETAPI_GET_REG_VADDR (void *    virtBaseAddr,
+                                          uint32_t  phyBaseAddr,
+                                          uint32_t  phyRegAddr)
+{
+    return((void *)((uint8_t *)virtBaseAddr + (phyRegAddr - phyBaseAddr)));
+}
+
+
+/*****************************************************************************
+ * FUNCTION PURPOSE: Global Initialization of CPPI. Once Per System
+ *****************************************************************************
+ * DESCRIPTION: The function will initialize the CPPI
+ *****************************************************************************/
+int netapip_initCppi(void* rmClientServiceHandle)
+{
+
+    int32_t                         result;
+    Cppi_GlobalConfigParams         netapi_cppiGblCfgParams;
+    Cppi_StartCfg               netapi_cppiStartCfg;
+
+    memset(&netapi_cppiStartCfg, 0, sizeof(Cppi_StartCfg));
+    netapi_cppiGblCfgParams = cppiGblCfgParams;
+
+    /* PASS CPDMA regs */
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].gblCfgRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                             CSL_NETCP_CFG_REGS,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].gblCfgRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txChRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                                     CSL_NETCP_CFG_REGS,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txChRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxChRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                                     CSL_NETCP_CFG_REGS,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxChRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txSchedRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                                     CSL_NETCP_CFG_REGS,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].txSchedRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxFlowRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->passCfgVaddr,
+                                     CSL_NETCP_CFG_REGS,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_PASS_CPDMA].rxFlowRegs);
+
+    /* QMSS CPDMA regs */
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+                             CSL_QMSS_CFG_BASE,
+                             (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].gblCfgRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txChRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+        (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txChRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxChRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+        (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxChRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txSchedRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+        (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].txSchedRegs);
+
+    netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+        (uint32_t)netapi_cppiGblCfgParams.cpDmaCfgs[Cppi_CpDma_QMSS_CPDMA].rxFlowRegs);
+
+    result = Cppi_init (&netapi_cppiGblCfgParams);
+    if (result != CPPI_SOK)  {
+        return (-1);
+    }
+
+    if (rmClientServiceHandle)
+    {
+      netapi_cppiStartCfg.rmServiceHandle = rmClientServiceHandle;
+      Cppi_startCfg(&netapi_cppiStartCfg);
+    }
+
+    return (1);
+}
+
+/*****************************************************************************
+ * FUNCTION PURPOSE: Global Initialization of Queue Manager. Once Per System
+ *****************************************************************************
+ * DESCRIPTION: The function will initialize the Queue Manager
+ *****************************************************************************/
+int netapip_initQm(int max_descriptors, void* rmClientServiceHandle)
+{
+    Qmss_InitCfg              qmssInitConfig;
+    int32_t                   result;
+    Qmss_GlobalConfigParams   netapi_qmssGblCfgParams;
+    uint32_t                  count;
+
+    memset (&qmssInitConfig, 0, sizeof (Qmss_InitCfg));
+
+    /* Use Internal Linking RAM for optimal performance */
+    qmssInitConfig.linkingRAM0Base = 0;
+    qmssInitConfig.linkingRAM0Size = 0;
+    qmssInitConfig.linkingRAM1Base = 0;
+    qmssInitConfig.maxDescNum      = max_descriptors;
+    qmssInitConfig.qmssHwStatus = QMSS_HW_INIT_COMPLETE;
+
+    netapi_qmssGblCfgParams = qmssGblCfgParams;
+
+    /* Convert address to Virtual address */
+    for(count=0;count < netapi_qmssGblCfgParams.maxQueMgrGroups;count++)
+    {
+        netapi_qmssGblCfgParams.groupRegs[count].qmConfigReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmConfigReg);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmDescReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmDescReg);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtReg);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyReg);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmQueStatReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueStatReg);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmStatusRAM =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmStatusRAM);
+
+        netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtDataReg =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssDataVaddr,
+            CSL_QMSS_DATA_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtDataReg);
+
+       netapi_qmssGblCfgParams.groupRegs[count].qmQueMgmtProxyDataReg = NULL;
+    }
+
+    for(count=0;count < QMSS_MAX_INTD;count++)
+    {
+        netapi_qmssGblCfgParams.regs.qmQueIntdReg[count] =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.regs.qmQueIntdReg[count]);
+    }
+
+    for(count=0;count < QMSS_MAX_PDSP;count++)
+    {
+        netapi_qmssGblCfgParams.regs.qmPdspCmdReg[count] =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.regs.qmPdspCmdReg[count]);
+
+        netapi_qmssGblCfgParams.regs.qmPdspCtrlReg[count] =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.regs.qmPdspCtrlReg[count]);
+
+        netapi_qmssGblCfgParams.regs.qmPdspIRamReg[count] =
+            NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+            CSL_QMSS_CFG_BASE,
+           (uint32_t)netapi_qmssGblCfgParams.regs.qmPdspIRamReg[count]);
+    }
+
+    netapi_qmssGblCfgParams.regs.qmLinkingRAMReg =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+       (uint32_t)netapi_qmssGblCfgParams.regs.qmLinkingRAMReg);
+
+    netapi_qmssGblCfgParams.regs.qmBaseAddr =
+        NETAPI_GET_REG_VADDR(netapi_VM_VirtAddr->qmssCfgVaddr,
+        CSL_QMSS_CFG_BASE,
+       (uint32_t)netapi_qmssGblCfgParams.regs.qmBaseAddr);
+
+    if (rmClientServiceHandle)
+        netapi_qmssGblCfgParams.qmRmServiceHandle = rmClientServiceHandle;
+
+    result = Qmss_init (&qmssInitConfig, &netapi_qmssGblCfgParams);
+    if (result != QMSS_SOK)
+    {
+        return (nwal_FALSE);
+    }
+    return 1;
+}
diff --git a/ti/runtime/netapi/src/pktio.c b/ti/runtime/netapi/src/pktio.c
new file mode 100755
index 0000000..64e38e9
--- /dev/null
+++ b/ti/runtime/netapi/src/pktio.c
@@ -0,0 +1,1310 @@
+/*********************************
+ * FILE: pktio.c
+ * PURPOSE: pktio library for NETAPI
+ **************************************************************
+ * FILE:  pktio.c
+ * 
+ * DESCRIPTION:  pktio source file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ********************************/
+
+#include <unistd.h>
+#include "netapi.h"
+#include "pktio.h"
+#include <ti/csl/csl_qm_queue.h>
+
+
+
+/*This defines the maximum number of packets to receive in one pktio poll */
+#define PKTIO_MAX_RECV  (TUNE_NETAPI_MAX_BURST_RCV)
+
+extern NETAPI_SHM_T* pnetapiShm;
+
+
+/* Utilites*/
+static PKTIO_HANDLE_T * netapip_pktioGetFreeChannelSlot(NETAPI_T n)
+{
+    NETAPI_HANDLE_T *p_handle;
+    PKTIO_HANDLE_T ** pp = (PKTIO_HANDLE_T **) netapi_get_pktio_list(n);
+    int i;
+    p_handle = (NETAPI_HANDLE_T*) n;
+    p_handle->spinLock.lock(&pnetapiShm->netapi_pktio_lock);
+    for(i=0;i<NETAPI_MAX_PKTIO;i++)
+    {
+        if (pp[i]->inuse != PKTIO_INUSE)
+        {
+            pp[i]->inuse = PKTIO_INUSE;
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_pktio_lock);
+            return  pp[i];
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_pktio_lock);
+    return NULL;
+}
+
+
+/*Optimized send functions */
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum,ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum,ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                            Ti_Pkt *pkt,
+                                            PKTIO_METADATA_T *m,
+                                            int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+    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_mCmdSetL4CkSumCrypPort(pkt,
+                                    &p->tx_psCmdInfo,
+                                    pTxPktInfo->l4OffBytes, 
+                                    pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
+                                    pTxPktInfo->pseudoHdrChecksum, 
+                                    pTxPktInfo->saOffBytes, 
+                                    pTxPktInfo->saPayloadLen, 
+                                    swInfo0, 
+                                    swInfo1,
+                                    pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                     Ti_Pkt *pkt,
+                                     PKTIO_METADATA_T *m,
+                                     int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+
+    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(pkt,
+                             &p->tx_psCmdInfo,
+                              pTxPktInfo->saOffBytes,
+                              pTxPktInfo->saPayloadLen,
+                              swInfo0,
+                              swInfo1,
+                              pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L3 checksum, ESP Crypto and outgoing EMAC port
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L3 checksum, ESP Crypto and outgoing EMAC port
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL3CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                     Ti_Pkt *pkt,
+                                     PKTIO_METADATA_T *m,
+                                     int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+    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_mCmdSetL3CkSumCrypPort(pkt,
+                                    &p->tx_psCmdInfo,
+                                    pTxPktInfo->saOffBytes,
+                                    pTxPktInfo->saPayloadLen,
+                                    swInfo0,
+                                    swInfo1,
+                                    pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+
+
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum,AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ *******************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum,AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumAHCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                              Ti_Pkt *pkt,
+                                              PKTIO_METADATA_T *m,
+                                              int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+    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_mCmdSetL4CkSumAHCrypPort(pkt,
+                                &p->tx_psCmdInfo,
+                                pTxPktInfo->l4OffBytes, 
+                                pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
+                                pTxPktInfo->pseudoHdrChecksum, 
+                                pTxPktInfo->saOffBytes, 
+                                pTxPktInfo->saPayloadLen, 
+                                swInfo0, 
+                                swInfo1,
+                                pTxPktInfo->saAhIcvOffBytes,
+                                pTxPktInfo->saAhMacSize,
+                                pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendAHCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                       Ti_Pkt *pkt,
+                                       PKTIO_METADATA_T *m,
+                                       int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+
+    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(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);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+       *err= NETAPI_ERR_BAD_INPUT;
+       return -1;
+    }
+    return 1;
+}
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum and outgoing EMAC port 
+ * to NetCP command.
+ *******************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumPort(struct PKTIO_HANDLE_tag * pp,
+                                      Ti_Pkt *pkt,
+                                      PKTIO_METADATA_T *m,
+                                      int * err)
+{
+
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+
+    nwal_mCmdSetL4CkSumPort(pkt,
+                            &p->tx_psCmdInfo,
+                            pTxPktInfo->l4OffBytes,
+                            pTxPktInfo->l4HdrLen + pTxPktInfo->ploadLen,
+                            pTxPktInfo->pseudoHdrChecksum,
+                            pTxPktInfo->enetPort);
+
+    pPloadDesc = Pktlib_getDescFromPacket(pkt);
+    pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+    Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    return 1;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for outgoing EMAC port to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for outgoing EMAC port to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendPort(struct PKTIO_HANDLE_tag * pp,
+                                Ti_Pkt *pkt, 
+                                PKTIO_METADATA_T *m, 
+                                int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    
+    nwal_mCmdSetPort(pkt,
+                     &p->tx_psCmdInfo,
+                     pTxPktInfo->enetPort);
+    pPloadDesc = Pktlib_getDescFromPacket(pkt);
+    pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+    Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    *err = NETAPI_ERR_OK;
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via IPC queue
+ ********************************************************************
+ * DESCRIPTION: Send packet via IPC queue
+ ********************************************************************/
+static int netapip_pktioSendIpc(struct PKTIO_HANDLE_tag * pp,
+                               Ti_Pkt *pkt,
+                               PKTIO_METADATA_T *m,
+                               int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    Qmss_queuePushDesc (p->q, (void*)pkt);
+    *err = NETAPI_ERR_OK;
+    return 1;
+}
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet to NETCP via NWAL
+ ********************************************************************
+ * DESCRIPTION: Send packet to NETCP via NWAL
+ ********************************************************************/
+static int netapip_pktioSendNwal(struct PKTIO_HANDLE_tag * pp,
+                                Ti_Pkt *pkt,
+                                PKTIO_METADATA_T *m,
+                                int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t * pPktInfo=m->u.tx_meta;
+    nwal_RetValue res;
+    pPktInfo->pPkt = pkt;
+    res=nwal_send(p->nwalInstanceHandle, m->sa_handle,pPktInfo);
+    if (res != nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_TX_ERR -res;
+        return -1;
+    }
+    *err=NETAPI_ERR_OK;
+    return 1;
+}
+
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet to SA via NWAL
+ ********************************************************************
+ * DESCRIPTION: Send packet to NETCP via NWAL for side band data mode 
+ * channel via NWAL
+ ********************************************************************/
+static int netapip_pktioSendSb(struct PKTIO_HANDLE_tag * pp,
+                              Ti_Pkt *pkt, 
+                              PKTIO_METADATA_T *m, 
+                              int * err)
+{
+
+    nwal_RetValue nwalRetVal;
+    nwalTxDmPSCmdInfo_t     *dmPSCmdInfo;
+    nwalLocCxtInfo_t    nwalLocCxt;
+    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;
+
+    dmPSCmdInfo = netapip_netcpCfgGetSaSBInfo(&netapi_get_global()->nwal_context, tunnel_id);
+    if (dmPSCmdInfo)
+    {
+        nwalRetVal = nwal_getLocCxtInfo(pktio_mGetNwalInstance(p),&info);
+        if(nwalRetVal == nwal_OK)
+        {
+            dmPSCmdInfo->rxSbSaQ = info.rxSbSaQ;
+        }
+        else
+        {
+            *err=NETAPI_ERR_BAD_INPUT;
+            return -1;
+        }
+        nwal_mCmdDMUpdate(pkt,
+            dmPSCmdInfo,
+            pPktInfoSB->appCtxId,
+            pPktInfoSB->encOffset,
+            pPktInfoSB->encSize,
+            pPktInfoSB->pEncIV,
+            pPktInfoSB->authOffset,
+            pPktInfoSB->authSize,
+            pPktInfoSB->pAuthIV,
+            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,
+                                             pPloadDesc,
+                                             NWAL_DESC_SIZE); 
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION: Send packet via infrastructure DMA channel
+ ********************************************************************/
+static int netapip_pktioSendIfdma(struct PKTIO_HANDLE_tag * pp,
+                                 Ti_Pkt *pkt, 
+                                 PKTIO_METADATA_T *m, 
+                                 int * err)
+{
+        Cppi_DescTag            tag={0};
+        Cppi_HostDesc*          pPloadDesc;
+        PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+        *err=0;
+        tag.srcTagLo = m->u.tx_ifdma_dest;
+        Cppi_setTag (Cppi_DescType_HOST, (Cppi_Desc *)pkt, &tag);
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->q,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+        return 1;
+}
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Stub function for send, do nothing.
+ ********************************************************************
+ * DESCRIPTION: Stub function for send, do nothing.
+ ********************************************************************/
+static int netapip_pktioSendDummy(struct PKTIO_HANDLE_tag * p,
+                                 Ti_Pkt *pkt, 
+                                 PKTIO_METADATA_T *m, 
+                                 int * err)
+{
+    *err =  NETAPI_ERR_BAD_INPUT;
+    return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Stub function for poll, do nothing.
+ ********************************************************************
+ * DESCRIPTION: Stub function for send, do nothing.
+ ********************************************************************/
+static int netapip_pktioPollDummy(struct PKTIO_HANDLE_tag * p, 
+                                 PKTIO_POLL_T * p_poll_cfg,
+                                 int * err)
+{
+    *err= NETAPI_ERR_BAD_INPUT;
+    return 0;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll IPC queue
+ ********************************************************************
+ * DESCRIPTION: Poll IPC queue
+ ********************************************************************/
+static int netapip_pktioPollIpc(struct PKTIO_HANDLE_tag * pp, 
+                               PKTIO_POLL_T * p_poll_cfg,  
+                               int * err)
+{
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    int r=0;
+    int n;
+    Ti_Pkt * temp;
+    *err=0;
+    n= (p->max_n< PKTIO_MAX_RECV) ? p->max_n : PKTIO_MAX_RECV;
+    for(r=0;r<n;r++)
+    {
+
+        temp=(Ti_Pkt*)(Cppi_HostDesc*)QMSS_DESC_PTR(Qmss_queuePop(p->q));
+
+        if(!temp) break;
+        /* process meta data */
+        pkt_list[r]= temp;
+        meta_s[r].flags1=0x1;
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, 0LL);
+    }
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll nwal data queues for pkts from netcp
+ ********************************************************************
+ * DESCRIPTION: Poll nwal data queues for pkts from netcp
+ ********************************************************************/
+static int netapip_pktioPollNwal(struct PKTIO_HANDLE_tag * pp, 
+                                PKTIO_POLL_T * p_poll_cfg,  
+                                int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    /* Poll for common L2/L3 packets and L4 class pkts (todo-> only do L4 if classifiers are
+        set.  optimizaion maybe? */
+    r=nwal_pollPkt(p->nwalInstanceHandle,
+                   p->poll_flags,
+                   (uint32_t) p,
+                   p->max_n,
+                   QMSS_PARAM_NOT_SPECIFIED,
+                   (void*) NULL);
+    return r;
+}
+/********************************************************************
+ * FUNCTION PURPOSE: Poll nwal sideband queues for pkts from SA
+ ********************************************************************
+ * DESCRIPTION: Poll nwal sideband queues for pkts from SA
+ ********************************************************************/
+static int  netapip_pktioPollSb(struct PKTIO_HANDLE_tag * pp, 
+                               PKTIO_POLL_T * p_poll_cfg,  
+                               int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    r=nwal_pollDm(p->nwalInstanceHandle,
+                    nwal_POLL_DM_DEF_SB_SA_Q,
+                     (uint32_t) p,
+                     p->max_n,
+                     QMSS_PARAM_NOT_SPECIFIED,
+             (void *) NULL);
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll application provided NETCP RX queue
+ ********************************************************************
+ * DESCRIPTION: Poll application provided NETCP RX queue
+ ********************************************************************/
+static int netapip_pktioPollNwalAdj(struct PKTIO_HANDLE_tag * pp, 
+                                   PKTIO_POLL_T * p_poll_cfg,  
+                                   int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    /* Poll for common L2/L3 packets and L4 class pkts (todo-> only do L4 if classifiers are
+         set. optimizaion maybe? */
+    r=nwal_pollPkt(p->nwalInstanceHandle,
+                   nwal_POLL_APP_MANAGED_PKT_Q,
+                   (uint32_t) p,
+                   p->max_n,
+                   p->q,
+                   (void *) NULL);
+
+    return r;
+}
+
+/*************************************************************************
+ * FUNCTION PURPOSE: Poll application defined sideband queues for packets
+ *                   from SA
+ ************************************************************************
+ * DESCRIPTION: Poll application defined sideband queues for packets
+ *                   from SA
+ *************************************************************************/
+static int  netapip_pktioPollSbAdj(struct PKTIO_HANDLE_tag * pp, 
+                                  PKTIO_POLL_T * p_poll_cfg,  
+                                  int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    r=nwal_pollDm(p->nwalInstanceHandle,
+                     nwal_POLL_DM_APP_MANAGED_Q,
+                     (uint32_t) p,
+                     p->max_n,
+                     p->q,
+                     (void *)  NULL);
+    return r;
+}
+
+/*-----------------------MAIN API----------------------*/
+/********************************************************************
+ * FUNCTION PURPOSE:  API creates a NETAPI PKTIO channel 
+ ********************************************************************
+ * DESCRIPTION:  API creates a NETAPI PKTIO channel 
+ ********************************************************************/
+PKTIO_HANDLE_T * netapi_pktioCreate(NETAPI_T n,
+                                    char * name,
+                                    PKTIO_CB cb, 
+                                    PKTIO_CFG_T * p_cfg, 
+                                    int * err)
+{
+    int r = 0;
+    PKTIO_HANDLE_T *p;
+    uint8_t         isAllocated;
+
+    *err=0;
+    int q = QMSS_PARAM_NOT_SPECIFIED;
+
+    int qtype = Qmss_QueueType_GENERAL_PURPOSE_QUEUE;
+
+    if(p_cfg == NULL)
+    {
+        *err = NETAPI_ERR_BAD_INPUT;
+        return NULL;
+    }
+    /* over-ride only for Qmss_QueueType_GIC400_QUEUE */
+    if (p_cfg->queueType == Qmss_QueueType_GIC400_QUEUE)
+        qtype = p_cfg->queueType;
+
+    if ((!p_cfg)||(!name)) {*err=NETAPI_ERR_BAD_INPUT; return NULL;}
+    if ((p_cfg->flags2 & PKTIO_PKT) &&(p_cfg->flags1& PKTIO_TX)) { *err=NETAPI_ERR_BAD_INPUT; return NULL;};
+    if ((p_cfg->flags2 & PKTIO_SB) &&(p_cfg->flags1& PKTIO_TX)) { *err=NETAPI_ERR_BAD_INPUT; return NULL;};
+
+    /* get a free channel handle */
+    p=netapip_pktioGetFreeChannelSlot(n);
+
+    if (!p) {*err = NETAPI_ERR_NOMEM; return (p); }
+
+    p->back = n;
+    p->cb = cb;
+    p->max_n = p_cfg->max_n;
+    p->_poll=netapip_pktioPollDummy;
+    p->_send=netapip_pktioSendDummy;
+    memcpy((char *)&p->cfg, (char*) p_cfg, sizeof(PKTIO_CFG_T));
+
+    if (p_cfg->qnum!=PKTIO_Q_ANY)
+    {
+        q= p_cfg->qnum;
+    }
+    /* special case for infrastructure dma channels */
+    if (p_cfg->flags2 & PKTIO_IFDMA)
+    {
+        qtype=Qmss_QueueType_INFRASTRUCTURE_QUEUE;
+    }
+
+
+    /* create a  general queue */
+     p->q  = Qmss_queueOpen(qtype,
+                                q, 
+                                &isAllocated);
+    if (p->q < 0)
+    {
+        p->inuse=0;
+        *err= NETAPI_ERR_QLLD;  ///queue lld error
+        return NULL;
+    }
+
+    p->qInfo = Qmss_getQueueNumber(p->q);
+
+    if (p_cfg->flags2 & PKTIO_PKT)
+    {
+        p->use_nwal = PKTIO_4_ADJ_NWAL;
+        p->_poll=netapip_pktioPollNwalAdj;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+    }
+    else if (p_cfg->flags2 & PKTIO_SB)
+    {
+        p->use_nwal = PKTIO_4_ADJ_SB;
+        p->_poll=netapip_pktioPollSbAdj;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+    }
+   else if (p_cfg->flags2 & PKTIO_IFDMA)
+   {
+        p->use_nwal = 0;
+        p->_send = netapip_pktioSendIfdma;
+        p->cfg.flags1=PKTIO_TX;
+        r= netapip_pktioCreateIFDMA(p); //we create the IF DMA channel here
+        if (r<0) 
+        {
+            //trouble -> couldn't set up DMA 
+            //close queue and return failure
+            if (p->q)
+            {
+                Qmss_queueClose(p->q);
+            }
+            p->inuse=0;
+            *err= NETAPI_ERR_QLLD;  ///queue lld error TODO: fix error code 
+            return NULL;
+        }
+   }
+    else
+    {
+        p->use_nwal=0;
+        if (p_cfg->flags1& PKTIO_TX) p->_send=netapip_pktioSendIpc;
+        if (p_cfg->flags1& PKTIO_RX) p->_poll=netapip_pktioPollIpc;
+    }
+
+    /* save name */ 
+    strncpy(p->name,name,
+       strlen(name)<PKTIO_MAX_NAME ?
+               strlen(name):PKTIO_MAX_NAME);   
+
+    /* add name, qnum to global name list */
+    if ((strcmp(name,NETCP_RX)) &&
+        (strcmp(name,NETCP_TX)) &&
+        (strcmp(name,NETCP_SB_RX)) &&
+        (strcmp(name,NETCP_SB_TX)) &&
+        (p_cfg->flags1 & PKTIO_GLOBAL))
+    {
+         //todo: make sure this succeeds..
+        hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        r=netapip_addGlobalPktio(n, name, &p->qInfo);
+        hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+    }
+
+  ((NETAPI_HANDLE_T *)n )->n_pktios+=1;
+   return p;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API opens an existing  NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API opens an existing  NETAPI PKTIO channel
+ ********************************************************************/
+PKTIO_HANDLE_T * netapi_pktioOpen(NETAPI_T  n,
+                                  char *name,
+                                  PKTIO_CB cb,
+                                  PKTIO_CFG_T * p_cfg,
+                                  int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p, *p2;
+    uint8_t         isAllocated;
+    *err=0;
+    Qmss_Queue *p_qnum;
+    int qtype=Qmss_QueueType_GENERAL_PURPOSE_QUEUE;
+
+
+    if ((!p_cfg)||(!name)) {*err=NETAPI_ERR_BAD_INPUT; return NULL;}
+
+    /* get a free channel handle */
+
+    p=netapip_pktioGetFreeChannelSlot(n);
+
+    if (!p) {*err = NETAPI_ERR_NOMEM; return (p); }
+    ((NETAPI_HANDLE_T *)n)->n_pktios+=1;
+
+    p->inuse= PKTIO_INUSE;
+    p->back = n;
+    p->cb = cb;
+    p->max_n = p_cfg->max_n;
+    p->_poll=netapip_pktioPollDummy;
+    p->_send=netapip_pktioSendDummy;
+    memcpy((char *)&p->cfg, (char*) p_cfg, sizeof(PKTIO_CFG_T));
+
+    /* special handling of NETCP_RX, NETCP_TX */
+    if( (!strcmp(name, NETCP_RX)) || (!strcmp(name,NETCP_TX)) )
+    {
+       /* these have already been opened internally, so don't search in global list */
+        p->use_nwal = PKTIO_DEF_NWAL;
+        p->q = 0;  
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        if (!strcmp(name,NETCP_RX))
+        {
+            p->_poll=netapip_pktioPollNwal; 
+            p->poll_flags= nwal_POLL_DEFAULT_GLOB_PKT_Q|
+                                    nwal_POLL_DEFAULT_PER_PROC_PKT_Q;
+        }
+        if (!strcmp(name,NETCP_TX))
+        {
+            p->_send=netapip_pktioSendNwal;
+        }
+    }
+    else if( (!strcmp(name, NETCP_SB_RX)) || (!strcmp(name,NETCP_SB_TX)) )
+    {
+       /* these have already been opened internally, so don't search in global list */
+        p->use_nwal =  PKTIO_DEF_SB;
+        p->q = 0;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        if (!strcmp(name,NETCP_SB_RX)) p->_poll=netapip_pktioPollSb;
+        if (!strcmp(name,NETCP_SB_TX)) p->_send=netapip_pktioSendSb;
+    }
+    else
+    {
+        hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        /* Find queue in global list 
+           Note names like "QUEUE:%d" or IFDMA:%d cause general purpose or
+           IFDMA queues of that number to be opened */
+        if (p_cfg->flags2 & PKTIO_IFDMA)
+        {
+            qtype= Qmss_QueueType_INFRASTRUCTURE_QUEUE;
+        }
+
+        hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+        p_qnum = netapip_findGlobalPktio(n, name);
+
+        if (!p_qnum ) 
+        {
+            p->inuse=0;
+            *err= NETAPI_ERR_NOTFOUND;  ///queue lld error
+            return NULL;
+      }
+
+        /* open a general queue (for now). use qnum that was just found */
+         p->q  = Qmss_queueOpen(qtype,
+                           (p_qnum->qNum&0xfff)| (p_qnum->qMgr<<12),
+                           &isAllocated);
+        if (p->q == (Qmss_QueueHnd) NULL)
+        {
+            p->inuse=0;
+            *err= NETAPI_ERR_QLLD;  ///queue lld error
+            return NULL;
+        }
+        p->qInfo = Qmss_getQueueNumber(p->q);
+        if (p_cfg->flags2 & PKTIO_PKT)
+        {
+           p->use_nwal = PKTIO_4_ADJ_NWAL;  //additonal RX q for nwal
+           p->_poll = netapip_pktioPollNwalAdj;
+           p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n); 
+        } 
+        else if (p_cfg->flags2 & PKTIO_SB)
+        {
+           p->use_nwal = PKTIO_4_ADJ_SB;  //additional RX q for sideband with NWAL
+           p->_poll = netapip_pktioPollSbAdj;
+           p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        }
+        else if (p_cfg->flags2 & PKTIO_IFDMA)
+        {
+            p->_send= netapip_pktioSendIfdma;
+            p->use_nwal = 0;
+        }
+        else
+        {
+           p->use_nwal=0; //not handled by nwal
+            if (p_cfg->flags1& PKTIO_TX) p->_send=netapip_pktioSendIpc;
+            if (p_cfg->flags1& PKTIO_RX) p->_poll=netapip_pktioPollIpc;
+        }
+    }
+
+        /* save name */
+        strncpy(p->name,name,
+           strlen(name)<PKTIO_MAX_NAME ?
+                   strlen(name):PKTIO_MAX_NAME);
+
+    return p;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API controls an existing NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API controls an existing NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioControl(PKTIO_HANDLE_T * p,
+                         PKTIO_CB cb,
+                         PKTIO_CFG_T * p_cfg,
+                         PKTIO_CONTROL_T * p_control,
+                         int *err)
+{
+    nwal_RetValue       nwalRetVal;
+    if (!p)
+    {
+        *err= NETAPI_ERR_BAD_INPUT; 
+        return;
+    }
+    if (cb) 
+    {
+        p->cb = cb;
+    }
+    if (p_control)
+    {
+        /* todo: check for validity, eg don't allow clear of NETCP TX queues */
+        /* todo: implement divert */
+        switch(p_control->op)
+        {
+            //clear the queue
+            case(PKTIO_SET_POLL_FLAGS):
+                p->poll_flags=p_control->poll_flags;
+                break;
+            case(PKTIO_CLEAR):
+                netapip_zapQ(p->q);
+                break;
+            case (PKTIO_UPDATE_FAST_PATH):
+                if (p_cfg)
+                {
+                    nwalRetVal = nwal_initPSCmdInfo(p->nwalInstanceHandle, 
+                                                            p_cfg->fast_path_cfg.txPktInfo,
+                                                            &p->tx_psCmdInfo);
+                    if (nwalRetVal == nwal_OK)
+                    {
+                        switch (p_cfg->fast_path_cfg.fp_send_option)
+                        {
+                            case (PKTIO_FP_ESP_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumCryptPort;
+                                break;
+                            case (PKTIO_FP_AH_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumAHCryptPort;
+                                break;
+                            case (PKTIO_FP_ESP_PORT):
+                                p->_send = netapip_pktioSendCryptPort;
+                                break;
+                            case (PKTIO_FP_ESP_L3CKSUM_PORT):
+                                p->_send = netapip_pktioSendL3CkSumCryptPort;
+                                break;
+                            case (PKTIO_FP_AH_PORT):
+                                p->_send = netapip_pktioSendAHCryptPort;
+                                break;
+                            case (PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT):
+                                p->_send = netapip_pktioSendPort;
+                                break;
+                            case (PKTIO_FP_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumPort;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    else
+                    {
+                        *err = NETAPI_ERR_BAD_INPUT;
+                    }
+                }
+                else
+                {
+                    *err = NETAPI_ERR_BAD_INPUT;
+                }
+                break;
+            case (PKTIO_UPDATE_MAX_PKTS_PER_POLL):
+                if (p_cfg)
+                {
+                    p->max_n = p_cfg->max_n;
+                }
+                else
+                {
+                    *err = NETAPI_ERR_BAD_INPUT;
+                }
+                break;
+            case(PKTIO_DIVERT):
+            default:
+                *err= NETAPI_ERR_NOT_IMPLEMENTED;
+                break;
+        }
+    }
+
+    *err = NETAPI_ERR_OK;
+    return;
+}
+/********************************************************************
+ * FUNCTION PURPOSE:  API closes a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API closes a NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioClose(PKTIO_HANDLE_T * p, 
+                       int * err)
+{
+    if(!p)
+    {
+        *err=1;
+        return;
+    }
+    *err=0;
+    if (p->q)
+    {
+        Qmss_queueClose(p->q);
+    }
+    p->q=-1;
+    p->inuse=0;
+    ((NETAPI_HANDLE_T *)p->back)->n_pktios-=1;
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API deletes a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API deletes a NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioDelete(PKTIO_HANDLE_T * p, 
+                        int * err)
+{
+    if(!p)
+    {
+        *err=1;
+        return;
+    }
+    *err=0;
+    if (p->cfg.flags2 & PKTIO_IFDMA)
+    {
+        netapip_pktioDeleteIFDMA(p);
+    }
+
+        /* remove from name list */
+    hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        netapi_del_global_pktio((NETAPI_HANDLE_T *)p->back, p->name);
+    hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+        if((p->use_nwal != PKTIO_DEF_NWAL) && (p->use_nwal != PKTIO_DEF_SB)) 
+    {
+                netapip_zapQ(p->q);   //since we are deleting, zap the queue 
+            Qmss_queueClose(p->q);
+    }
+    p->q=-1;
+    p->inuse=0;
+    ((NETAPI_HANDLE_T *)p->back)->n_pktios-=1;
+    return ;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API sends multiple packets to a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API sends multiple packets to a NETAPI PKTIO channel
+ ********************************************************************/
+int netapi_pktioSendMulti(PKTIO_HANDLE_T * p, 
+                          Ti_Pkt * pkt[], 
+                          PKTIO_METADATA_T * m[], 
+                          int np, 
+                          int* err)
+{
+    int r=0;
+    for(r=0;r<np;r++)
+    {
+        p->_send((struct PKTIO_HANDLE_tag *)p, (Ti_Pkt *)pkt, (PKTIO_METADATA_T *)m, err);
+    }
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API polls all NETAPI PKTIO channels associated with NETAPI_T
+ * instance for received packets
+ ********************************************************************
+ * DESCRIPTION:  API polls all NETAPI PKTIO channels associated with NETAPI_T
+ * instance for received packets
+ ********************************************************************/
+int netapi_pktioPollAll(NETAPI_T  handle, 
+                        PKTIO_POLL_T * p_poll_cfg, 
+                        int *err)
+{
+    int i=0;
+    int r=0;
+    int err2;
+    int cnt=0;
+    PKTIO_HANDLE_T **pp =( PKTIO_HANDLE_T **)  netapi_get_pktio_list(handle);
+    
+    *err=0;
+    for(i=0;i<NETAPI_MAX_PKTIO && cnt < ((NETAPI_HANDLE_T *)handle)->n_pktios;i++)
+    {
+        if (pp[i]->inuse != PKTIO_INUSE) continue;
+        if(!(pp[i]->cfg.flags1&PKTIO_RX)) continue;
+        r+=netapi_pktioPoll(pp[i],  p_poll_cfg,  &err2); cnt+=1;
+        if (err2) { *err = err2; break;}
+    }
+    return r;
+
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to delete a PKTIO infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION:  Internal function to delete a PKTIO infrastructure DMA channel
+ ********************************************************************/
+int netapip_pktioDeleteIFDMA(PKTIO_HANDLE_T *p)
+{
+        Cppi_channelDisable (p->txChHnd);
+        Cppi_channelDisable (p->rxChHnd);
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to create a PKTIO infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION:  Internal function to create a PKTIO infrastructure DMA channel
+ *               for infrastructure DMQ queue
+ ********************************************************************/
+int netapip_pktioCreateIFDMA(PKTIO_HANDLE_T * p )
+{
+   int dmaChan =  p->qInfo.qNum - QMSS_INFRASTRUCTURE_QUEUE_BASE;
+   unsigned char           isAllocated;
+   Cppi_TxChInitCfg        txChCfg;
+   Cppi_RxChInitCfg        rxChCfg;
+   Cppi_CpDmaInitCfg       cpdmaCfg;
+
+    /* Set up QMSS CPDMA configuration */
+    memset ((void *) &cpdmaCfg, 0, sizeof (Cppi_CpDmaInitCfg));
+    cpdmaCfg.dmaNum = Cppi_CpDma_QMSS_CPDMA;
+
+    /* Open QMSS CPDMA */
+    p->cppiHnd = (Cppi_Handle) Cppi_open (&cpdmaCfg);
+    if (p->cppiHnd == NULL)
+    {
+        return -1;
+    }
+
+ /* Set up Tx Channel parameters */
+    memset ((void *) &txChCfg, 0, sizeof (Cppi_TxChInitCfg));
+    txChCfg.channelNum = dmaChan;
+    txChCfg.priority = 0;
+    txChCfg.filterEPIB = 0;
+    txChCfg.filterPS = 0;
+    txChCfg.aifMonoMode = 0;
+    txChCfg.txEnable = Cppi_ChState_CHANNEL_DISABLE;
+
+    /* Open Tx Channel */
+    p->txChHnd = (Cppi_ChHnd) Cppi_txChannelOpen (p->cppiHnd, &txChCfg, &isAllocated);
+    if (p->txChHnd == NULL)
+    {
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+
+     /* Set up Rx Channel parameters */
+    memset ((void *) &rxChCfg, 0, sizeof (Cppi_RxChInitCfg));
+    rxChCfg.channelNum = dmaChan;
+    rxChCfg.rxEnable = Cppi_ChState_CHANNEL_DISABLE;
+
+    /* Open Rx Channel */
+    p->rxChHnd = (Cppi_ChHnd) Cppi_rxChannelOpen (p->cppiHnd, &rxChCfg, &isAllocated);
+    if (p->rxChHnd == NULL)
+    {
+        Cppi_channelClose(p->txChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+    if (Cppi_channelEnable (p->txChHnd) != CPPI_SOK)
+    {
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+
+    /* Enable receive channel */
+    if (Cppi_channelEnable (p->rxChHnd) != CPPI_SOK)
+    {
+        Cppi_channelDisable (p->txChHnd);
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+    return 1;
+}
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Internal Callback that gets registered with NWAL for packet reception
+ **********************************************************************
+ * DESCRIPTION:  Callback that gets registered with NWAL for packet reception
+ * appCookie is the pktio handle 
+ **********************************************************************/
+void netapip_pktioNWALRxPktCallback(uint32_t            appCookie,
+                              uint16_t             numPkts,
+                              nwalRxPktInfo_t*    pPktInfo,
+                              uint64_t            timestamp,
+                              nwal_Bool_t*        pFreePkt)
+{
+    PKTIO_HANDLE_T * p = (PKTIO_HANDLE_T *) appCookie;
+    int r=0;
+    int n;
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+
+    for(r=0;r<numPkts;r++)
+    {
+        pkt_list[r] = pPktInfo[r].pPkt;
+        meta_s[r].flags1 = PKTIO_META_RX;
+        meta_s[r].u.rx_meta = &pPktInfo[r];
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, timestamp);
+    }
+}
+
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Internal Callback that gets registered with NWAL for crypto reception
+ **********************************************************************
+ * DESCRIPTION:  Callback that gets registered with NWAL for crypto reception,
+ * appCookie is the pktio handle 
+ **********************************************************************/
+void netapip_pktioNWALSBPktCallback(uint32_t            appCookie,
+                              uint16_t             numPkts,
+                              nwalDmRxPayloadInfo_t*  pDmRxPktInfo,
+                              nwal_Bool_t*        pFreePkt)
+{
+    PKTIO_HANDLE_T * p = (PKTIO_HANDLE_T *) appCookie;
+    int r=0;
+    int n;
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+    for(r=0;r<numPkts;r++)
+    {
+        pkt_list[r] = pDmRxPktInfo[r].pPkt;
+        meta_s[r].flags1 =  PKTIO_META_SB_RX;
+        meta_s[r].u.rx_sb_meta = &pDmRxPktInfo[r];
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, 0LL);
+    }
+}
+
diff --git a/ti/runtime/netapi/src/pktio.c~ b/ti/runtime/netapi/src/pktio.c~
new file mode 100755
index 0000000..6b69469
--- /dev/null
+++ b/ti/runtime/netapi/src/pktio.c~
@@ -0,0 +1,1323 @@
+/*********************************
+ * FILE: pktio.c
+ * PURPOSE: pktio library for NETAPI
+ **************************************************************
+ * FILE:  pktio.c
+ * 
+ * DESCRIPTION:  pktio source file for user space transport
+ *               library
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ********************************/
+
+#include <unistd.h>
+#include "netapi.h"
+#include "pktio.h"
+#include <ti/csl/csl_qm_queue.h>
+
+
+
+/*This defines the maximum number of packets to receive in one pktio poll */
+#define PKTIO_MAX_RECV  (TUNE_NETAPI_MAX_BURST_RCV)
+
+extern NETAPI_SHM_T* pnetapiShm;
+
+
+/* Utilites*/
+static PKTIO_HANDLE_T * netapip_pktioGetFreeChannelSlot(NETAPI_T n)
+{
+    NETAPI_HANDLE_T *p_handle;
+    PKTIO_HANDLE_T ** pp = (PKTIO_HANDLE_T **) netapi_get_pktio_list(n);
+    int i;
+    p_handle = (NETAPI_HANDLE_T*) n;
+    p_handle->spinLock.lock(&pnetapiShm->netapi_pktio_lock);
+    for(i=0;i<NETAPI_MAX_PKTIO;i++)
+    {
+        if (pp[i]->inuse != PKTIO_INUSE)
+        {
+            pp[i]->inuse = PKTIO_INUSE;
+            p_handle->spinLock.unlock(&pnetapiShm->netapi_pktio_lock);
+            return  pp[i];
+        }
+    }
+    p_handle->spinLock.unlock(&pnetapiShm->netapi_pktio_lock);
+    return NULL;
+}
+
+
+/*Optimized send functions */
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum,ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum,ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                            Ti_Pkt *pkt,
+                                            PKTIO_METADATA_T *m,
+                                            int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    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(pkt,
+                                    &p->tx_psCmdInfo,
+                                    pTxPktInfo->l4OffBytes, 
+                                    pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
+                                    pTxPktInfo->pseudoHdrChecksum, 
+                                    pTxPktInfo->saOffBytes, 
+                                    pTxPktInfo->saPayloadLen, 
+                                    swInfo0, 
+                                    swInfo1,
+                                    pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for ESP Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                     Ti_Pkt *pkt,
+                                     PKTIO_METADATA_T *m,
+                                     int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    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(pkt,
+                             &p->tx_psCmdInfo,
+                              pTxPktInfo->saOffBytes,
+                              pTxPktInfo->saPayloadLen,
+                              swInfo0,
+                              swInfo1,
+                              pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L3 checksum, ESP Crypto and outgoing EMAC port
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L3 checksum, ESP Crypto and outgoing EMAC port
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL3CkSumCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                     Ti_Pkt *pkt,
+                                     PKTIO_METADATA_T *m,
+                                     int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    uint32_t swInfo0, swInfo1;
+
+    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(pkt,
+                                    &p->tx_psCmdInfo,
+                                    pTxPktInfo->saOffBytes,
+                                    pTxPktInfo->saPayloadLen,
+                                    swInfo0,
+                                    swInfo1,
+                                    pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+
+
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum,AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ *******************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum,AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumAHCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                              Ti_Pkt *pkt,
+                                              PKTIO_METADATA_T *m,
+                                              int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    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(pkt,
+                                &p->tx_psCmdInfo,
+                                pTxPktInfo->l4OffBytes, 
+                                pTxPktInfo->ploadLen + pTxPktInfo->l4HdrLen, 
+                                pTxPktInfo->pseudoHdrChecksum, 
+                                pTxPktInfo->saOffBytes, 
+                                pTxPktInfo->saPayloadLen, 
+                                swInfo0, 
+                                swInfo1,
+                                pTxPktInfo->saAhIcvOffBytes,
+                                pTxPktInfo->saAhMacSize,
+                                pTxPktInfo->enetPort);
+
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for AH Crypto and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendAHCryptPort(struct PKTIO_HANDLE_tag * pp,
+                                       Ti_Pkt *pkt,
+                                       PKTIO_METADATA_T *m,
+                                       int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    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(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);
+
+        Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    }
+    else
+    {
+       *err= NETAPI_ERR_BAD_INPUT;
+       return -1;
+    }
+    return NETAPI_TRUE;
+}
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for L4 checksum and outgoing EMAC port 
+ * to NetCP command.
+ *******************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for L4 checksum and outgoing EMAC port 
+ * to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendL4CkSumPort(struct PKTIO_HANDLE_tag * pp,
+                                      Ti_Pkt *pkt,
+                                      PKTIO_METADATA_T *m,
+                                      int * err)
+{
+
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+
+    nwal_mCmdSetL4CkSumPort(pkt,
+                            &p->tx_psCmdInfo,
+                            pTxPktInfo->l4OffBytes,
+                            pTxPktInfo->l4HdrLen + pTxPktInfo->ploadLen,
+                            pTxPktInfo->pseudoHdrChecksum,
+                            pTxPktInfo->enetPort);
+
+    pPloadDesc = Pktlib_getDescFromPacket(pkt);
+    pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+    Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    return NETAPI_TRUE;
+}
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via low level NWAL API's
+ * with updates for outgoing EMAC port to NetCP command.
+ ********************************************************************
+ * DESCRIPTION: Send packet via low level NWAL API's
+ * with updates for outgoing EMAC port to NetCP command.
+ ********************************************************************/
+static int netapip_pktioSendPort(struct PKTIO_HANDLE_tag * pp,
+                                Ti_Pkt *pkt, 
+                                PKTIO_METADATA_T *m, 
+                                int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t *pTxPktInfo = m->u.tx_meta;
+    Cppi_HostDesc*          pPloadDesc;
+    
+    printf("netapip_pktioSendPort\n");
+
+
+    nwal_mCmdSetPort(pkt,
+                     &p->tx_psCmdInfo,
+                     pTxPktInfo->enetPort);
+    pPloadDesc = Pktlib_getDescFromPacket(pkt);
+    pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+    Qmss_queuePushDescSizeRaw(p->tx_psCmdInfo.txQueue,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+    return NETAPI_TRUE;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via IPC queue
+ ********************************************************************
+ * DESCRIPTION: Send packet via IPC queue
+ ********************************************************************/
+static int netapip_pktioSendIpc(struct PKTIO_HANDLE_tag * pp,
+                               Ti_Pkt *pkt,
+                               PKTIO_METADATA_T *m,
+                               int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    err=0;
+    Qmss_queuePushDesc (p->q, (void*)pkt);
+    return 1;
+}
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet to NETCP via NWAL
+ ********************************************************************
+ * DESCRIPTION: Send packet to NETCP via NWAL
+ ********************************************************************/
+static int netapip_pktioSendNwal(struct PKTIO_HANDLE_tag * pp,
+                                Ti_Pkt *pkt,
+                                PKTIO_METADATA_T *m,
+                                int * err)
+{
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    nwalTxPktInfo_t * pPktInfo=m->u.tx_meta;
+    nwal_RetValue res;
+    *err=0;
+    pPktInfo->pPkt = pkt;
+    res=nwal_send(p->nwalInstanceHandle, m->sa_handle,pPktInfo);
+    if (res != nwal_OK)
+    {
+        *err = NETAPI_ERR_NWAL_TX_ERR -res;
+        return -1;
+    }
+    return 1;
+}
+
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet to SA via NWAL
+ ********************************************************************
+ * DESCRIPTION: Send packet to NETCP via NWAL for side band data mode 
+ * channel via NWAL
+ ********************************************************************/
+static int netapip_pktioSendSb(struct PKTIO_HANDLE_tag * pp,
+                              Ti_Pkt *pkt, 
+                              PKTIO_METADATA_T *m, 
+                              int * err)
+{
+
+    nwal_RetValue nwalRetVal;
+    nwalTxDmPSCmdInfo_t     *dmPSCmdInfo;
+    nwalLocCxtInfo_t    nwalLocCxt;
+    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;
+
+    dmPSCmdInfo = netapip_netcpCfgGetSaSBInfo(&netapi_get_global()->nwal_context, tunnel_id);
+    if (dmPSCmdInfo)
+    {
+        nwalRetVal = nwal_getLocCxtInfo(pktio_mGetNwalInstance(p),&info);
+        if(nwalRetVal == nwal_OK)
+        {
+            dmPSCmdInfo->rxSbSaQ = info.rxSbSaQ;
+        }
+        else
+        {
+            *err=NETAPI_ERR_BAD_INPUT;
+            return -1;
+        }
+        nwal_mCmdDMUpdate(pkt,
+            dmPSCmdInfo,
+            pPktInfoSB->appCtxId,
+            pPktInfoSB->encOffset,
+            pPktInfoSB->encSize,
+            pPktInfoSB->pEncIV,
+            pPktInfoSB->authOffset,
+            pPktInfoSB->authSize,
+            pPktInfoSB->pAuthIV,
+            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,
+                                             pPloadDesc,
+                                             NWAL_DESC_SIZE); 
+    }
+    else
+    {
+          *err=NETAPI_ERR_BAD_INPUT;
+          return -1;
+    }
+
+    return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Send packet via infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION: Send packet via infrastructure DMA channel
+ ********************************************************************/
+static int netapip_pktioSendIfdma(struct PKTIO_HANDLE_tag * pp,
+                                 Ti_Pkt *pkt, 
+                                 PKTIO_METADATA_T *m, 
+                                 int * err)
+{
+        Cppi_DescTag            tag={0};
+        Cppi_HostDesc*          pPloadDesc;
+        PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+        *err=0;
+        tag.srcTagLo = m->u.tx_ifdma_dest;
+        Cppi_setTag (Cppi_DescType_HOST, (Cppi_Desc *)pkt, &tag);
+        pPloadDesc = Pktlib_getDescFromPacket(pkt);
+        pPloadDesc = Osal_qmssConvertDescVirtToPhy(0, pPloadDesc);
+
+        Qmss_queuePushDescSizeRaw(p->q,
+                                  pPloadDesc,
+                                  NWAL_DESC_SIZE);
+        return 1;
+}
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE: Stub function for send, do nothing.
+ ********************************************************************
+ * DESCRIPTION: Stub function for send, do nothing.
+ ********************************************************************/
+static int netapip_pktioSendDummy(struct PKTIO_HANDLE_tag * p,
+                                 Ti_Pkt *pkt, 
+                                 PKTIO_METADATA_T *m, 
+                                 int * err)
+{
+    *err =  NETAPI_ERR_BAD_INPUT;
+    return -1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Stub function for poll, do nothing.
+ ********************************************************************
+ * DESCRIPTION: Stub function for send, do nothing.
+ ********************************************************************/
+static int netapip_pktioPollDummy(struct PKTIO_HANDLE_tag * p, 
+                                 PKTIO_POLL_T * p_poll_cfg,
+                                 int * err)
+{
+    *err= NETAPI_ERR_BAD_INPUT;
+    return 0;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll IPC queue
+ ********************************************************************
+ * DESCRIPTION: Poll IPC queue
+ ********************************************************************/
+static int netapip_pktioPollIpc(struct PKTIO_HANDLE_tag * pp, 
+                               PKTIO_POLL_T * p_poll_cfg,  
+                               int * err)
+{
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    int r=0;
+    int n;
+    Ti_Pkt * temp;
+    *err=0;
+    n= (p->max_n< PKTIO_MAX_RECV) ? p->max_n : PKTIO_MAX_RECV;
+    for(r=0;r<n;r++)
+    {
+
+        temp=(Ti_Pkt*)(Cppi_HostDesc*)QMSS_DESC_PTR(Qmss_queuePop(p->q));
+
+        if(!temp) break;
+        /* process meta data */
+        pkt_list[r]= temp;
+        meta_s[r].flags1=0x1;
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, 0LL);
+    }
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll nwal data queues for pkts from netcp
+ ********************************************************************
+ * DESCRIPTION: Poll nwal data queues for pkts from netcp
+ ********************************************************************/
+static int netapip_pktioPollNwal(struct PKTIO_HANDLE_tag * pp, 
+                                PKTIO_POLL_T * p_poll_cfg,  
+                                int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    /* Poll for common L2/L3 packets and L4 class pkts (todo-> only do L4 if classifiers are
+        set.  optimizaion maybe? */
+    r=nwal_pollPkt(p->nwalInstanceHandle,
+                   p->poll_flags,
+                   (uint32_t) p,
+                   p->max_n,
+                   QMSS_PARAM_NOT_SPECIFIED,
+                   (void*) NULL);
+    return r;
+}
+/********************************************************************
+ * FUNCTION PURPOSE: Poll nwal sideband queues for pkts from SA
+ ********************************************************************
+ * DESCRIPTION: Poll nwal sideband queues for pkts from SA
+ ********************************************************************/
+static int  netapip_pktioPollSb(struct PKTIO_HANDLE_tag * pp, 
+                               PKTIO_POLL_T * p_poll_cfg,  
+                               int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    r=nwal_pollDm(p->nwalInstanceHandle,
+                    nwal_POLL_DM_DEF_SB_SA_Q,
+                     (uint32_t) p,
+                     p->max_n,
+                     QMSS_PARAM_NOT_SPECIFIED,
+             (void *) NULL);
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE: Poll application provided NETCP RX queue
+ ********************************************************************
+ * DESCRIPTION: Poll application provided NETCP RX queue
+ ********************************************************************/
+static int netapip_pktioPollNwalAdj(struct PKTIO_HANDLE_tag * pp, 
+                                   PKTIO_POLL_T * p_poll_cfg,  
+                                   int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    /* Poll for common L2/L3 packets and L4 class pkts (todo-> only do L4 if classifiers are
+         set. optimizaion maybe? */
+    r=nwal_pollPkt(p->nwalInstanceHandle,
+                   nwal_POLL_APP_MANAGED_PKT_Q,
+                   (uint32_t) p,
+                   p->max_n,
+                   p->q,
+                   (void *) NULL);
+
+    return r;
+}
+
+/*************************************************************************
+ * FUNCTION PURPOSE: Poll application defined sideband queues for packets
+ *                   from SA
+ ************************************************************************
+ * DESCRIPTION: Poll application defined sideband queues for packets
+ *                   from SA
+ *************************************************************************/
+static int  netapip_pktioPollSbAdj(struct PKTIO_HANDLE_tag * pp, 
+                                  PKTIO_POLL_T * p_poll_cfg,  
+                                  int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p=(PKTIO_HANDLE_T*) pp;
+    *err=0;
+    r=nwal_pollDm(p->nwalInstanceHandle,
+                     nwal_POLL_DM_APP_MANAGED_Q,
+                     (uint32_t) p,
+                     p->max_n,
+                     p->q,
+                     (void *)  NULL);
+    return r;
+}
+
+/*-----------------------MAIN API----------------------*/
+/********************************************************************
+ * FUNCTION PURPOSE:  API creates a NETAPI PKTIO channel 
+ ********************************************************************
+ * DESCRIPTION:  API creates a NETAPI PKTIO channel 
+ ********************************************************************/
+PKTIO_HANDLE_T * netapi_pktioCreate(NETAPI_T n,
+                                    char * name,
+                                    PKTIO_CB cb, 
+                                    PKTIO_CFG_T * p_cfg, 
+                                    int * err)
+{
+    int r = 0;
+    PKTIO_HANDLE_T *p;
+    uint8_t         isAllocated;
+
+    *err=0;
+    int q = QMSS_PARAM_NOT_SPECIFIED;
+
+    int qtype = Qmss_QueueType_GENERAL_PURPOSE_QUEUE;
+
+    if(p_cfg == NULL)
+    {
+        *err = NETAPI_ERR_BAD_INPUT;
+        return NULL;
+    }
+    /* over-ride only for Qmss_QueueType_GIC400_QUEUE */
+    if (p_cfg->queueType == Qmss_QueueType_GIC400_QUEUE)
+        qtype = p_cfg->queueType;
+
+    if ((!p_cfg)||(!name)) {*err=NETAPI_ERR_BAD_INPUT; return NULL;}
+    if ((p_cfg->flags2 & PKTIO_PKT) &&(p_cfg->flags1& PKTIO_TX)) { *err=NETAPI_ERR_BAD_INPUT; return NULL;};
+    if ((p_cfg->flags2 & PKTIO_SB) &&(p_cfg->flags1& PKTIO_TX)) { *err=NETAPI_ERR_BAD_INPUT; return NULL;};
+
+    /* get a free channel handle */
+    p=netapip_pktioGetFreeChannelSlot(n);
+
+    if (!p) {*err = NETAPI_ERR_NOMEM; return (p); }
+
+    p->back = n;
+    p->cb = cb;
+    p->max_n = p_cfg->max_n;
+    p->_poll=netapip_pktioPollDummy;
+    p->_send=netapip_pktioSendDummy;
+    memcpy((char *)&p->cfg, (char*) p_cfg, sizeof(PKTIO_CFG_T));
+
+    if (p_cfg->qnum!=PKTIO_Q_ANY)
+    {
+        q= p_cfg->qnum;
+    }
+    /* special case for infrastructure dma channels */
+    if (p_cfg->flags2 & PKTIO_IFDMA)
+    {
+        qtype=Qmss_QueueType_INFRASTRUCTURE_QUEUE;
+    }
+
+
+    /* create a  general queue */
+     p->q  = Qmss_queueOpen(qtype,
+                                q, 
+                                &isAllocated);
+    if (p->q < 0)
+    {
+        netapi_Log("netapi_pktioCreate:  queueOpen failed\n");
+        p->inuse=0;
+        *err= NETAPI_ERR_QLLD;  ///queue lld error
+        return NULL;
+    }
+
+    p->qInfo = Qmss_getQueueNumber(p->q);
+
+    if (p_cfg->flags2 & PKTIO_PKT)
+    {
+        p->use_nwal = PKTIO_4_ADJ_NWAL;
+        p->_poll=netapip_pktioPollNwalAdj;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+    }
+    else if (p_cfg->flags2 & PKTIO_SB)
+    {
+        p->use_nwal = PKTIO_4_ADJ_SB;
+        p->_poll=netapip_pktioPollSbAdj;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+    }
+   else if (p_cfg->flags2 & PKTIO_IFDMA)
+   {
+        p->use_nwal = 0;
+        p->_send = netapip_pktioSendIfdma;
+        p->cfg.flags1=PKTIO_TX;
+        r= netapip_pktioCreateIFDMA(p); //we create the IF DMA channel here
+        if (r<0) 
+        {
+            //trouble -> couldn't set up DMA 
+            //close queue and return failure
+            if (p->q)
+            {
+                Qmss_queueClose(p->q);
+            }
+            p->inuse=0;
+            *err= NETAPI_ERR_QLLD;  ///queue lld error TODO: fix error code 
+            return NULL;
+        }
+   }
+    else
+    {
+        p->use_nwal=0;
+        if (p_cfg->flags1& PKTIO_TX) p->_send=netapip_pktioSendIpc;
+        if (p_cfg->flags1& PKTIO_RX) p->_poll=netapip_pktioPollIpc;
+    }
+
+    /* save name */ 
+    strncpy(p->name,name,
+       strlen(name)<PKTIO_MAX_NAME ?
+               strlen(name):PKTIO_MAX_NAME);   
+
+    /* add name, qnum to global name list */
+    if ((strcmp(name,NETCP_RX)) &&
+        (strcmp(name,NETCP_TX)) &&
+        (strcmp(name,NETCP_SB_RX)) &&
+        (strcmp(name,NETCP_SB_TX)) &&
+        (p_cfg->flags1 & PKTIO_GLOBAL))
+    {
+         //todo: make sure this succeeds..
+        hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        r=netapip_addGlobalPktio(n, name, &p->qInfo);
+        hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+    }
+
+  ((NETAPI_HANDLE_T *)n )->n_pktios+=1;
+   return p;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API opens an existing  NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API opens an existing  NETAPI PKTIO channel
+ ********************************************************************/
+PKTIO_HANDLE_T * netapi_pktioOpen(NETAPI_T  n,
+                                  char *name,
+                                  PKTIO_CB cb,
+                                  PKTIO_CFG_T * p_cfg,
+                                  int * err)
+{
+    int r=0;
+    PKTIO_HANDLE_T *p, *p2;
+    uint8_t         isAllocated;
+    *err=0;
+    Qmss_Queue *p_qnum;
+    int qtype=Qmss_QueueType_GENERAL_PURPOSE_QUEUE;
+
+
+    if ((!p_cfg)||(!name)) {*err=NETAPI_ERR_BAD_INPUT; return NULL;}
+
+    /* get a free channel handle */
+
+    p=netapip_pktioGetFreeChannelSlot(n);
+
+    if (!p) {*err = NETAPI_ERR_NOMEM; return (p); }
+    ((NETAPI_HANDLE_T *)n)->n_pktios+=1;
+
+    p->inuse= PKTIO_INUSE;
+    p->back = n;
+    p->cb = cb;
+    p->max_n = p_cfg->max_n;
+    p->_poll=netapip_pktioPollDummy;
+    p->_send=netapip_pktioSendDummy;
+    memcpy((char *)&p->cfg, (char*) p_cfg, sizeof(PKTIO_CFG_T));
+
+    /* special handling of NETCP_RX, NETCP_TX */
+    if( (!strcmp(name, NETCP_RX)) || (!strcmp(name,NETCP_TX)) )
+    {
+       /* these have already been opened internally, so don't search in global list */
+        p->use_nwal = PKTIO_DEF_NWAL;
+        p->q = 0;  
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        if (!strcmp(name,NETCP_RX))
+        {
+            p->_poll=netapip_pktioPollNwal; 
+            p->poll_flags= nwal_POLL_DEFAULT_GLOB_PKT_Q|
+                                    nwal_POLL_DEFAULT_PER_PROC_PKT_Q;
+        }
+        if (!strcmp(name,NETCP_TX))
+        {
+            p->_send=netapip_pktioSendNwal;
+        }
+    }
+    else if( (!strcmp(name, NETCP_SB_RX)) || (!strcmp(name,NETCP_SB_TX)) )
+    {
+       /* these have already been opened internally, so don't search in global list */
+        p->use_nwal =  PKTIO_DEF_SB;
+        p->q = 0;
+        p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        if (!strcmp(name,NETCP_SB_RX)) p->_poll=netapip_pktioPollSb;
+        if (!strcmp(name,NETCP_SB_TX)) p->_send=netapip_pktioSendSb;
+    }
+    else
+    {
+        hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        /* Find queue in global list 
+           Note names like "QUEUE:%d" or IFDMA:%d cause general purpose or
+           IFDMA queues of that number to be opened */
+        if (p_cfg->flags2 & PKTIO_IFDMA)
+        {
+            qtype= Qmss_QueueType_INFRASTRUCTURE_QUEUE;
+        }
+
+        hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+        p_qnum = netapip_findGlobalPktio(n, name);
+
+        if (!p_qnum ) 
+        {
+            netapi_Log("netapi_pktioOpen: can't find %s\n",name);
+            p->inuse=0;
+            *err= NETAPI_ERR_NOTFOUND;  ///queue lld error
+            return NULL;
+      }
+
+     /* open a general queue (for now). use qnum that was just found */
+         p->q  = Qmss_queueOpen(qtype,
+                           p_qnum->qNum , &isAllocated);
+        if (p->q == (Qmss_QueueHnd) NULL)
+        {
+            netapi_Log("netapi_pktioCreate:  queueOpen failed\n");
+            p->inuse=0;
+            *err= NETAPI_ERR_QLLD;  ///queue lld error
+            return NULL;
+        }
+        p->qInfo = Qmss_getQueueNumber(p->q);
+        netapi_Log("netapi_pktioOpen: queueMgr %d,  queueNum; %d\n", p->qInfo.qMgr, p->qInfo.qNum);
+        if (p_cfg->flags2 & PKTIO_PKT)
+        {
+           p->use_nwal = PKTIO_4_ADJ_NWAL;  //additonal RX q for nwal
+           p->_poll = netapip_pktioPollNwalAdj;
+           p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n); 
+           netapi_Log("netapi_pktioOpen: nwalInstanceHandle 0x%x\n", p->nwalInstanceHandle);
+        } 
+        else if (p_cfg->flags2 & PKTIO_SB)
+        {
+           p->use_nwal = PKTIO_4_ADJ_SB;  //additional RX q for sideband with NWAL
+           p->_poll = netapip_pktioPollSbAdj;
+           p->nwalInstanceHandle = netapip_returnNwalInstanceHandle(n);
+        }
+        else if (p_cfg->flags2 & PKTIO_IFDMA)
+        {
+            p->_send= netapip_pktioSendIfdma;
+            p->use_nwal = 0;
+        }
+        else
+        {
+           p->use_nwal=0; //not handled by nwal
+            if (p_cfg->flags1& PKTIO_TX) p->_send=netapip_pktioSendIpc;
+            if (p_cfg->flags1& PKTIO_RX) p->_poll=netapip_pktioPollIpc;
+        }
+    }
+
+        /* save name */
+        strncpy(p->name,name,
+           strlen(name)<PKTIO_MAX_NAME ?
+                   strlen(name):PKTIO_MAX_NAME);
+
+        netapi_Log("netapi_pktioOpen: returning with sucess for name %s\n", p->name);
+    return p;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API controls an existing NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API controls an existing NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioControl(PKTIO_HANDLE_T * p,
+                         PKTIO_CB cb,
+                         PKTIO_CFG_T * p_cfg,
+                         PKTIO_CONTROL_T * p_control,
+                         int *err)
+{
+    nwal_RetValue       nwalRetVal;
+    if (!p)
+    {
+        *err= NETAPI_ERR_BAD_INPUT; 
+        return;
+    }
+    if (cb) 
+    {
+        p->cb = cb;
+    }
+    if (p_control)
+    {
+        /* todo: check for validity, eg don't allow clear of NETCP TX queues */
+        /* todo: implement divert */
+        switch(p_control->op)
+        {
+            //clear the queue
+            case(PKTIO_SET_POLL_FLAGS):
+                p->poll_flags=p_control->poll_flags;
+                break;
+            case(PKTIO_CLEAR):
+                netapip_zapQ(p->q);
+                break;
+            case (PKTIO_UPDATE_FAST_PATH):
+                if (p_cfg)
+                {
+                    nwalRetVal = nwal_initPSCmdInfo(p->nwalInstanceHandle, 
+                                                            p_cfg->fast_path_cfg.txPktInfo,
+                                                            &p->tx_psCmdInfo);
+                    if (nwalRetVal == nwal_OK)
+                    {
+                        switch (p_cfg->fast_path_cfg.fp_send_option)
+                        {
+                            case (PKTIO_FP_ESP_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumCryptPort;
+                                break;
+                            case (PKTIO_FP_AH_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumAHCryptPort;
+                                break;
+                            case (PKTIO_FP_ESP_PORT):
+                                p->_send = netapip_pktioSendCryptPort;
+                                break;
+                            case (PKTIO_FP_ESP_L3CKSUM_PORT):
+                                p->_send = netapip_pktioSendL3CkSumCryptPort;
+                                break;
+                            case (PKTIO_FP_AH_PORT):
+                                p->_send = netapip_pktioSendAHCryptPort;
+                                break;
+                            case (PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT):
+                                p->_send = netapip_pktioSendPort;
+                                break;
+                            case (PKTIO_FP_L4CKSUM_PORT):
+                                p->_send = netapip_pktioSendL4CkSumPort;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    else
+                    {
+                        *err = NETAPI_ERR_BAD_INPUT;
+                    }
+                }
+                else
+                {
+                    *err = NETAPI_ERR_BAD_INPUT;
+                }
+                break;
+            case (PKTIO_UPDATE_MAX_PKTS_PER_POLL):
+                if (p_cfg)
+                {
+                    p->max_n = p_cfg->max_n;
+                }
+                else
+                {
+                    *err = NETAPI_ERR_BAD_INPUT;
+                }
+                break;
+            case(PKTIO_DIVERT):
+            default:
+                netapi_Log("netapi_pktioControl: pktio_control op %d not implemented\n",p_control->op);
+                *err= NETAPI_ERR_NOT_IMPLEMENTED;
+                break;
+        }
+    }
+
+    *err = NETAPI_ERR_OK;
+    return;
+}
+/********************************************************************
+ * FUNCTION PURPOSE:  API closes a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API closes a NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioClose(PKTIO_HANDLE_T * p, 
+                       int * err)
+{
+    if(!p)
+    {
+        *err=1;
+        return;
+    }
+    *err=0;
+    if (p->q)
+    {
+        Qmss_queueClose(p->q);
+    }
+    p->q=-1;
+    p->inuse=0;
+    ((NETAPI_HANDLE_T *)p->back)->n_pktios-=1;
+    return;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API deletes a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API deletes a NETAPI PKTIO channel
+ ********************************************************************/
+void netapi_pktioDelete(PKTIO_HANDLE_T * p, 
+                        int * err)
+{
+    if(!p)
+    {
+        *err=1;
+        return;
+    }
+    *err=0;
+    if (p->cfg.flags2 & PKTIO_IFDMA)
+    {
+        netapip_pktioDeleteIFDMA(p);
+    }
+
+        /* remove from name list */
+    hplib_mSpinLockLock(&pnetapiShm->netapi_pktio_lock);
+        netapi_del_global_pktio((NETAPI_HANDLE_T *)p->back, p->name);
+    hplib_mSpinLockUnlock(&pnetapiShm->netapi_pktio_lock);
+        if((p->use_nwal != PKTIO_DEF_NWAL) && (p->use_nwal != PKTIO_DEF_SB)) 
+    {
+                netapip_zapQ(p->q);   //since we are deleting, zap the queue 
+            Qmss_queueClose(p->q);
+    }
+    p->q=-1;
+    p->inuse=0;
+    ((NETAPI_HANDLE_T *)p->back)->n_pktios-=1;
+    return ;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API sends multiple packets to a NETAPI PKTIO channel
+ ********************************************************************
+ * DESCRIPTION:  API sends multiple packets to a NETAPI PKTIO channel
+ ********************************************************************/
+int netapi_pktioSendMulti(PKTIO_HANDLE_T * p, 
+                          Ti_Pkt * pkt[], 
+                          PKTIO_METADATA_T * m[], 
+                          int np, 
+                          int* err)
+{
+    int r=0;
+    for(r=0;r<np;r++)
+    {
+        p->_send((struct PKTIO_HANDLE_tag *)p, (Ti_Pkt *)pkt, (PKTIO_METADATA_T *)m, err);
+    }
+    return r;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  API polls all NETAPI PKTIO channels associated with NETAPI_T
+ * instance for received packets
+ ********************************************************************
+ * DESCRIPTION:  API polls all NETAPI PKTIO channels associated with NETAPI_T
+ * instance for received packets
+ ********************************************************************/
+int netapi_pktioPollAll(NETAPI_T  handle, 
+                        PKTIO_POLL_T * p_poll_cfg, 
+                        int *err)
+{
+    int i=0;
+    int r=0;
+    int err2;
+    int cnt=0;
+    PKTIO_HANDLE_T **pp =( PKTIO_HANDLE_T **)  netapi_get_pktio_list(handle);
+    
+    *err=0;
+    for(i=0;i<NETAPI_MAX_PKTIO && cnt < ((NETAPI_HANDLE_T *)handle)->n_pktios;i++)
+    {
+        if (pp[i]->inuse != PKTIO_INUSE) continue;
+        if(!(pp[i]->cfg.flags1&PKTIO_RX)) continue;
+        r+=netapi_pktioPoll(pp[i],  p_poll_cfg,  &err2); cnt+=1;
+        if (err2) { *err = err2; break;}
+    }
+    return r;
+
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to delete a PKTIO infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION:  Internal function to delete a PKTIO infrastructure DMA channel
+ ********************************************************************/
+int netapip_pktioDeleteIFDMA(PKTIO_HANDLE_T *p)
+{
+        Cppi_channelDisable (p->txChHnd);
+        Cppi_channelDisable (p->rxChHnd);
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return 1;
+}
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Internal function to create a PKTIO infrastructure DMA channel
+ ********************************************************************
+ * DESCRIPTION:  Internal function to create a PKTIO infrastructure DMA channel
+ *               for infrastructure DMQ queue
+ ********************************************************************/
+int netapip_pktioCreateIFDMA(PKTIO_HANDLE_T * p )
+{
+   int dmaChan =  p->qInfo.qNum - QMSS_INFRASTRUCTURE_QUEUE_BASE;
+   unsigned char           isAllocated;
+   Cppi_TxChInitCfg        txChCfg;
+   Cppi_RxChInitCfg        rxChCfg;
+   Cppi_CpDmaInitCfg       cpdmaCfg;
+
+    /* Set up QMSS CPDMA configuration */
+    memset ((void *) &cpdmaCfg, 0, sizeof (Cppi_CpDmaInitCfg));
+    cpdmaCfg.dmaNum = Cppi_CpDma_QMSS_CPDMA;
+
+    /* Open QMSS CPDMA */
+    p->cppiHnd = (Cppi_Handle) Cppi_open (&cpdmaCfg);
+    if (p->cppiHnd == NULL)
+    {
+        return -1;
+    }
+
+ /* Set up Tx Channel parameters */
+    memset ((void *) &txChCfg, 0, sizeof (Cppi_TxChInitCfg));
+    txChCfg.channelNum = dmaChan;
+    txChCfg.priority = 0;
+    txChCfg.filterEPIB = 0;
+    txChCfg.filterPS = 0;
+    txChCfg.aifMonoMode = 0;
+    txChCfg.txEnable = Cppi_ChState_CHANNEL_DISABLE;
+
+    /* Open Tx Channel */
+    p->txChHnd = (Cppi_ChHnd) Cppi_txChannelOpen (p->cppiHnd, &txChCfg, &isAllocated);
+    if (p->txChHnd == NULL)
+    {
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+
+     /* Set up Rx Channel parameters */
+    memset ((void *) &rxChCfg, 0, sizeof (Cppi_RxChInitCfg));
+    rxChCfg.channelNum = dmaChan;
+    rxChCfg.rxEnable = Cppi_ChState_CHANNEL_DISABLE;
+
+    /* Open Rx Channel */
+    p->rxChHnd = (Cppi_ChHnd) Cppi_rxChannelOpen (p->cppiHnd, &rxChCfg, &isAllocated);
+    if (p->rxChHnd == NULL)
+    {
+        Cppi_channelClose(p->txChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+    if (Cppi_channelEnable (p->txChHnd) != CPPI_SOK)
+    {
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+
+    /* Enable receive channel */
+    if (Cppi_channelEnable (p->rxChHnd) != CPPI_SOK)
+    {
+        Cppi_channelDisable (p->txChHnd);
+        Cppi_channelClose(p->txChHnd);
+        Cppi_channelClose(p->rxChHnd);
+        Cppi_close(p->cppiHnd);
+        return -1;
+    }
+    return 1;
+}
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Internal Callback that gets registered with NWAL for packet reception
+ **********************************************************************
+ * DESCRIPTION:  Callback that gets registered with NWAL for packet reception
+ * appCookie is the pktio handle 
+ **********************************************************************/
+void netapip_pktioNWALRxPktCallback(uint32_t            appCookie,
+                              uint16_t             numPkts,
+                              nwalRxPktInfo_t*    pPktInfo,
+                              uint64_t            timestamp,
+                              nwal_Bool_t*        pFreePkt)
+{
+    PKTIO_HANDLE_T * p = (PKTIO_HANDLE_T *) appCookie;
+    int r=0;
+    int n;
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+
+    for(r=0;r<numPkts;r++)
+    {
+        pkt_list[r] = pPktInfo[r].pPkt;
+        meta_s[r].flags1 = PKTIO_META_RX;
+        meta_s[r].u.rx_meta = &pPktInfo[r];
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, timestamp);
+    }
+}
+
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Internal Callback that gets registered with NWAL for crypto reception
+ **********************************************************************
+ * DESCRIPTION:  Callback that gets registered with NWAL for crypto reception,
+ * appCookie is the pktio handle 
+ **********************************************************************/
+void netapip_pktioNWALSBPktCallback(uint32_t            appCookie,
+                              uint16_t             numPkts,
+                              nwalDmRxPayloadInfo_t*  pDmRxPktInfo,
+                              nwal_Bool_t*        pFreePkt)
+{
+    PKTIO_HANDLE_T * p = (PKTIO_HANDLE_T *) appCookie;
+    int r=0;
+    int n;
+    Ti_Pkt * pkt_list[PKTIO_MAX_RECV];
+    PKTIO_METADATA_T meta_s[PKTIO_MAX_RECV];
+    for(r=0;r<numPkts;r++)
+    {
+        pkt_list[r] = pDmRxPktInfo[r].pPkt;
+        meta_s[r].flags1 =  PKTIO_META_SB_RX;
+        meta_s[r].u.rx_sb_meta = &pDmRxPktInfo[r];
+    }
+    if (r)
+    {
+        p->cb((struct PKTIO_HANDLE_tag *)p, pkt_list, &meta_s[0], r, 0LL);
+    }
+}
+
diff --git a/ti/runtime/netapi/test/build/Makefile b/ti/runtime/netapi/test/build/Makefile
new file mode 100755
index 0000000..5d4287e
--- /dev/null
+++ b/ti/runtime/netapi/test/build/Makefile
@@ -0,0 +1,139 @@
+#
+empty =
+space =$(empty) $(empty)
+
+export ARMV7OBJDIR ?= ./obj
+export ARMV7BINDIR ?= ./bin
+export ARMV7LIBDIR ?= ./lib
+export ARMV7SALIBDIR ?= ./lib
+export ARMV7LIBDIRLOCAL ?= ../../lib
+# INCLUDE Directories
+#WORKDIR ?= $(TRANS_SDK_INSTALL_PATH)
+SA_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/sa
+QMSS_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/qmss
+CPPI_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/cppi
+RM_INC_DIR ?= $(PDK_INSTALL_PATH)/ti/drv/rm
+HPLIB_INC_DIR ?= $(TRANS_SDK_INSTALL_PATH)
+NETAPI_SRC_DIR ?= $(TRANS_SDK_INSTALL_PATH)/ti/runtime/netapi
+NETAPI_INC_DIR ?=  $(TRANS_SDK_INSTALL_PATH)
+NWAL_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/drv/nwal
+PKTLIB_INSTALL_PATH ?= $(PDK_INSTALL_PATH)/ti/runtime/pktlib
+
+# Set NETAPI INSTALL PATH to Transport SDK for default
+
+ifeq ($(CPU),  cortex-a8)
+        CFLAGS += -DCORTEX_A8
+endif
+
+NT_RM_OBJS = $(ARMV7OBJDIR)/netapi/utils/sockutils.o  $(ARMV7OBJDIR)/netapi/utils/netapi_util_rm.o
+
+TRIE_OBJS=$(ARMV7OBJDIR)/netapi/test/trie.o
+NT_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_loopback.o $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
+#
+NT_ROUTER_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_router.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
+#
+NT_MAX_PARAMS_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_max_params.o  $(ARMV7OBJDIR)/netapi/test/stubs.o $(ARMV7OBJDIR)/netapi/test/net_test_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_sa_utils.o $(ARMV7OBJDIR)/netapi/test/net_test_thread_utils.o
+#
+
+IFDMA_OBJS= $(ARMV7OBJDIR)/netapi/test/ifdma_test.o
+
+NTB_OBJS= $(ARMV7OBJDIR)/netapi/test/nt_bridge.o  $(ARMV7OBJDIR)/netapi/test/fdb.o $(ARMV7OBJDIR)/netapi/test/stubs.o
+
+NT_BENCH_OBJS= $(ARMV7OBJDIR)/netapi/test/net_test_bench.o  $(ARMV7OBJDIR)/netapi/test/stubs.o
+
+# Support Libraries used by NETAPI 
+QMSS_LIB = -lqmss
+CPPI_LIB = -lcppi
+PKTLIB_LIB = -lpktlib
+HP_LIB = -lhplib_$(DEVICE)
+NETAPI_LIB = -lnetapi_$(DEVICE)
+NWAL_LIB = -lnwalsa_$(DEVICE)
+SA_LIB = -lsa
+RM_LIB = -lrm
+#
+#with security enabled..
+
+
+ifeq ($(DEVICE), k2h)
+PA_LIB   = -lpa
+endif
+ifeq  ($(DEVICE), k2k)
+PA_LIB   = -lpa
+endif
+ifeq ($(DEVICE), k2l)
+PA_LIB   = -lpa2
+endif
+ifeq ($(DEVICE), k2e)
+PA_LIB   = -lpa2
+endif
+
+#default if DEVICE not provided
+CSL_DEVICE ?= -DDEVICE_K2L -DNSS_GEN2
+PA_LIB ?= -lpa2
+NETAPI_LIB?=-lnetapi_k2l
+NWAL_LIB ?= -lnwalsa_k2l
+HP_LIB ?= -lhplib_k2l
+
+ifeq ($(USEDYNAMIC_LIB), yes)
+#presuming ARM executable would depend on dynamic library dependency
+EXE_EXTN = _so
+LIBS     = $(QMSS_LIB) $(CPPI_LIB) $(PA_LIB) $(PKTLIB_LIB) $(NETAPI_LIB) $(HP_LIB) $(SA_LIB) $(NWAL_LIB) $(RM_LIB)
+else
+#forcing ARM executable to depend on static LLD libraries
+LIBS = -static $(QMSS_LIB) $(CPPI_LIB) $(PA_LIB) $(PKTLIB_LIB) $(NETAPI_LIB) $(HP_LIB) $(SA_LIB) $(NWAL_LIB) $(RM_LIB) -Wl,-Bdynamic
+EXE_EXTN =
+endif
+
+
+ifdef CROSS_TOOL_INSTALL_PATH
+## Support backwards compatibility with KeyStone1 approach
+ CC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+ AC = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)as
+ AR = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)ar
+ LD = $(CROSS_TOOL_INSTALL_PATH)/$(CROSS_TOOL_PRFX)gcc
+endif
+
+CFLAGS+= $(DEBUG_FLAG) -I../ -I. -I$(NETAPI_SRC_DIR) -I$(NETAPI_SRC_DIR)/src -I$(NETAPI_SRC_DIR)/util -I$(HPLIB_INC_DIR) -I$(NETAPI_INC_DIR)-I$(PDK_INSTALL_PATH) -I$(NWAL_INSTALL_PATH) -I$(PKTLIB_INSTALL_PATH) -I$(SA_INSTALL_PATH) -I$(QMSS_INC_DIR) -I$(CPPI_INC_DIR) -I$(RM_INC_DIR) $(CSL_DEVICE) -D__ARMv7 -D_VIRTUAL_ADDR_SUPPORT -D__LINUX_USER_SPACE -D_LITTLE_ENDIAN=1 -DNWAL_ENABLE_SA -DMAKEFILE_BUILD -D _GNU_SOURCE
+# Linker options
+INTERNALLINKDEFS = -Wl,--start-group $(LIBS) -Wl,--end-group -lrt -pthread  -L$(ARMV7LIBDIR)  -L$(ARMV7LIBDIRLOCAL) -L$(ARMV7SALIBDIR)
+
+
+all: tests 
+
+tests: $(ARMV7BINDIR)/netapi/test/.created $(ARMV7BINDIR)/netapi/test/net_test_loopback_$(DEVICE) $(ARMV7BINDIR)/netapi/test/net_test_router_$(DEVICE) $(ARMV7BINDIR)/netapi/test/net_test_bench_$(DEVICE) $(ARMV7BINDIR)/netapi/test/nt_bridge_$(DEVICE)
+
+clean:  
+        rm -f $(ARMV7OBJDIR)/netapi/test/*.o
+        rm -f $(ARMV7BINDIR)/netapi/test/*
+
+$(ARMV7OBJDIR)/netapi/utils/%.o: $(NETAPI_SRC_DIR)/utils/%.c $(ARMV7OBJDIR)/netapi/utils/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS)  $<  -o $@
+
+$(ARMV7OBJDIR)/netapi/test/%.o: $(NETAPI_SRC_DIR)/test/%.c $(ARMV7OBJDIR)/netapi/test/.created
+        @echo compiling $<
+        $(CC) -c  $(CFLAGS)  $<  -o $@
+
+$(ARMV7OBJDIR)/netapi/test/.created:
+        @mkdir -p $(ARMV7OBJDIR)/netapi/test/
+
+$(ARMV7BINDIR)/netapi/test/.created:
+        @mkdir -p $(ARMV7BINDIR)/netapi/test/
+
+$(ARMV7OBJDIR)/netapi/utils/.created:
+        @mkdir -p $(ARMV7OBJDIR)/netapi/utils/
+
+$(ARMV7BINDIR)/netapi/test/net_test_loopback_$(DEVICE): $(NT_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS)
+        $(CC) $(LDFLAGS)  $(NT_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_loopback_$(DEVICE)$(EXE_EXTN)
+
+$(ARMV7BINDIR)/netapi/test/net_test_router_$(DEVICE): $(NT_ROUTER_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS)
+        $(CC) $(LDFLAGS)  $(NT_ROUTER_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_router_$(DEVICE)$(EXE_EXTN)
+
+$(ARMV7BINDIR)/netapi/test/nt_bridge_$(DEVICE): $(NTB_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS)
+        $(CC) $(LDFLAGS)  $(NTB_OBJS) $(TRIE_OBJS) $(NT_RM_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/nt_bridge_$(DEVICE)$(EXE_EXTN)
+
+$(ARMV7BINDIR)/netapi/test/ifdma_test:  $(IFDMA_OBJS)
+        $(CC) $(LDFLAGS)  $(IFDMA_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/ifdma_test$(EXE_EXTN)
+
+$(ARMV7BINDIR)/netapi/test/net_test_bench_$(DEVICE):  $(NT_BENCH_OBJS) $(NT_RM_OBJS)
+        $(CC) $(LDFLAGS)  $(NT_BENCH_OBJS) $(NT_RM_OBJS) $(INTERNALLINKDEFS)  -o $(ARMV7BINDIR)/netapi/test/net_test_bench_$(DEVICE)$(EXE_EXTN)
diff --git a/ti/runtime/netapi/test/eqos_config1.txt b/ti/runtime/netapi/test/eqos_config1.txt
new file mode 100644
index 0000000..226f7dc
--- /dev/null
+++ b/ti/runtime/netapi/test/eqos_config1.txt
@@ -0,0 +1,24 @@
+queueBase = 6400
+flowBase = 0
+vlanId = 0
+ingressDefPri = 0
+port = 1
+mode = dscp
+priority_override= 0
+pbit_map_default = 0 0
+pbit_map_0 = 0 0
+pbit_map_1 = 0 0
+pbit_map_2 = 0 0
+pbit_map_3 = 0 0
+pbit_map_4 = 0 0
+pbit_map_5 = 0 8
+pbit_map_6 = 0 0
+pbit_map_7 = 0 0
+#dscp_ma flow queue
+dscp_map_default = 0 0
+dscp_map_0 = 0 0
+dscp_map_1 = 0 0
+dscp_map_2 = 0 0
+dscp_map_3 = 0 0
+dscp_map_4 = 0 0
+
diff --git a/ti/runtime/netapi/test/eqos_config2.txt b/ti/runtime/netapi/test/eqos_config2.txt
new file mode 100644
index 0000000..b4931e4
--- /dev/null
+++ b/ti/runtime/netapi/test/eqos_config2.txt
@@ -0,0 +1,24 @@
+queueBase = 6440
+flowBase = 0
+vlanId = 0
+ingressDefPri = 0
+port = 2
+mode = dscp
+priority_override= 0
+pbit_map_default = 0 0
+pbit_map_0 = 0 0
+pbit_map_1 = 0 0
+pbit_map_2 = 0 0
+pbit_map_3 = 0 0
+pbit_map_4 = 0 0
+pbit_map_5 = 0 8
+pbit_map_6 = 0 0
+pbit_map_7 = 0 0
+#dscp_ma flow queue
+dscp_map_default = 0 0
+dscp_map_0 = 0 0
+dscp_map_1 = 0 0
+dscp_map_2 = 0 0
+dscp_map_3 = 0 0
+dscp_map_4 = 0 0
+
diff --git a/ti/runtime/netapi/test/fdb.c b/ti/runtime/netapi/test/fdb.c
new file mode 100755
index 0000000..97732e0
--- /dev/null
+++ b/ti/runtime/netapi/test/fdb.c
@@ -0,0 +1,425 @@
+/**********************************************************
+ * file: fdb.c
+ * purpose: netcp configurations routines
+ **************************************************************
+ * FILE: fdb.c
+ * 
+ * DESCRIPTION:  linux bridge forwarding data base processing for
+ *               user space offload
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ****************************************************************************/
+#include "stdlib.h"
+#include "stdio.h"
+#include "netapi.h"
+#include "fdb.h"
+
+
+extern FDB_ENTRY_T         ale_cfg[];
+extern NETCP_CFG_ROUTE_T test_route[];
+extern uint16_t num_learned_macs;
+
+
+
+static OFFLOAD_DB_T our_fdb[2][OFFMAX];        //list offloaded, current and next
+static OFFLOAD_DB_T perm_do[PFDBMAX];         //white list
+static OFFLOAD_DB_T perm_dont[FDBMAX];     //black list`
+static OFFLOAD_DB_T learned[OFFMAX];     //filtered learned list`
+static int cur_off =-1;  //which db has been loaded
+static int n_cur_off=0;  //# of items offloaded
+
+//linux bridge fdb stuff
+//static struct our_fdb_entry linux_fdb[FDBMAX];
+
+//**********************************************************
+//Internal prototypes
+//**********************************************************
+
+//find a free slot
+int ntoff_find_free_slot(OFFLOAD_DB_T * pdb,int sz)
+{
+int s;
+for(s=0;s<sz;s++)
+{
+   if (pdb[s].flags==0x00000000)
+   {
+      return s;
+   }
+}
+return -1;
+}
+
+//find matching slot
+int  ntoff_find_slot(OFFLOAD_DB_T * pdb,__u8 * p_mac, __u8 switch_port,int sz)
+{
+int s;
+for(s=0;s<sz;s++)
+{
+   if (pdb[s].flags==0x00000000) continue;
+   if (pdb[s].switch_port != switch_port) continue;
+   if (memcmp(p_mac, &pdb[s].mac_addr[0],6)) continue;
+      return s;
+}
+return -1;
+}
+
+//delete
+void ntoff_delete(OFFLOAD_DB_T pdb[], int sz)
+{
+}
+
+//startup
+int ntoff_start(void)
+{
+  return 0;
+}
+
+//shutdown
+int ntoff_stop(void)
+{
+   ntoff_delete(&our_fdb[cur_off][0], n_cur_off);
+   return 0;
+}
+
+//*************************************************
+//manipulate the permanent do & don't lists
+//************************************************
+int ntoff_add_do_perm(unsigned char *p_mac,int switch_port)
+{
+  int s = ntoff_find_free_slot(perm_do,PFDBMAX);
+  if (s<0) return -1; //no room
+  memcpy(perm_do[s].mac_addr,p_mac,6);
+  perm_do[s].switch_port=switch_port;
+  perm_do[s].flags=OUR_FSB_INUSE|OUR_FSB_PERM;
+  return 0;
+}
+int ntoff_del_do_perm(unsigned char *p_mac, int switch_port)
+{
+  int s = ntoff_find_slot(perm_do,p_mac,switch_port,PFDBMAX);
+  if (s<0) return -1; //not found
+  perm_do[s].flags=0x00000000; //mark it is as free
+  return 0;
+
+}
+int ntoff_add_dont_perm(unsigned char *p_mac, int switch_port)
+{
+  int s = ntoff_find_free_slot(perm_dont,FDBMAX);
+  if (s<0) return -1; //no room
+  memcpy(perm_dont[s].mac_addr,p_mac,6);
+  perm_dont[s].switch_port=switch_port;
+  perm_dont[s].flags=OUR_FSB_INUSE|OUR_FSB_PERM;
+  return 0;
+
+}
+int ntoff_del_dont_perm(unsigned char *p_mac, int switch_port)
+{
+  int s = ntoff_find_slot(perm_dont,p_mac,switch_port,FDBMAX);
+  if (s<0) return -1; //not found
+  perm_dont[s].flags=0x00000000; //mark it is as free
+  return 0;
+}
+//**************************
+//ADD macs
+//**************************
+int ntoff_add_macs(NETAPI_T h, NETCP_CFG_ROUTE_HANDLE_T r , int fast)
+{
+    int i;
+    int err;
+    NETCP_CFG_ROUTE_HANDLE_T route;
+    NETCP_CFG_FLOW_T flow;
+    nwalLocCxtInfo_t info;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+
+    memset(&route, 0, sizeof(NETCP_CFG_ROUTE_HANDLE_T));
+    memset(&flow, 0, sizeof(NETCP_CFG_FLOW_T));
+
+    memset(&info, 0, sizeof(nwalLocCxtInfo_t));
+
+    nwal_getLocCxtInfo(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &info);
+
+
+    n_cur_off=0;
+    //perm entries 1st
+    for(i=0;i<PFDBMAX;i++)
+    {
+        if (perm_do[i].flags & OUR_FSB_INUSE)
+        {
+            netapi_netcpCfgCreateMacInterface(
+                          h,
+                          &perm_do[i].mac_addr[0],
+                          NULL,
+                          n_cur_off,
+                          0,
+                          //perm_do[i].switch_port == 1 ? (NETCP_CFG_ROUTE_HANDLE_T)&test_route[0]:(NETCP_CFG_ROUTE_HANDLE_T)&test_route[1],
+                          (NETCP_CFG_ROUTE_HANDLE_T)&test_route[perm_do[i].switch_port -1],
+                          (NETCP_CFG_VLAN_T ) NULL,
+                          0,
+                          1,
+                          &err);
+          perm_do[i].ifno = n_cur_off; 
+          n_cur_off+=1;
+        }
+    }
+    printf("ntoff_add_mac: num_learned_macs: %d\n", num_learned_macs);
+    //learned list next
+    for(i=0; (i < num_learned_macs) && (i < 32) ;i++)
+
+    //for(i=0;(i<OFFMAX)&&(n_cur_off<OFFMAX);i++)
+    {
+        if (learned[i].flags & OUR_FSB_INUSE)
+        {
+            printf("ntoff_add_macs: index: %d\n", i);
+            netapi_netcpCfgCreateMacInterface(
+                      h,
+                      &learned[i].mac_addr[0],
+                      NULL,
+                      n_cur_off,
+                      0,
+                      //learned[i].switch_port == 1 ? (NETCP_CFG_ROUTE_HANDLE_T)&test_route[0]:(NETCP_CFG_ROUTE_HANDLE_T)&test_route[1],
+                      (NETCP_CFG_ROUTE_HANDLE_T)&test_route[learned[i].switch_port-1],
+                      (NETCP_CFG_VLAN_T ) NULL,
+                      0,
+                      1,
+                      &err);
+            learned[i].ifno = n_cur_off;
+            n_cur_off+=1;
+        }
+    }
+    return n_cur_off;
+}
+//***************************
+//DEL MACS
+//***************************
+int ntoff_del_macs(NETAPI_T h)
+{
+int i;
+int err;
+
+    //perm  entries
+    for(i=0;i<PFDBMAX;i++)
+    {
+        if (perm_do[i].flags & OUR_FSB_INUSE)
+        {
+            netapi_netcpCfgDelMac(h, perm_do[i].ifno ,&err);
+            perm_do[i].ifno = 0;
+             n_cur_off-=1;
+        }
+    }
+    //learned entries 
+    for(i=0;(i<OFFMAX)&&(n_cur_off>=0);i++)
+    {
+        if (learned[i].flags & OUR_FSB_INUSE)
+        {
+            netapi_netcpCfgDelMac(h, learned[i].ifno ,&err);
+            learned[i].ifno = 0;
+            n_cur_off-=1;
+        }
+    }
+    return 0;
+
+}
+
+
+
+//*************************
+//do_offload
+//  - read what linux is seeing
+//  - build newoffload list:
+//    -- perm do list +
+//    -- newoffload (sorted by maxage)
+//    -- oldoffload
+//*************************
+#if 0
+int ntoff_do_offload(NETAPI_T nh, int fast)
+{
+   int next_cur = !cur_off;
+   int i;
+   int new_count=0;
+   //read bridges DB
+   new = ntoff_read_fdb(linux_fdb,FDBMAX);
+   new = nt_sort_and_filter_fdb(linux_fdb,learned,new); //sort list, filter out ones that match perm_do[], perm_dont[];
+
+   //build the new offload db
+   //1st copy over permanent entries frin perm_do[] list
+   for(i=0; (new_count<OFFMAX)&&(i<PFDBMAX); )
+   {
+     if (perm_do[i].switch_port == 0xff)
+     {
+           i+=1;
+     }
+     else
+     {
+           our_fdb[next_cur][new_count].mac_addr= perm_do[i].mac_addr;
+           our_fdb[next_cur][new_count].switch_port = perm_do[i].switch_port;
+           our_fdb[next_cur][new_count].flags=OUR_FSB_INUSE|OUR_FSB_PERM;
+           i+=1;
+           new_count+=1;
+     }
+   }
+   //now copy over sorted & filtered  new entries from linux's db
+   for (i=0;(new_count<OFFMAX) && (i<new))
+   {
+           our_fdb[next_cur][new_count].mac_addr= linux_fdb[i].mac_addr;
+           our_fdb[next_cur][new_count].switch_port= linux_fdb[i].switch_port;
+           our_fdb[next_cur][new_count].flags=OUR_FSB_INUSE;
+           i+=1;
+           new_count+=1;
+   }
+   //if we have room, now copy ones from the old list that we want to keep
+   for (i=0; (new_count<OFFMAX) && (i<OFFMAX); )
+   {
+      
+   }
+
+   //mark the rest of the entries as not in use
+   for(i=new_count; i< OFFMAX; i++)  our_fdb[next_cur][new_count].flags=0x00000000;
+   
+
+   //delete old entries
+   ntoff_delete(&our_fdb[cur_off][0], n_cur_off);
+
+   //add new entries
+   ntoff_add(&our_fdb[next_cur][0], new_count);
+
+   //flip entries
+   cur_off= next_cur;
+   n_cur_off= new_count;
+
+}
+
+
+//******************
+// read the fdb
+// return #entries
+//******************
+int ntoff_read_fdb(struct our_fdb_entry fdb[], int max_fdb)
+{
+    FILE * f = fopen("/sys/class/net/br0/brforward", "r");
+      //FILE * f = fopen("blah.fdb", "r");
+    int n=0;
+      if (f) {
+           n = fread(fdb, sizeof(struct our_fdb_entry),max_fdb , f);
+           fclose(f);
+      } 
+      return n;
+}
+#endif
+
+/********************************
+ * filter & sort learned list
+ *********************************/
+int ntoff_sort_and_filter(struct our_fdb_entry raw[],OFFLOAD_DB_T pl[]  ,int sz)
+{
+    int i,j;
+    int s;
+
+    for(i=0,j=0; (i<sz)&&(j<OFFMAX);)
+    {
+        if(raw[i].is_local) {i+=1; continue;}
+        if(raw[i].ageing_timer_value > THRESH_OFF) { i+=1; continue;}
+        s = ntoff_find_slot(perm_dont,&raw[i].mac_addr[0], raw[i].switch_port,FDBMAX);
+        if (s>=0) {i+=1; continue;}
+        s = ntoff_find_slot(perm_do,&raw[i].mac_addr[0], raw[i].switch_port,PFDBMAX);
+        if (s>=0) {i+=1; continue;}
+        //OK to learn
+        pl[j].switch_port = raw[i].switch_port;
+        memcpy(&pl[j].mac_addr[0], &raw[i].mac_addr[0],6);
+        pl[j].flags = OUR_FSB_INUSE | OUR_FSB_LEARN;
+        j+=1;
+        i+=1;
+    }
+    //zap the rest of the table
+    for(i=j;i<OFFMAX;i++)  pl[i].flags= 0x00;
+
+    return j;
+}
+
+/*******************************
+ * learn what the Linux bridge knows
+ ******************************************/
+int ntoff_learn(void)
+{
+    int new;
+    new = ntoff_sort_and_filter(&ale_cfg, learned,32);
+    return 0;
+
+}
+
+//*******************************
+//show stuff
+//*******************************
+void nt_print_fdb(char* title, OFFLOAD_DB_T *p, int sz)
+{
+    int i;
+    printf("%s \n", title);
+    printf("MAC           switch_port    FLAGS\n");
+    
+    for (i=0;i<sz;i++)
+    {
+    if (p[i].flags & OUR_FSB_INUSE) printf("%x-%x-%x-%x-%x-%x   %d  %x\n",
+                                           p[i].mac_addr[0],
+                                           p[i].mac_addr[1],
+                                           p[i].mac_addr[2],
+                                           p[i].mac_addr[3],
+                                           p[i].mac_addr[4],
+                                           p[i].mac_addr[5],
+                                           p[i].switch_port, p[i].flags);
+}
+}
+
+void ntoff_show(void)
+{  
+   nt_print_fdb("perm_dont:",perm_dont,FDBMAX);
+   nt_print_fdb("perm do:", perm_do,PFDBMAX);
+   nt_print_fdb("learned:", learned, OFFMAX);
+}
+
+//#define TEST
+#ifdef TEST
+unsigned char m1[6] = {0x00,0x01,0x2,0x3,0x4,0x5};
+unsigned char m2[6] = {0x00,0x01,0x2,0x3,0x4,0x6};
+
+void main()
+{
+    ntoff_start();
+    ntoff_add_do_perm(m1,1);
+    ntoff_add_do_perm(m2,2);
+    ntoff_learn();
+    ntoff_show();
+    ntoff_del_do_perm(m2,2);
+    ntoff_del_do_perm(m1,1);
+    ntoff_stop();
+
+}
+
+#endif
diff --git a/ti/runtime/netapi/test/fdb.h b/ti/runtime/netapi/test/fdb.h
new file mode 100755
index 0000000..952153b
--- /dev/null
+++ b/ti/runtime/netapi/test/fdb.h
@@ -0,0 +1,140 @@
+/**********************************************************
+ * file: fdb.h
+ * purpose: netcp configurations routines
+ **************************************************************
+ * FILE: fdb.c
+ * 
+ * DESCRIPTION:  linux bridge forwarding data base processing for
+ *               user space offload
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ ****************************************************************************/
+#include "stdlib.h"
+#include "stdio.h"
+#include "netapi.h"
+//#include "fdb.h"
+
+#define __u8  unsigned char
+#define __u32  unsigned int
+#define FDBMAX 128
+#define PFDBMAX 8
+#define OFFMAX  32
+#define THRESH_OFF  50   //aging timer threshold: don't bother offloading entries < THRESH_OFF
+
+#define MAX_INTERFACES 2
+#define MAX_DSCP_ENTRIES 64
+#define MAX_PBIT_ENTRIES 8
+
+#define ntBridge_INIT_CONFIG_FLOW_BASE              "flowBase"
+#define ntBridge_INIT_CONFIG_QUEUE_BASE              "queueBase"
+#define ntBridge_INIT_CONFIG_VLAN_ID                "vlanId"
+#define ntBridge_INIT_CONFIG_INGRESS_DEF_PRI        "ingressDefPri"
+#define ntBridge_INIT_CONFIG_PORT                   "port"
+#define ntBridge_INIT_CONFIG_DSCP_MAP_DEFAULT       "dscp_map_default"
+#define ntBridge_INIT_CONFIG_PBIT_MAP_DEFAULT       "pbit_map_default"
+
+//#define ntBridge_INIT_CONFIG_DSCP_MAP               "dscpMap"
+//#define ntBridge_INIT_CONFIG_PBIT_MAP               "pbitMap"
+#define ntBridge_INIT_CONFIG_QOS_MODE               "mode"
+
+
+typedef struct{
+    char flowBase[512];
+    char queueBase[512];
+    char vlanId[512];
+    char ingressDefPri[512];
+    char port[512];
+    char dscpMapQDefault[512];
+    char dscpMapFDefault[512];
+    char dscpMapQ[64][512];
+    char dscpMapF[64][512];
+    char pbitMapQDefault[512];
+    char pbitMapFDefault[512];
+    char pbitMapQ[8][512];
+    char pbitMapF[8][512];
+    char ctrlBitMap[512];
+} ntBridgeCfgFile_T;
+
+
+typedef struct{
+    char mac[32][512];
+    char switch_port[32][512];
+} ntBridgeAleCfgFile_T;
+
+typedef struct {
+unsigned char           mac[32][6];
+uint8_t                 switch_port[32];
+} ntBridgeAleCfg_T;
+
+//the bridge fdb entry
+typedef struct our_fdb_entry
+{
+      uint8_t mac_addr[6];
+      uint8_t switch_port;
+      uint8_t is_local;
+      uint32_t ageing_timer_value; //jiffies
+      uint32_t unused;
+} FDB_ENTRY_T;
+
+//our offload db
+typedef struct offload_db_t
+{
+  __u8 mac_addr[6];
+  __u8 switch_port;   //
+  __u8 ifno;   //
+  __u32 spare0;
+  __u32 flags;
+#define OUR_FSB_INUSE 0x80000000
+#define OUR_FSB_PERM  0x40000000
+#define OUR_FSB_LEARN  0x20000000
+#define OUR_FSB_SKIP  0x00000001
+} OFFLOAD_DB_T;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ti/runtime/netapi/test/ifdma_test.c b/ti/runtime/netapi/test/ifdma_test.c
new file mode 100755
index 0000000..2f91761
--- /dev/null
+++ b/ti/runtime/netapi/test/ifdma_test.c
@@ -0,0 +1,566 @@
+/******************************************
+ * File: ifdma-test.c
+ * Purpose: test of infrastructure dma mode
+ **************************************************************
+ * FILE:  ifdma-test.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sched.h>
+
+#include "trie.h"
+#include "string.h"
+#include "netapi.h"
+#include "pktio.h"
+#include "net_test.h"
+#include <ti/drv/sa/salld.h>
+
+
+void benchmarks(void);
+static inline unsigned long netapi_timing_start(void)
+{
+        volatile int vval;
+        //read clock
+        asm volatile("mrc p15, 0, %0, c9, c13, 0" :  "=r"(vval));
+        return vval;
+}
+
+//turn this off to use packets received from Network instead of self generated ones
+#define INTERNAL_PACKETS
+static int scnt=0;
+static int QUIT=0;
+__thread int our_core;
+
+
+#define IFDMA_FLOW_INDEX 33
+#define IFMDA_HEAP_SIZE 200
+#define IFDMA_MAX_NUM_HEAPS 2
+#define IFDMA_MAX_HEAP_PKTS 128
+//sig handler
+void netTest_utilMySig(int x)
+{
+  QUIT=1;
+  scnt+=1;
+  printf(">ifdma-test: recv'd signal %d cnt=%d\n",x,scnt);
+  if (scnt > 10) {printf(">ifdma-test: WARNING EXITING WITH PROPER SHUTDOWN, LUTS LEFT ACTIVE\n");exit(1);}
+
+}
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+void recv_cb_consumer(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+
+/*************debug********************/
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+   printf("--------dump of descriptor %d %x\n", n, (int) p);
+   printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("-----------------------------\n");
+}
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r)
+{
+   printf("--------dump of header %d %x appID=%x flag1=%x\n", n, (int) p,a,r);
+   printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[16],p[17],p[18],p[19],p[20],p[21],p[22],p[23]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[24],p[25],p[26],p[27],p[28],p[29],p[30],p[31]);
+   printf("-----------------------------\n");
+}
+/*****************************************/
+
+
+
+
+
+
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+TUNE_NETAPI_PERM_MEM_SZ,
+128,  //start of packet offset for hw to place data on rx for default flow
+TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+64, //#descriptors w/o buffers in default heap
+TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+128   ,  //tail room
+256,      //extra room 
+0,
+NULL,
+18,
+0x2000
+};
+
+Pktlib_HeapHandle OurHeap;     //default heap, used by producer
+Pktlib_HeapHandle consumerHeap; //for consumer
+PKTIO_HANDLE_T * rx_chan;  //for consumer
+PKTIO_HANDLE_T * tx_chan;  // for producer
+PKTIO_CFG_T rx_chan_cfg={PKTIO_RX|PKTIO_TX, PKTIO_GLOBAL, PKTIO_Q_ANY, 8};
+PKTIO_CFG_T tx_chan_cfg={PKTIO_TX, PKTIO_GLOBAL|PKTIO_IFDMA, /*PKTIO_Q_ANY*/ 820, 8};
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_HANDLE_T * netcp_rx_chan;
+NETAPI_T netapi_handle;
+NETCP_CFG_FLOW_HANDLE_T specialFlow;  //for consumer.  Producer uses the "flowid" in this handle as meta data when he sends data
+
+PKTIO_CONTROL_T zap_channel_control={PKTIO_CLEAR, NULL};
+
+NETCP_CFG_ROUTE_T  test_route=
+{
+0,
+NULL,
+NULL,
+0,
+0,
+0,
+1
+};
+
+
+/*************************END NETAPI OBJECTS***********************/
+
+static unsigned char all_mac[]={0,0,0,0,0,0};
+
+
+#define IFDMA_PKT_LEN 100
+
+//stats
+int pkt_rx=0; 
+int pkt_tx=0;
+int pkt_stall=0;
+
+//***************************
+//consumer thread 
+//**************************
+void consumer_thread(int coreid)
+{
+int err;
+int np;
+cpu_set_t cpu_set;
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 1, &cpu_set);
+    hplib_utilSetupThread(1, &cpu_set,hplib_spinLock_Type_LOL);
+
+     for(;!((volatile int)QUIT);)
+     {
+         np = netapi_pktioPoll(rx_chan,NULL,&err);
+         pkt_rx+=np;
+     }
+     printf("IFDMA-TEST: CONSUMER DONE %d packets received\n", pkt_rx);
+}
+
+
+//**********************************
+//producer thread
+//*********************************
+void producer_thread(int coreid)
+{
+int err;
+int i;
+Ti_Pkt * tip;
+unsigned char * pData;
+int len;
+PKTIO_METADATA_T meta = {PKTIO_META_IFDMA_TX,{0},0};
+int np;
+cpu_set_t cpu_set;
+
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 2, &cpu_set);
+    hplib_utilSetupThread(2, &cpu_set,hplib_spinLock_Type_LOL);
+
+#ifdef INTERNAL_PACKETS
+      //generate packets internally by allocating from OurHeap (the NETAPI 
+      //default) and send to receiver via ifdma pktio channel
+      sleep(5);
+      for(i=0;!((volatile int) QUIT);i++)
+      {
+          tip=Pktlib_allocPacket(OurHeap,IFDMA_PKT_LEN);
+          if (!tip) 
+          {
+              pkt_stall+=1;
+              sleep(1); //out of buffers, let consumer catch up
+              continue;
+           }
+           Pktlib_getDataBuffer(tip,&pData,&len);
+           sprintf(pData,"this is packet %d", pkt_tx);
+           Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, pData,IFDMA_PKT_LEN);
+           Pktlib_setPacketLen(tip,IFDMA_PKT_LEN);
+           meta.u.tx_ifdma_dest=((NETCP_CFG_FLOW_T*)specialFlow)->flowid;
+           netapi_pktioSend(tx_chan,tip,&meta,&err);
+           pkt_tx+=1;
+           if(!(pkt_tx % 64)) sched_yield(); //give consumer a chance
+      }
+#else
+     //relay packets from network.  recv_cb registered when we created
+     //netcp_rx_chan will do this relay via the ifdma pktio channel
+     //so we poll the default pktio channel for pkts from net
+      for(i=0;!((volatile) QUIT);i++)
+      {
+        np = netapi_pktioPoll(netcp_rx_chan,NULL,&err);
+        if (!np) sched_yield();
+
+      }
+#endif
+      printf("IFDMA-TEST: PRODUCER  DONE %d pkts sent (stalls=%d)\n", pkt_tx,pkt_stall);
+}
+
+
+//******************************
+//  main program
+//*****************************
+int main(int argc, char **argv)
+{
+    int err,i;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    Pktlib_HeapCfg heapCfg;
+    long t1, t2 ;
+    cpu_set_t cpu_set;
+
+
+     //install signal handler for ^c
+    signal(SIGINT,netTest_utilMySig);
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+
+
+    /*******************************************/
+    /*************NETAPI STARTUP****************/
+    /*******************************************/
+
+    /* create netapi */
+    netapi_handle = netapi_init(NETAPI_SYS_MASTER, &our_netapi_default_cfg);
+    printf("main: returned from netapi_init\n");
+
+    /* Un-configure rules for execption packet handling */
+    /* open the main heap */
+    OurHeap = Pktlib_findHeapByName("netapi");
+    if (!OurHeap) {printf("findheapbyname fail\n"); exit(1);}
+
+    //create a receive queue for consumer
+    rx_chan=netapi_pktioCreate(netapi_handle,"ourrxq",(PKTIO_CB) recv_cb_consumer, &rx_chan_cfg,&err);
+    if (!rx_chan) {printf("pktio create failed err=%d\n",err); exit(1);}
+
+
+#ifndef INTERNAL_PACKETS
+    //if we want to relay network packets, we create a handle to the 
+    //default netcp receive queue here
+    netcp_rx_chan= netapi_pktioOpen(netapi_handle, NETCP_RX, (PKTIO_CB) recv_cb_net, &netcp_rx_cfg,  &err);
+    if (!netcp_rx_chan) {printf("pktio open RX failed err=%d\n",err); exit(1);}
+#endif
+
+//********************************
+//create a consumer heap
+//**********************************
+
+    /* Initialize the heap configuration. */
+    memset ((void *)&heapCfg, 0, sizeof(Pktlib_HeapCfg));
+
+    pPktifTable = netapi_getPktlibIfTable();
+
+    /* Populate the heap configuration */
+    heapCfg.name                = "netapi-consumer";
+    heapCfg.memRegion           = netapi_getMemoryRegionId(netapi_handle);
+    heapCfg.sharedHeap          = 1;
+    heapCfg.useStarvationQueue  = 0;
+    heapCfg.dataBufferSize      = TUNE_NETAPI_DEFAULT_BUFFER_SIZE;
+    heapCfg.numPkts             = IFDMA_MAX_HEAP_PKTS;
+    heapCfg.numZeroBufferPackets= 0;
+    heapCfg.heapInterfaceTable.data_malloc  = pPktifTable->data_malloc;
+    heapCfg.heapInterfaceTable.data_free    = pPktifTable->data_free;
+    heapCfg.dataBufferPktThreshold   = 0;
+    heapCfg.zeroBufferPktThreshold   = 0;
+    consumerHeap = Pktlib_createHeap(&heapCfg, &errCode);
+
+    //by registering the heap, netapi will take care of
+    //cleaning it up @ shutdown..
+    netapi_registerHeap(netapi_handle, consumerHeap);  //register heap.
+
+    //**************************************************
+    //create a FLOW for consumer RX. Note this is created
+    //in the QMSS (INFRASTRUCTURE) CPPI DMA ENGINE
+    // todo:  flowindex should be passed in or got
+    //        from resource manager
+    //*************************************************
+    {
+    Pktlib_HeapHandle heaps[2];
+    int sizes[2];
+#define SPECIAL_SOP_OFF 0
+    NETCP_CFG_FLOW_CONFIG_T flow_config={IFDMA_FLOW_INDEX,
+                                         NETAPI_DMA_INFRASTRUCTURE,
+                                         SPECIAL_SOP_OFF,
+                                         NETAPI_FLOW_BLOCK };
+    heaps[0]= consumerHeap;
+    sizes[0]=IFMDA_HEAP_SIZE;
+    heaps[1]= consumerHeap;
+    sizes[1]=TUNE_NETAPI_DEFAULT_BUFFER_SIZE - SPECIAL_SOP_OFF;
+    flow_config.p_dest_q = rx_chan; // send pkts to rx_chan 
+
+    //specialFlow handle will hold "magic" flowid that producer needs to
+    //include in his pkto_send meta data
+    specialFlow = netapi_netcpCfgAddFlow( netapi_handle,
+                                    IFDMA_MAX_NUM_HEAPS,  //1 heap defined
+                                    heaps,
+                                    sizes,
+                                    &flow_config,  //offset to start rx is 128 
+                                    &err);
+    if (err) {printf("add flow failed\n", err); exit(1);}
+}
+
+//************************************************************
+//create the IDMA channel:  this is used by producer to either
+//send generated packets or relay received packets from net
+//***************************************************************
+tx_chan=netapi_pktioCreate(netapi_handle,"ourtxq",NULL, &tx_chan_cfg,&err);
+if (!tx_chan) {printf("pktio create failed err=%d\n",err); exit(1);}
+
+#ifndef INTERNAL_PACKETS 
+//if we want to relay packets, creaate a simple netcp rule
+//to get a lot of packets
+netapi_netcpCfgCreateMacInterface(
+                  netapi_handle,
+                  &all_mac[0],
+                  NULL,
+                  0,
+                  0,
+                  (NETCP_CFG_ROUTE_HANDLE_T)  NULL, 
+                  (NETCP_CFG_VLAN_T ) NULL ,  //future
+                  1,
+                  &err);
+#endif
+
+/*********************************************/
+/*****************end NETAPI STARTUP**********/
+/*********************************************/
+
+#if 1
+//sonme benchmarks
+benchmarks();
+#endif
+//**************************************
+//Create a consumer and producer thread
+//***************************************
+{
+        pthread_t *thrs;
+        int procs =2; 
+        int c;
+        thrs = malloc( sizeof( pthread_t ) * procs );
+        if (thrs == NULL)
+        {
+                perror( "malloc" );
+                return -1;
+        }
+        printf( "ifdma-test: Starting %d threads...\n", procs );
+
+        if (pthread_create( &thrs[0], NULL, (void*)consumer_thread,
+                        (void *)0 ))
+        {
+                        perror( "pthread_create" );
+                        exit(1);
+        }
+        if (pthread_create( &thrs[1], NULL, (void*)producer_thread,
+                        (void *)1 ))
+        {
+                        perror( "pthread_create" );
+                        exit(1);
+        }
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+           printf(">");
+           c=getchar();
+           if (c=='q') {QUIT=1;break;}
+           else if (c=='s') printf(">IFDMA-TEST STATS:   %d sent, %d received stall=%d \n",pkt_tx, pkt_rx,pkt_stall);
+           else if (c=='h') printf("> 'q' to quit,  's' for stats,  'h' for help\n");
+        }
+
+        //wait for completion 
+        printf("main task now pending on thread completion\n");
+        for (i = 0; i < procs; i++)
+                pthread_join( thrs[i], NULL );
+
+        free( thrs );
+      
+}
+
+/*************************************************
+ ************CLEAN UP****************************
+ ************************************************/
+#ifndef INTERNAL_PACKETS
+//get rid of rule, in the case that we are relaying packets
+//also close our netcp rx channel
+netapi_netcpCfgDelMac(netapi_handle,0,&err);
+netapi_pktioClose(netcp_rx_chan,&err);
+#endif
+
+//close pktio channels we opened
+netapi_pktioDelete(tx_chan ,&err);
+netapi_pktioDelete(rx_chan ,&err);
+
+//close flow
+netapi_netcpCfgDelFlow(netapi_handle, specialFlow, &err);
+
+//done
+netapi_shutdown(netapi_handle);
+
+
+//!finished!
+}
+
+
+//receive callback for packets from net (for consumer)
+// this is used for case where we want to relay packets from
+// network, instead of internally generating them
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+int i;
+PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+Ti_Pkt * tip;
+int err;
+
+for(i=0;i<n_pkts;i++)
+{
+    tip = p_recv[i];
+    meta2.u.tx_ifdma_dest=((NETCP_CFG_FLOW_T*)specialFlow)->flowid;
+    netapi_pktioSend(tx_chan,tip,&meta2,&err);
+    pkt_tx+=1;
+    if(!(pkt_tx % 128)) sched_yield(); //give consumer a chance
+}
+
+
+}
+
+
+//receive callback for consumer (registered when we create pktio channel)
+void recv_cb_consumer(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+int i;
+int len;
+Ti_Pkt * tip;
+unsigned int templen;
+char * p_pkt;
+
+for(i=0;i<n_pkts;i++)
+{
+        tip = p_recv[i];
+        Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+        len = Pktlib_getPacketLen(tip);
+        Pktlib_freePacket((Ti_Pkt*)tip);
+}
+return;
+}
+
+
+
+
+//SOME BENCHMARKS
+//sonme benchmarks
+void benchmarks(void)
+{
+int i,j;
+unsigned long v1pop;
+unsigned long v2pop;
+unsigned long v1push;
+unsigned long v2push;
+unsigned long v1read;
+unsigned long v2read;
+unsigned long v1write;
+unsigned long v2write;
+unsigned long v1read2;
+unsigned long v2read2;
+#define N 100
+Ti_Pkt  pkts[N];
+unsigned char * p_pkt;
+int len;
+int sum=0;
+int sum2=0;
+char *p=(char *) malloc(1000);
+
+//queue pop
+v1pop=netapi_timing_start();
+for(i=0;i<N;i++)   pkts[i]= Pktlib_allocPacket(OurHeap,1000);
+v2pop = netapi_timing_start();
+
+//write access
+Pktlib_getDataBuffer(pkts[0],(uint8_t**)&p_pkt,&len);
+v1write=netapi_timing_start();
+for(i=0;i<1000;i++) p_pkt[i]=i;
+v2write=netapi_timing_start();
+
+// access
+
+v1read=netapi_timing_start();
+for(j=0;j<10;j++)
+for(i=0;i<1000;i++) sum+=p_pkt[i];
+v2read=netapi_timing_start();
+
+// access (from malloc)
+v1read2=netapi_timing_start();
+for(i=0;i<1000;i++) sum2+=p[i];
+v2read2=netapi_timing_start();
+
+//queue push
+v1push=netapi_timing_start();
+for(i=0;i<N;i++)   Pktlib_freePacket(pkts[i]);
+v2push = netapi_timing_start();
+
+//resutls
+printf("allocs= %d  free=%d   write=%d  read=%d read-malloc=%d (sum=%d %d)\n",
+        (v2pop-v1pop)/N, (v2push-v1push)/N,  (v2write-v1write)/1000, (v2read-v1read)/10000,
+        (v2read2-v1read2)/1000,sum,sum2);
+
+}
diff --git a/ti/runtime/netapi/test/net_test.h b/ti/runtime/netapi/test/net_test.h
new file mode 100755
index 0000000..9caae3f
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test.h
@@ -0,0 +1,61 @@
+/******************************************************************************
+ * FILE PURPOSE:  local defines for net_test application.
+ ******************************************************************************
+ * FILE NAME:   net_test.h
+ *
+ * DESCRIPTION: NET TEST definitions and defines
+ *
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+/* ============================================================= */
+
+#ifndef __NET_TEST_H__
+#define __NET_TEST_H__
+
+#include "netapi.h"
+#include "trie.h"
+
+//#include "net_test_sa_utils.h"
+//#include "net_test_utils.h"
+//#include "net_test_thread_utils.h"
+
+//#include "net_test_sa_utils.h"
+//define this for multi-thread
+#define netTest_MULTI_THREAD
+
+
+#define netTest_DSP_FASTPATH
+
+
+#endif
diff --git a/ti/runtime/netapi/test/net_test_bench.c b/ti/runtime/netapi/test/net_test_bench.c
new file mode 100755
index 0000000..80fbc54
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_bench.c
@@ -0,0 +1,743 @@
+/******************************************
+ * File: nt_bench.c   
+ * Purpose:  benchmarks for NT.
+ **************************************************************
+ * FILE:  nt_bench.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application : benchmarks
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sched.h>
+
+//#include "trie.h"
+#include "string.h"
+#include "netapi.h"
+//#include "pktio.h"
+#include "net_test.h"
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+#include "net_test_thread_utils.h"
+#include <ti/drv/sa/salld.h>
+
+#if defined(DEVICE_K2H)
+#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/drv/qmss/device/k2k/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
+#elif defined (DEVICE_K2L)
+#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/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+#else /*Default */
+#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
+#endif /* Device */
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+#define netapi_timing_start hplib_mUtilGetPmuCCNT
+
+static int scnt=0;
+static int QUIT=0;
+static int XMIT=0;
+static int CAP=0;
+volatile int RESET=0; //to reset stats
+
+__thread int our_core;
+
+void benchmarks1(void);
+void benchmarks2(Pktlib_HeapHandle h , int n_trials);
+void benchmarks3(Pktlib_HeapHandle h , int n_trials);
+
+//sig handler
+void netTest_utilMySig(int x)
+{
+  QUIT=1;
+  scnt+=1;
+  printf(">ifdma-test: recv'd signal %d cnt=%d\n",x,scnt);
+  if (scnt > 10) {printf(">ifdma-test: WARNING EXITING WITH PROPER SHUTDOWN, LUTS LEFT ACTIVE\n");exit(1);}
+
+}
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+
+/*************debug********************/
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+   printf("--------dump of descriptor %d %x\n", n, (int) p);
+   printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("-----------------------------\n");
+}
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r)
+{
+   printf("--------dump of header %d %x appID=%x flag1=%x\n", n, (int) p,a,r);
+   printf("> %0x %0x %0x %0x %0x %0x %0x %0x\n",
+          ntohl(p[0]),ntohl(p[1]),ntohl(p[2]),ntohl(p[3]),
+          ntohl(p[4]),ntohl(p[5]),ntohl(p[6]),ntohl(p[7]) );
+#if 0
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[16],p[17],p[18],p[19],p[20],p[21],p[22],p[23]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[24],p[25],p[26],p[27],p[28],p[29],p[30],p[31]);
+#endif
+   printf("-----------------------------\n");
+}
+/*****************************************/
+
+
+unsigned long long CALIB=0;
+unsigned long long calibrate_idle(void)
+{
+volatile unsigned long long  at1;
+volatile unsigned long long  at2;
+volatile unsigned long pt1;
+volatile unsigned long pt2;
+unsigned long long calib;
+at1 = hplib_mUtilGetTimestamp();
+pt1=netapi_timing_start();
+for(;;)
+{
+   pt2=netapi_timing_start()   ;
+   if ((pt2-pt1) >= 100000) break;
+}
+at2 = hplib_mUtilGetTimestamp();
+
+calib = ((unsigned long long) (pt2-pt1))/(at2-at1);
+printf("calibrate:   arm time=%lld  -> arm cycles=%d calib=%lld\n", at2-at1, pt2-pt1, calib);
+
+return calib;
+}
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+TUNE_NETAPI_PERM_MEM_SZ,
+128,  //start of packet offset for hw to place data on rx for default flow
+TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+64, //#descriptors w/o buffers in default heap
+TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+128,       //tail room
+256,      //extra room
+0,
+NULL,
+-1,
+-1
+};
+
+Pktlib_HeapHandle OurHeap;     //default heap, used by producer
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 12};
+PKTIO_HANDLE_T * netcp_rx_chan;
+PKTIO_HANDLE_T * netcp_tx_chan;
+NETAPI_T netapi_handle;
+
+PKTIO_CONTROL_T zap_channel_control={PKTIO_CLEAR, NULL};
+PKTIO_CONTROL_T poll_cannel_control={PKTIO_SET_POLL_FLAGS, NULL, nwal_POLL_DEFAULT_GLOB_PKT_Q};
+
+//template for fast path
+nwalTxPktInfo_t txPktInfoNoCrypto =
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    0,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                              
+   /* etherLenOffBytes */
+    netTest_MAC_HEADER_LEN,         /* ipOffBytes */
+    netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN,                                        /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                             /* l4HdrLen */
+    0,                                                                         /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+NETCP_CFG_ROUTE_T  test_route=
+{
+0,
+NULL,
+NULL,
+0,
+0,
+0,
+1
+};
+
+
+/*************************END NETAPI OBJECTS***********************/
+
+static unsigned char all_mac[]={0,0,0,0,0,0};
+
+static unsigned long last_header[32/sizeof(unsigned long)];
+
+
+//stats
+int pkt_rx=0; 
+int pkt_tx=0; 
+unsigned long long pkt_rx_cycles=0L;
+unsigned long long pkt_tx_cycles=0L;
+unsigned long long pkt_cb_cycles=0L;
+unsigned long long idle_cycles=0L;
+volatile unsigned long long start_time;
+unsigned long long end_time;
+
+//**********************************
+//producer thread
+//*********************************
+void producer_thread(int coreid)
+{
+int err;
+int i;
+Ti_Pkt * tip;
+unsigned char * pData;
+int len;
+PKTIO_METADATA_T meta = {PKTIO_META_IFDMA_TX,{0},0};
+int np;
+cpu_set_t cpu_set;
+unsigned long t1;
+unsigned long t2;
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 2, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+    start_time = hplib_mUtilGetTimestamp();
+
+     //DAL we poll the default pktio channel for pkts from net
+      for(i=0;!((volatile int) QUIT);i++)
+      {
+        t1 = netapi_timing_start();
+        np = netapi_pktioPoll(netcp_rx_chan,NULL,&err);
+        t2 = netapi_timing_start();
+        pkt_rx+=np;
+        if (np) 
+        {
+           pkt_rx_cycles += (t2-t1);
+        }
+        else
+        {
+           idle_cycles += (t2-t1);
+        }
+        if (RESET)
+        {
+              idle_cycles=0LL;
+              start_time = hplib_mUtilGetTimestamp();
+              pkt_rx=pkt_tx=0;
+              pkt_rx_cycles=pkt_tx_cycles=0LL;
+              pkt_cb_cycles=0LL;
+              RESET=0;
+        }
+      }
+      end_time = hplib_mUtilGetTimestamp();
+      printf("nt-bench: receiver  DONE %d pkts rx,  pkt poll cycles=% u; pkt rx cycle=%u pkt tx cycles=%u idle cycles=%lld duration=%lld ticks idle pct= %lld\n",
+             pkt_rx,
+             (unsigned)  (pkt_rx ?  (pkt_rx_cycles - pkt_cb_cycles)/pkt_rx : 0),
+             (unsigned)  (pkt_rx ?  (pkt_rx_cycles) /pkt_rx : 0),
+             (unsigned)  (pkt_tx ?  (pkt_tx_cycles) /pkt_tx : 0),
+             idle_cycles, (end_time-start_time), 
+             (idle_cycles*100) /( CALIB* (end_time-start_time))
+
+            );
+     printf("Leaving producer_thread\n");
+}
+
+
+//******************************
+//  main program
+//*****************************
+int main(int argc, char **argv)
+{
+    int err,i;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    Pktlib_HeapCfg heapCfg;
+    long t1, t2 ;
+    cpu_set_t cpu_set;
+    NETCP_CFG_ROUTE_T test_route;
+
+
+     //install signal handler for ^c
+    signal(SIGINT,netTest_utilMySig);
+
+    if (initRm())
+    {
+        printf("main: initRm() returned error\n");
+        exit(1);
+    }
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+
+
+    /*******************************************/
+    /*************NETAPI STARTUP****************/
+    /*******************************************/
+
+    /* create netapi */
+    our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+    netapi_handle = netapi_init(NETAPI_SYS_MASTER,
+                                &our_netapi_default_cfg);
+    if (netapi_handle == NULL)
+    {
+        printf("main: netapi_init failure, exiting\n");
+        exit(1);
+    }
+
+    /* open the main heap */
+    OurHeap = Pktlib_findHeapByName("netapi");
+    if (!OurHeap) {printf("findheapbyname fail\n"); exit(1);}
+
+    //if we want to relay network packets, we create a handle to the 
+    //default netcp receive queue here
+    netcp_rx_chan= netapi_pktioOpen(netapi_handle, NETCP_RX, (PKTIO_CB) recv_cb_net, &netcp_rx_cfg,  &err);
+    if (!netcp_rx_chan) {printf("pktio open RX failed err=%d\n",err); exit(1);}
+
+    netcp_tx_chan= netapi_pktioOpen(netapi_handle, NETCP_TX, (PKTIO_CB) NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan) {printf("pktio open TX failed err=%d\n",err); exit(1);}
+    else  //install a fast path template into the NETCP TX channel
+    {
+            PKTIO_CONTROL_T control2;
+            control2.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg2;
+            cfg2.fast_path_cfg.fp_send_option = PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT;
+            cfg2.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan, NULL, &cfg2, &control2, &err);
+   }
+
+
+/*********************************************/
+/*****************end NETAPI STARTUP**********/
+/*********************************************/
+
+/*************************************************
+********************some basic benchmarks*********
+**************************************************/
+printf("\n\n*******STARTING MEM ACCESS BENCHMARK*********\n\n");
+benchmarks1();
+printf("\n\n*******STARTING RAW BENCHMARK2*********\n\n");
+benchmarks2(OurHeap, 20);
+printf("\n\n*******STARTING RAW BENCHMARK3*********\n\n");
+benchmarks3(OurHeap, 20);
+printf("\n\n******STARTING RECV BENCHMARK (q to quit)*****\n\n");
+
+
+//now creaate a simple netcp rule
+//to get a lot of packets
+memset(&test_route, 0, sizeof(NETCP_CFG_ROUTE_T));
+test_route.valid_params = NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST;
+test_route.match_destination = NETCP_CFG_ACTION_TO_SW;
+test_route.routeType = 0;
+test_route.p_flow = NULL;
+test_route.p_dest_q = NULL;
+
+netapi_netcpCfgCreateMacInterface(
+                  netapi_handle,
+                  &all_mac[0],
+                  NULL,
+                  0,0,
+                  (NETCP_CFG_ROUTE_HANDLE_T)  &test_route,
+                  (NETCP_CFG_VLAN_T ) NULL ,  //future
+                  0,
+                  1,
+                  &err);
+
+//calibrate idle
+        CALIB = calibrate_idle();
+
+//**************************************
+//Create a worked thread
+//***************************************
+{
+        pthread_t *thrs;
+        int procs =1; 
+        int c;
+        thrs = malloc( sizeof( pthread_t ) * procs );
+        if (thrs == NULL)
+        {
+                perror( "malloc" );
+                return -1;
+        }
+        printf( "benchmark-test: Starting %d threads...\n", procs );
+
+        if (pthread_create( &thrs[0], NULL, (void*)producer_thread,
+                        (void *)0 ))
+        {
+                        perror( "pthread_create" );
+                        exit(1);
+        }
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+           printf(">");
+           c=getchar();
+           if (c=='c') {CAP=!CAP; printf("CAPTURE= %d\n", CAP); }
+           else if (c=='q') {QUIT=1;break;}
+           else if (c=='t') {XMIT=!XMIT; printf("XMIT= %d\n", XMIT); }
+           else if (c=='s') 
+           {
+              unsigned long long et= hplib_mUtilGetTimestamp();
+              printf(">NT_BENCH STATS:    %d received   %d xmitted,   %lld idle cycles,  %lld duration ticks  idle=%lld\n",
+                       pkt_rx,pkt_tx,
+                       idle_cycles,
+                       (et-start_time),
+                       (idle_cycles*100)/(CALIB*(et-start_time)));
+              Pktlib_HeapStats    pktLibHeapStats;
+              Pktlib_getHeapStats(OurHeap, &pktLibHeapStats);
+              printf("main  heap stats>  #free=%d #zb=%d #garbage=%d\n",
+                                pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets,
+                                pktLibHeapStats.numPacketsinGarbage);
+           }
+           else if (c=='r')
+           {
+              RESET=1;
+           }
+           else if (c=='h')
+           {
+                printf("> 'q' to quit,  's' for stats, 't' to toggle transmit  'c' to toggle capture, 'd' to dump capture, 'r' to reset idle counters,  'h' for help\n");
+           }
+           else if (c=='d')
+           {
+              netTest_utilDumpHeader(&last_header[0], 0,0,0);
+           }
+        }
+
+        //wait for completion 
+        printf("main task now pending on thread completion\n");
+        for (i = 0; i < procs; i++)
+                pthread_join( thrs[i], NULL );
+
+        free( thrs );
+      
+}
+
+/*************************************************
+ ************CLEAN UP****************************
+ ************************************************/
+//get rid of rule, in the case that we are relaying packets
+//also close our netcp rx channel
+netapi_netcpCfgDelMac(netapi_handle,0,&err);
+netapi_pktioClose(netcp_rx_chan,&err);
+netapi_pktioClose(netcp_tx_chan,&err);
+
+
+//done
+netapi_shutdown(netapi_handle);
+
+
+//!finished!
+}
+static inline void sendit(Ti_Pkt *tip, int len, int out_port)
+{
+  int err=0;
+  PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+  nwalTxPktInfo_t meta_tx2={0};
+  if (len<60)
+  {
+     unsigned int templen;
+     char * p_pkt;
+     len=60;
+     Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+     Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+  }
+  Pktlib_setPacketLen(tip,len);
+  meta_tx2.txFlag1 = NWAL_TX_FLAG1_META_DATA_VALID ; 
+  meta_tx2.ploadLen = len ;
+  meta_tx2.enetPort=out_port;
+  meta2.u.tx_meta=&meta_tx2;
+  netapi_pktioSend(netcp_tx_chan,tip,&meta2,&err);
+}
+
+//receive callback for packets from net (for consumer)
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+int i;
+Ti_Pkt * tip;
+int len;
+unsigned long t1;
+unsigned long t2;
+unsigned long t3;
+unsigned long t4;
+pasahoLongInfo_t* protoInfo; 
+int ifno;
+int out_port;
+
+t1= netapi_timing_start();
+for(i=0;i<n_pkts;i++)
+{
+    tip = p_recv[i];
+    len = Pktlib_getPacketLen(tip);
+
+    if (CAP)
+    {
+       unsigned int templen;
+       char * p_pkt;
+       Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+       memcpy(last_header,p_pkt,32);
+    }
+
+    if (XMIT)
+    {
+        protoInfo=nwal_mGetProtoInfo(tip);
+        ifno = nwal_mGetRxEmacPort( protoInfo);
+        //----------------------------------------------------
+        //very trivial bridging -> just output to other port!
+        //----------------------------------------------------
+        if (ifno ==1) out_port=2; else out_port=1;
+        t3= netapi_timing_start();
+        sendit(tip,len,out_port);
+        pkt_tx+=1;
+        t4= netapi_timing_start();
+        pkt_tx_cycles += (t4-t3);
+    }
+    else
+    {
+      Pktlib_freePacket((Ti_Pkt*)tip);
+    }
+}
+t2 = netapi_timing_start();
+pkt_cb_cycles += (t2-t1);
+}
+
+
+
+
+//SOME BENCHMARKS
+//sonme benchmarks
+void benchmarks1(void)
+{
+    int i,j;
+    unsigned long v1pop;
+    unsigned long v2pop;
+    unsigned long v1push;
+    unsigned long v2push;
+    unsigned long v1read;
+    unsigned long v2read;
+    unsigned long v1write;
+    unsigned long v2write;
+    unsigned long v1read2;
+    unsigned long v2read2;
+#define N 100
+    Ti_Pkt  pkts[N];
+    unsigned char * p_pkt;
+    int len;
+    int sum=0;
+    int sum2=0;
+    char *p=(char *) malloc(1000);
+
+    if(p)
+    {
+        for(i=0;i<1000;i++)
+            p[i] = i;
+        //alloc
+        v1pop=netapi_timing_start();
+        for(i=0;i<N;i++)   pkts[i]= Pktlib_allocPacket(OurHeap,1000);
+        v2pop = netapi_timing_start();
+
+        //write access
+        Pktlib_getDataBuffer(pkts[0],(uint8_t**)&p_pkt,&len);
+        v1write=netapi_timing_start();
+        for(i=0;i<1000;i++) p_pkt[i]=i;
+        v2write=netapi_timing_start();
+
+        //read access
+        v1read=netapi_timing_start();
+        for(j=0;j<10;j++)
+        for(i=0;i<1000;i++) sum+=p_pkt[i];
+        v2read=netapi_timing_start();
+
+        // access (from malloc)
+        v1read2=netapi_timing_start();
+        for(i=0;i<1000;i++) sum2+=p[i];
+        v2read2=netapi_timing_start();
+
+        //free packet
+        v1push=netapi_timing_start();
+        for(i=0;i<N;i++)   Pktlib_freePacket(pkts[i]);
+        v2push = netapi_timing_start();
+
+        //resutls
+        printf("allocs= %d  free=%d   write=%d  read=%d read-malloc=%d (sum=%d %d)\n",
+                (v2pop-v1pop)/N, (v2push-v1push)/N,  (v2write-v1write)/1000, (v2read-v1read)/10000,
+                (v2read2-v1read2)/1000,sum,sum2);
+        free(p);
+    }
+
+};
+
+
+//raw queue benchmark
+#include "ti/drv/nwal/nwal_util.h"
+
+#define NTOPOP 150
+volatile unsigned long t1;
+volatile unsigned long t2;
+volatile unsigned long t3;
+volatile unsigned long t4;
+volatile unsigned long t5;
+volatile unsigned long t6;
+volatile unsigned long sum1=0;
+volatile unsigned long sum2=0;
+volatile unsigned long sum3=0;
+volatile unsigned long sum4=0;
+volatile Ti_Pkt * pHd[NTOPOP];
+
+
+void benchmarks2(Pktlib_HeapHandle h , int ntrials)
+{
+int i,j;
+int k;
+int abort=0;
+Qmss_QueueHnd freeQ=Pktlib_getInternalHeapQueue(h);
+
+//n_trials of NTOPOP actions
+for(i=0;i<ntrials;i++)
+{
+    abort=0;
+    sum1=sum2=sum3=sum4=0;
+    //raw pop
+    t1= netapi_timing_start();
+    for(j=0;j<NTOPOP;j++)
+    {
+       pHd[j] = (Ti_Pkt *)QMSS_DESC_PTR(pktio_mQmssQueuePopRaw (freeQ));
+       if (!pHd[j]) 
+       {
+         printf("abort test. out of descriptors\n"); abort=1;
+         break;
+       }
+    }
+    t2= netapi_timing_start();
+    k=j;
+    for(j=0;j<k;j++)
+    {
+       pHd[j]  =  Osal_qmssConvertDescPhyToVirt(0,pHd[j]);
+    }
+    t3= netapi_timing_start();
+    sum1 += (t2-t1);
+    sum2 += (t3-t2);
+    //raw push
+    t4= netapi_timing_start();
+    for(j=0;j<k;j++)
+    {
+       if (!pHd[j]) continue;
+       pHd[j]= Osal_qmssConvertDescVirtToPhy(0,pHd[j]);
+    }
+    t5= netapi_timing_start();
+    for(j=0;j<k;j++)
+    {
+      pktio_mQmssQueuePushDescSizeRaw(freeQ,
+                                             (void *) pHd[j],
+                                             128);
+    }
+    t6= netapi_timing_start();
+    sum3 += (t5-t4);
+    sum4 += (t6-t5);
+
+    if (!abort)
+    printf("nt=%d raw pop=%d  p2v=%d v2p=%d raw push=%d\n", i,
+             sum1/k,  sum2/k, sum3/k, sum4/k);
+    sleep(1);
+}
+return;
+}
+
+//full queue push/pops
+void benchmarks3(Pktlib_HeapHandle h , int ntrials)
+{
+int i,j;
+int k;
+int abort=0;
+Qmss_QueueHnd freeQ=Pktlib_getInternalHeapQueue(h);
+
+//n_trials of NTOPOP actions
+for(i=0;i<ntrials;i++)
+{
+    abort=0;
+    sum2=sum4=0;
+    //raw pop
+    t1= netapi_timing_start();
+    for(j=0;j<NTOPOP;j++)
+    {
+       pHd[j] = (Ti_Pkt *)QMSS_DESC_PTR(Qmss_queuePop(freeQ));
+       if (!pHd[j])
+       {
+         printf("abort test. out of descriptors\n"); abort=1;
+         break;
+       }
+    }
+    t3= netapi_timing_start();
+    sum2 += (t3-t1);
+    k=j;
+    //raw push
+    t5= netapi_timing_start();
+    for(j=0;j<k;j++)
+    {
+       if (!pHd[j]) continue;
+       Qmss_queuePushDescSize(freeQ, pHd[j], 128);
+    }
+    t6= netapi_timing_start();
+    sum4 += (t6-t5);
+    if (!abort)
+    printf("nt=%d pop=%d  push=%d\n", i,
+              sum2/k, sum4/k);
+    sleep(1);
+}
+return;
+}
+
diff --git a/ti/runtime/netapi/test/net_test_config.txt b/ti/runtime/netapi/test/net_test_config.txt
new file mode 100755
index 0000000..b38ccdd
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_config.txt
@@ -0,0 +1,68 @@
+#sp0 thread-number start-core end-core
+sp0 = 1 0-0
+fp0 = 2 1-1 
+fp1 = 3 2-2
+fp2 = 4 3-3
+#mac0 = mac-address switch-port
+mac0 = 00-01-02-03-05-05 swp0
+mac1 = 00-01-02-03-06-07 swp0
+
+#ip0 = ip-address mac-interface
+ip0 = 10.0.0.100  mac0
+ip1 = 10.0.1.100  mac1
+ip2 = 10.0.2.100  mac0
+
+local_ipsec_ip = 192.168.1.100
+remote_ipsec_ip = 192.168.1.10
+ipsec_if = 0
+#
+dsp_ip = ip0
+#
+#ipsec_mode_rx = SIDEBAND
+#ipsec_mode_tx = SIDEBAND
+ipsec_mode_rx = INFLOW
+ipsec_mode_tx = INFLOW
+route0 =  MAC00-00-00-00-00-0f  1
+route1 =  MAC00-00-00-00-00-ff  2
+
+dstip0 =  172.0.0.2  route1
+dstip1 =  172.1.0.2  route0
+
+# _dest_udp port config, if set to ZERO, net_test will use  eceived src port as destination port when packet
+#  is transmitted to network, if non-ZERO, net test will use this the the destination port when packet
+#  is tranmitted to network.
+dest_udp_port_config = 30000
+
+#sa0 = dir spi prot saMode iptype srcip destip window auth cipher esnlo esphi encrkeysize authkeysize encrkey pauthkey tunnel_id
+
+sa0 = INBOUND 0x11111111 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 16 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa1 = OUTBOUND 0x11111111 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 16 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa2 = INBOUND 0x44444444 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa3 = OUTBOUND 0x44444444 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa4 = INBOUND 0x22222222 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa5 = OUTBOUND 0x22222222 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa6 = INBOUND 0x55555555 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa7 = OUTBOUND 0x55555555 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa8 = INBOUND 0x66666666 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa9 = OUTBOUND 0x66666666 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa10 = INBOUND 0x33333333 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa11 = OUTBOUND 0x33333333 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa12 = INBOUND 0x77777777 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+sa13 = OUTBOUND 0x77777777 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+#sa14 = INBOUND 0x88888888 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
+
+#sa15 = OUTBOUND 0x88888888 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
diff --git a/ti/runtime/netapi/test/net_test_config_max_iface.txt b/ti/runtime/netapi/test/net_test_config_max_iface.txt
new file mode 100644
index 0000000..fa90322
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_config_max_iface.txt
@@ -0,0 +1,143 @@
+#sp0 thread-number start-core end-core
+sp0 = 1 0-0
+fp0 = 2 0-0 
+fp1 = 3 0-0 
+#mac0 = mac-address switch-port
+mac0 = 00-01-02-03-05-01 sp0 
+mac1 = 00-01-02-03-05-02 sp1
+mac2 = 00-01-02-03-05-03 sp0 
+mac3 = 00-01-02-03-05-04 sp1
+mac4 = 00-01-02-03-05-05 sp0 
+mac5 = 00-01-02-03-05-06 sp1
+mac6 = 00-01-02-03-05-07 sp0 
+mac7 = 00-01-02-03-05-08 sp0 
+mac8 = 00-01-02-03-05-09 sp0 
+mac9 = 00-01-02-03-05-0a sp0 
+mac10 = 00-01-02-03-05-15 sp0 
+mac11 = 00-01-02-03-05-25 sp0 
+mac12 = 00-01-02-03-05-35 sp0 
+mac13 = 00-01-02-03-05-45 sp0 
+mac14 = 00-01-02-03-05-55 sp0 
+mac15 = 00-01-02-03-05-65 sp0 
+mac16 = 00-01-02-03-05-75 sp0 
+mac17 = 00-01-02-03-05-85 sp0 
+mac18 = 00-01-02-03-05-95 sp0 
+mac19 = 00-01-02-03-01-05 sp0 
+mac20 = 00-01-02-03-02-05 sp0 
+mac21 = 00-01-02-03-03-06 sp1
+mac22 = 00-01-02-03-04-05 sp0 
+mac23 = 00-01-02-33-05-06 sp1
+mac24 = 00-01-02-03-06-05 sp0 
+mac25 = 00-01-02-03-07-06 sp1
+mac26 = 00-01-02-03-08-06 sp1
+mac27 = 00-01-02-03-09-05 sp0 
+mac28 = 00-01-02-01-05-06 sp1
+mac29 = 00-01-02-02-05-05 sp0 
+mac30 = 00-01-02-63-05-06 sp1
+mac31 = 00-01-02-04-05-06 sp1
+mac32 = 00-01-02-05-05-05 sp0 
+mac33 = 00-01-02-06-05-06 sp1
+mac34 = 00-01-02-07-05-05 sp0 
+mac35 = 00-01-02-08-05-06 sp1
+mac36 = 00-01-02-09-05-06 sp1
+mac37 = 00-01-01-03-05-05 sp0 
+mac38 = 00-01-22-03-05-06 sp1
+mac39 = 00-01-03-03-05-05 sp0 
+mac40 = 00-01-04-03-05-06 sp1
+mac41 = 00-01-05-03-05-06 sp1
+mac42 = 00-01-05-03-05-05 sp0 
+mac43 = 00-01-06-03-05-06 sp1
+mac44 = 00-01-07-03-05-05 sp0 
+mac45 = 00-01-08-03-05-06 sp1
+mac46 = 00-01-09-03-05-06 sp1
+mac47 = 00-01-12-03-05-05 sp0 
+mac48 = 00-01-22-33-05-06 sp1
+mac49 = 00-01-32-03-05-05 sp0 
+mac50 = 00-01-42-03-05-06 sp1
+mac51 = 00-01-52-03-05-06 sp1
+mac52 = 00-01-62-03-05-05 sp0 
+mac53 = 00-01-72-03-05-06 sp1
+mac54 = 00-01-82-03-05-05 sp0 
+mac55 = 00-01-92-03-05-06 sp1
+mac56 = 00-01-02-83-05-06 sp1
+mac57 = 00-02-02-03-05-05 sp0 
+mac58 = 00-43-02-03-05-06 sp1
+
+#ip0 = ip-address mac-interface
+ip0 = 10.0.0.100  mac0
+ip1 = 10.0.1.100  mac1
+ip2 = 10.0.2.100  mac2
+ip3 = 10.0.0.100  mac3
+ip4 = 10.0.1.100  mac4
+ip5 = 10.0.2.100  mac5
+ip6 = 10.0.0.100  mac6
+ip7 = 10.0.1.100  mac7
+ip8 = 10.0.2.100  mac8
+ip9 = 10.0.0.100  mac9
+ip10 = 10.0.1.100  mac10
+ip11 = 10.0.1.100  mac11
+ip12 = 10.0.1.100  mac12
+ip13 = 10.0.1.100  mac13
+ip14 = 10.0.1.100  mac14
+ip15 = 10.0.1.100  mac15
+ip16 = 10.0.1.100  mac16
+ip17 = 10.0.1.100  mac17
+ip18 = 10.0.1.100  mac18
+ip19 = 10.0.1.100  mac19
+ip20 = 10.0.1.100  mac20
+ip21 = 10.0.1.100  mac21
+ip22 = 10.0.1.100  mac22
+ip23 = 10.0.1.100  mac23
+ip24 = 10.0.1.100  mac24
+ip25 = 10.0.1.100  mac25
+ip26 = 10.0.1.100  mac26
+ip27 = 10.0.1.100  mac27
+ip28 = 10.0.1.100  mac28
+ip29 = 10.0.1.100  mac29
+ip30 = 10.0.1.100  mac30
+ip31 = 10.0.1.100  mac31
+ip32 = 10.0.1.100  mac32
+ip33 = 10.0.1.100  mac33
+ip34 = 10.0.1.100  mac34
+ip35 = 10.0.1.100  mac35
+ip36 = 10.0.1.100  mac36
+ip37 = 10.0.1.100  mac37
+ip38 = 10.0.1.100  mac38
+ip39 = 10.0.1.100  mac39
+ip40 = 10.0.1.100  mac40
+ip41 = 10.0.1.100  mac41
+ip42 = 10.0.1.100  mac42
+ip43 = 10.0.1.100  mac43
+ip44 = 10.0.1.100  mac44
+ip45 = 10.0.1.100  mac45
+ip46 = 10.0.1.100  mac46
+ip47 = 10.0.1.100  mac47
+ip48 = 10.0.1.100  mac48
+ip49 = 10.0.1.100  mac49
+ip50 = 10.0.1.100  mac50
+ip51 = 10.0.1.100  mac51
+ip52 = 10.0.1.100  mac52
+ip53 = 10.0.1.100  mac53
+ip54 = 10.0.1.100  mac54
+ip55 = 10.0.1.100  mac55
+ip56 = 10.0.1.100  mac56
+ip57 = 10.0.1.100  mac57
+ip58 = 10.0.1.100  mac58
+
+local_ipsec_ip = 192.168.1.100
+remote_ipsec_ip = 192.168.1.10
+ipsec_if = 0
+#ipsec_mode_rx = SIDEBAND
+#ipsec_mode_tx = SIDEBAND
+ipsec_mode_rx = INFLOW
+ipsec_mode_tx = INFLOW
+route0 =  MAC00-23-24-08-67-46  0
+route1 =  MAC00-22-33-44-55-56  1
+
+dstip0 =  10.1.0.100 route1
+dspip1 =  10.0.0.10  route0
+
+
+#sa0 = dir spi prot saMode iptype srcip destip window auth cipher esnlo esphi encrkeysize authkeysize encrkey pauthkey tunnel_id
+
+
diff --git a/ti/runtime/netapi/test/net_test_config_max_sa.txt b/ti/runtime/netapi/test/net_test_config_max_sa.txt
new file mode 100644
index 0000000..30dc165
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_config_max_sa.txt
@@ -0,0 +1,155 @@
+#sp0 thread-number start-core end-core
+#mac0 = mac-address switch-port
+#mac0 = 00-01-02-03-05-05 sp0 
+#mac1 = 00-01-02-03-05-06 sp1
+#ip0 = ip-address mac-interface
+#ip0 = 10.0.0.100  mac0
+#ip1 = 10.0.1.100  mac0
+#ip2 = 10.0.2.100  mac0
+local_ipsec_ip = 192.168.1.100
+remote_ipsec_ip = 192.168.1.10
+ipsec_if = 0
+#ipsec_mode_rx = SIDEBAND
+#ipsec_mode_tx = SIDEBAND
+ipsec_mode_rx = INFLOW
+ipsec_mode_tx = INFLOW
+route0 =  MAC00-23-24-08-67-46  0
+route1 =  MAC00-22-33-44-55-56  1
+
+dstip0 =  10.1.0.100 route1
+dspip1 =  10.0.0.10  route0
+
+
+#sa0 = dir spi prot saMode iptype srcip destip window auth cipher esnlo esphi encrkeysize authkeysize encrkey pauthkey tunnel_id
+
+sa0 = INBOUND 0x1 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa1 = OUTBOUND 0x2 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa2 = INBOUND 0x3 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa3 = OUTBOUND 0x4 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa4 = INBOUND 0x5 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa5 = OUTBOUND 0x6 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa6 = INBOUND 0x7 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa7 = OUTBOUND 0x8 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa8 = INBOUND 0x9 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa9 = OUTBOUND 0x10 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa10 = INBOUND 0x11 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa11 = OUTBOUND 0x12 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa12 = INBOUND 0x13 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+sa13 = OUTBOUND 0x14 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+sa14 = INBOUND 0x15 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
+
+sa15 = OUTBOUND 0x16 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
+
+sa16 = INBOUND 0x17 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa17 = OUTBOUND 0x18 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa18 = INBOUND 0x19 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa19 = OUTBOUND 0x20 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa20 = INBOUND 0x21 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa21 = OUTBOUND 0x22 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa22 = INBOUND 0x23 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa23 = OUTBOUND 0x24 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa24 = INBOUND 0x25 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa25 = OUTBOUND 0x26 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa26 = INBOUND 0x27 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa27 = OUTBOUND 0x28 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa28 = INBOUND 0x29 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa29 = OUTBOUND 0x30 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa30 = INBOUND 0x31 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa31 = OUTBOUND 0x32 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa32 = INBOUND 0x33 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa33 = OUTBOUND 0x34 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa34 = INBOUND 0x35 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa35 = OUTBOUND 0x36 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa36 = INBOUND 0x37 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa37 = OUTBOUND 0x38 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 NULL AES_CCM 0 0 19 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x5
+
+sa38 = INBOUND 0x39 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa39 = OUTBOUND 0x40 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 3DES_CBC 0 0 24 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x6
+
+sa40 = INBOUND 0x41 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+sa41 = OUTBOUND 0x42 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 AES_XCBC NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x7
+
+sa42 = INBOUND 0x43 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
+
+sa43 = OUTBOUND 0x44 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 GMAC NULL 0 0 0 20 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x8
+
+sa44 = INBOUND 0x45 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa45 = OUTBOUND 0x46 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa46 = INBOUND 0x47 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa47 = OUTBOUND 0x48 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa48 = INBOUND 0x49 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa49 = OUTBOUND 0x50 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa50 = INBOUND 0x51 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa51 = OUTBOUND 0x52 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa52 = INBOUND 0x53 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa53 = OUTBOUND 0x54 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa54 = INBOUND 0x55 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa55 = INBOUND 0x56 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x2
+
+sa56 = OUTBOUND 0x57 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA1 AES_CBC 0 0 32 20 55,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23  0x2
+
+sa57 = INBOUND 0x58 AH TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa58 = OUTBOUND 0x59 AH TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_MD5 NULL 0 0 0 16 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x1
+
+sa59 = INBOUND 0x60 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa60 = OUTBOUND 0x61 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa61 = INBOUND 0x62 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa62 = OUTBOUND 0x63 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+sa63 = INBOUND 0x64 ESP TUNNEL IPV4 192.168.1.10 192.168.1.100 64 NULL AES_GCM 0 0 20 0 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x4
+
+sa64 = OUTBOUND 0x65 ESP TUNNEL IPV4 192.168.1.100 192.168.1.10 64 HMAC_SHA2_256 AES_CTR 0 0 20 32 00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,00,11,22,33,44,55,66,77,88,99,AA,BB,CC,DD,EE,FF,30,31,32,33 00,01,02,03,04,05,06,07,08,09,0A,0B,0C,0D,0E,0F,10,11,12,13,14,15,16,17,18,19,1A,1B,1C,1D,1E,1F,20,21,22,23 0x3
+
+
diff --git a/ti/runtime/netapi/test/net_test_loopback.c b/ti/runtime/netapi/test/net_test_loopback.c
new file mode 100755
index 0000000..245828b
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_loopback.c
@@ -0,0 +1,1359 @@
+/******************************************************************************
+ * File: net_test.c
+ * Purpose: test app for netapi
+ ******************************************************************************
+ * FILE:  net_test.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************************************************/
+
+#include "netapi.h"
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+#include "net_test_thread_utils.h"
+#include "ti/drv/nwal/test/fw_rm.h"
+#include <signal.h>
+#include <pthread.h>
+
+
+#if defined(DEVICE_K2H)
+#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/drv/qmss/device/k2k/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
+#elif defined (DEVICE_K2L)
+#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/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+#else /*Default */
+#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
+#endif /* Device */
+
+
+extern int QUIT;
+extern netTestStats_T stats[];
+extern paSysStats_t netcp_stats;
+
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+hplib_spinLock_T net_test_thread_lock;
+
+
+netTestConfig_t netTestCfg;
+static netTestConfigFile_t config_file;
+char    input_file_name[] = "/etc/transportnetlib/test/net_test_config.txt";
+nwal_RetValue       nwalRetVal;
+Pktlib_HeapHandle   ourHeap;
+
+PKTIO_HANDLE_T *netcp_rx_chan;
+PKTIO_HANDLE_T *netcp_tx_chan_no_crypto;
+PKTIO_HANDLE_T *netcp_tx_chan_esp;
+PKTIO_HANDLE_T *netcp_tx_chan_ah;
+PKTIO_HANDLE_T *netcp_sb_tx_chan;
+PKTIO_HANDLE_T *netcp_sb_rx_chan;
+
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_rx_cfg2={PKTIO_RX, (PKTIO_GLOBAL|PKTIO_PKT), PKTIO_Q_ANY, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_sb_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_sb_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+
+NETCP_CFG_IP_T ip_rule[NET_TEST_MAX_IP];
+NETCP_CFG_MACIF_T mac[NET_TEST_MAX_MAC];
+
+#ifdef netTest_DSP_FASTPATH
+PKTIO_HANDLE_T *dsp_pktio_channels[CPU_NUM_REM_FAST_PATH_CORES];
+NETCP_CFG_CLASS_T dsp_classifers[CPU_NUM_REM_FAST_PATH_CORES];
+NETCP_CFG_FLOW_HANDLE_T dsp_flow_handles[CPU_NUM_REM_FAST_PATH_CORES];
+#endif
+NETCP_CFG_EXCEPTION_PKT_T expPkt_appid;
+
+Trie *p_trie_sa_rx;
+Trie *p_trie_sa_tx;
+
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+    TUNE_NETAPI_PERM_MEM_SZ,
+    128,  //start of packet offset for hw to place data on rx for default flow
+    TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+    TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+    TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+    64, //#descriptors w/o buffers in default heap
+    TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+    128, //tail room
+    256, //extra room
+    0,
+    NULL,
+    -1,
+    -1
+};
+
+NETAPI_T netapi_handle;
+NETAPI_SCHED_HANDLE_T * our_sched;
+#ifdef netTest_MULTI_THREAD
+NETAPI_SCHED_HANDLE_T * scheduler[TUNE_NETAPI_NUM_CORES];
+#endif
+NETAPI_SCHED_CONFIG_T our_sched_cfg={
+  NETAPI_SCHED_DURATION|NETAPI_SCHED_CBV, 0, house, 5000000  //every 5000000 poll loops
+};
+
+netTestSA_t sa_info[MAX_SEC_INDEX];
+NETCP_CFG_IPSEC_POLICY_T rx_policy[MAX_SEC_INDEX];
+
+int masterType = NETAPI_SYS_MASTER;
+
+
+
+
+
+/********************************************************************
+ * FUNCTION PURPOSE:  Utility function to flip and packet and send
+ *                    it back to its source.
+ ********************************************************************
+ * DESCRIPTION:   Utility function to flip and packet and send
+ *                    it back to its source.
+ ********************************************************************/
+void flip_and_send_pkt(Ti_Pkt *tip,  unsigned char * p_pkt, int len, int flag, uint16_t enet_port)
+{
+    unsigned char mac_temp[6];
+    unsigned char ip_temp[4];
+    unsigned char new_dest_port[2]={0x75,0x30};  // 30000
+    uint16_t dest_udp_port_config = 0;
+    uint16_t blah; 
+    uint16_t i=1;   /* for testing only */
+
+    uint8_t *p_spi; 
+    netTestSA_t * p_sa_info;
+    netTestSA_t *p_sa_info_tx;
+    uint8_t p_iv[16];
+    uint8_t p_add[8];
+    Cppi_HostDesc*          pPloadDesc;
+    uint8_t ah_len;
+    uint32_t tunnel_id;
+    nwalLocCxtInfo_t    nwalLocCxt;
+    netTestHead_T * p_head;
+    netTestHead_T temp_head;
+    int pkt_type;
+
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId(); //who we are(thread local)
+        //int coreid = our_core;
+#else
+int coreid=0;
+#endif
+    // netTest_utilDumpBuffer((long*)p_pkt,len);
+    Pktlib_setPacketLen(tip,len);
+    //flip the mac address
+    memcpy(&mac_temp,&p_pkt[0],6);
+    memcpy(&p_pkt[0],&p_pkt[6],6);
+    memcpy(&p_pkt[6],&mac_temp,6);
+    //memcpy(&p_pkt[0],real_mac_header,6); //for testing to wireshark pc
+
+    //flip the ip  (outer in case of ipsec)
+    memcpy(&ip_temp, &p_pkt[netTest_MAC_HEADER_LEN+12],4);
+    memcpy(&p_pkt[netTest_MAC_HEADER_LEN+12],&p_pkt[netTest_MAC_HEADER_LEN+12+4],4);
+    memcpy(&p_pkt[netTest_MAC_HEADER_LEN+12+4],&ip_temp,4);
+
+    p_head=&temp_head;
+
+    //inner ip &udp for ipsec
+    if (flag) 
+    {
+        memcpy(p_head,&p_pkt[netTest_MAC_HEADER_LEN],sizeof(netTestHead_T));
+
+        if ((p_head->ip[2]&0x0000ff00)==0x00003300)
+        {
+            p_spi = &(p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN + 4]);
+            pkt_type = netTest_IPSEC_AH_PKT;
+        }
+        else if ((p_head->ip[2]&0x0000ff00)==0x00003200)
+        {
+            p_spi = &(p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN]);
+            pkt_type = netTest_IPSEC_ESP_PKT;
+        }
+        else
+        {
+            netapi_Log("flip_and_send_pkt: un-supported IPSEC protocol\n");
+            Pktlib_freePacket(tip);
+            return;
+        }
+
+        p_sa_info = (netTestSA_t *) trie_lookup(p_trie_sa_rx, (char *)p_spi ,4);
+        if (p_sa_info == NULL)
+        {
+            netapi_Log("flip_and_send_pkt(): trie_lookup() failed\n");
+            Pktlib_freePacket(tip);
+            return;
+        }
+        tunnel_id = p_sa_info->tunnel_id;
+        p_sa_info_tx = (netTestSA_t *) trie_lookup(p_trie_sa_tx, (char *)&tunnel_id ,4);
+        if (p_sa_info_tx == NULL)
+        {
+            netapi_Log("flip_and_send_pkt(): trie_lookup() failed\n");
+            Pktlib_freePacket(tip);
+            return;
+        }
+        //just drop non-udp packet
+        if (p_pkt[p_sa_info->tx_payload_info.encOffset+9]!=0x11)
+        {
+            stats[coreid].n_new+=1;Pktlib_freePacket(tip); return;
+        }
+
+        /* flip inner IP */
+        memcpy(&ip_temp, &p_pkt[p_sa_info->tx_payload_info.encOffset+12],4);
+        memcpy(&p_pkt[p_sa_info->tx_payload_info.encOffset+12],&p_pkt[p_sa_info->tx_payload_info.encOffset+12+4],4);
+        memcpy(&p_pkt[p_sa_info->tx_payload_info.encOffset+12+4],&ip_temp,4);
+        /* setting udp ports */
+        if (netTestCfg.dest_udp_port_config == 0)
+        {
+            memcpy(&p_pkt[p_sa_info->tx_payload_info.encOffset+netTest_IP_HEADER_LEN+2],
+                   &p_pkt[p_sa_info->tx_payload_info.encOffset+netTest_IP_HEADER_LEN],2);
+        }
+        else
+        {
+           dest_udp_port_config = htons(netTestCfg.dest_udp_port_config);
+            memcpy(&p_pkt[p_sa_info->tx_payload_info.encOffset+netTest_IP_HEADER_LEN+2],
+                   &dest_udp_port_config,2);
+        }
+        memset(&p_pkt[p_sa_info->tx_payload_info.encOffset+netTest_IP_HEADER_LEN+6],0,2); //checksum
+
+        if (netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_SIDEBAND)
+        {
+            /* inner ip checksum : leave alone, outer ip, set to 0 (we will compute on way out */
+            memset(&p_pkt[netTest_MAC_HEADER_LEN+10],0,2);
+        }
+    }
+    else
+    {
+        /* flip udp port */
+        if (netTestCfg.dest_udp_port_config == 0)
+        {
+            memcpy(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+2],
+                   &p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN],2);
+        }
+        else
+        {
+            dest_udp_port_config = htons(netTestCfg.dest_udp_port_config);
+            //memcpy(&p_pkt[netTest_MAC_HEADER_LEN+20+2],&new_dest_port[0],2);
+            memcpy(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+2],&dest_udp_port_config,2);
+        }
+        memset(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+6],0,2);//0 udp checksum (we will compute on way out)
+    }
+
+    /*IPSEC case */ 
+    if (flag)
+    {
+        if (netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_SIDEBAND)
+        //send to crypto for encryption
+        //12 byte auth tag
+        {
+            PKTIO_METADATA_T meta = {PKTIO_META_SB_TX,{0},0};
+            int err;
+            nwalDmTxPayloadInfo_t meta_tx={0};
+            
+            meta.sa_handle = (void*)p_sa_info_tx->tx_tunnel;  //use TX SA APPID
+
+            memcpy(&meta_tx, &(p_sa_info->tx_payload_info), sizeof(nwalDmTxPayloadInfo_t));
+            meta_tx.appCtxId = (nwal_AppId)p_sa_info_tx;
+            meta_tx.encSize = len - p_sa_info->tx_payload_info.encOffset -p_sa_info->auth_tag_size;
+            meta_tx.authSize = len - meta_tx.authOffset - p_sa_info->auth_tag_size;
+            meta_tx.pAuthIV=NULL;
+            meta_tx.aadSize=0;
+            meta_tx.pAad=NULL;
+            if (p_sa_info->cipherMode ==  NWAL_SA_EALG_AES_CTR)
+            {
+                memcpy(&p_iv[0], &p_sa_info->key_params->pEncKey[16], 4);
+                memcpy(&p_iv[4], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                p_iv[12] = 0;
+                p_iv[13] = 0;
+                p_iv[14] = 0;
+                p_iv[15] = 1;
+                meta_tx.pEncIV = &p_iv[0];
+            }
+            else if ((p_sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) || (p_sa_info->cipherMode == NWAL_SA_EALG_AES_CCM))
+            {
+                memcpy(&p_iv[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                meta_tx.pEncIV = &p_iv[0];
+                memcpy(&p_add[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN], 8);
+                meta_tx.pAad= &p_add[0];
+                meta_tx.aadSize = 8;
+            }
+            else if (p_sa_info->authMode == NWAL_SA_AALG_GMAC)
+            {
+                memcpy(&p_iv[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                meta_tx.pAuthIV= &p_iv[0];
+                memcpy(&p_add[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN], 8);
+                meta_tx.pAad= &p_add[0];
+                meta_tx.aadSize = 8;
+            }
+            else if (p_sa_info->cipherMode ==  NWAL_SA_EALG_NULL)
+            {
+                meta_tx.pEncIV = NULL;
+            }
+            else
+            {
+                meta_tx.pEncIV = &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN ];
+            }
+            /* post it to netcp sb tx channel*/
+            meta.u.tx_sb_meta=&meta_tx;
+
+            netapi_pktioSend(netcp_sb_tx_chan,tip,&meta,&err);
+        }
+        else
+        {
+            //INFLOW TX, send pkt directly, asking for IP and UDP checksum offloads AND IPSEC to be applied
+            PKTIO_METADATA_T meta = {PKTIO_META_TX,{0},0};
+            int err;
+            nwalTxPktInfo_t meta_tx={0};
+
+            meta.sa_handle = (void*)p_sa_info_tx->tx_tunnel;  //use TX SA APPID
+
+            meta_tx.startOffset = p_sa_info_tx->tx_pkt_info.startOffset;
+            meta_tx.ipOffBytes =p_sa_info_tx->tx_payload_info.encOffset; 
+            meta_tx.l4OffBytes = p_sa_info_tx->tx_pkt_info.l4OffBytes;
+            meta_tx.l4HdrLen = p_sa_info_tx->tx_pkt_info.l4HdrLen;
+            meta_tx.ploadLen = (unsigned) ((p_pkt[meta_tx.l4OffBytes+4]<<8)|p_pkt[meta_tx.l4OffBytes+4+1]) -8 ;
+            meta_tx.saOffBytes=  p_sa_info_tx->tx_pkt_info.saOffBytes;
+            if (pkt_type == netTest_IPSEC_AH_PKT)
+            {
+                memset(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+netTest_IPSEC_AH_FIXED_HDR_SIZE],0,netTest_IPSEC_AH_FIXED_HDR_SIZE);
+                meta_tx.txFlag1 = p_sa_info_tx->tx_pkt_info.txFlag1;
+                meta_tx.saPayloadLen=len-netTest_MAC_HEADER_LEN;   //don't inlcude mac 
+                meta_tx.saAhMacSize = 12;
+                meta_tx.saAhIcvOffBytes = netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN + netTest_IPSEC_AH_FIXED_HDR_SIZE;
+                
+                meta_tx.enetPort = enet_port;
+                 memcpy(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+4],&p_sa_info_tx->spi,4);
+            }
+            else if (pkt_type == netTest_IPSEC_ESP_PKT)
+            {
+                meta_tx.txFlag1 = p_sa_info_tx->tx_pkt_info.txFlag1;
+                meta_tx.saPayloadLen=len-netTest_MAC_HEADER_LEN-netTest_IP_HEADER_LEN;   //don't include mac and ip outer header
+                meta_tx.enetPort = 0;
+                 memcpy(&p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN],&p_sa_info_tx->spi,4);
+            }
+
+            meta_tx.pseudoHdrChecksum =
+            netTest_utilGetIPv4PsudoChkSum(&p_pkt[meta_tx.ipOffBytes],8+ meta_tx.ploadLen);
+
+
+            /* post it to netcp tx channel*/
+            meta.u.tx_meta=&meta_tx;
+#ifdef DEBUG_DESC
+            if (stats[coreid].sec_tx<20) netTest_utilDumpDescr((long *) tip, stats[coreid].sec_tx);
+#endif
+            if ( pkt_type == netTest_IPSEC_ESP_PKT)
+                netapi_pktioSend(netcp_tx_chan_esp,tip,&meta,&err);
+            else if ( pkt_type == netTest_IPSEC_AH_PKT)
+                 netapi_pktioSend(netcp_tx_chan_ah,tip,&meta,&err);
+            stats[coreid].tx +=1;
+            stats[coreid].sec_tx +=1;
+        }
+    }
+    else  //non ipsec send pkt directly, asking for IP and UDP checksum ofload
+    {
+        PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+        int err;
+        nwalTxPktInfo_t meta_tx2={0};
+        meta2.sa_handle=nwal_HANDLE_INVALID;
+        meta_tx2.txFlag1 = (NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID );
+        meta_tx2.startOffset = 0;
+        meta_tx2.ipOffBytes = netTest_MAC_HEADER_LEN;
+        meta_tx2.l4OffBytes = netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN;
+        meta_tx2.l4HdrLen = netTest_UDP_HEADER_LEN;
+        meta_tx2.ploadLen = (unsigned) ((p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+4]<<8)|
+                                        p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN+4+1]) -8 ;
+        meta_tx2.pseudoHdrChecksum =
+        netTest_utilGetIPv4PsudoChkSum(&p_pkt[netTest_MAC_HEADER_LEN],8+ meta_tx2.ploadLen);
+
+        /* post it to netcp tx channel*/
+        meta2.u.tx_meta=&meta_tx2;
+        netapi_pktioSend(netcp_tx_chan_no_crypto,tip,&meta2,&err);
+        stats[coreid].tx +=1;
+    }
+}
+
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Sideband Accelerator Callback PKT RECEIVE HANDLER
+ **********************************************************************
+ * DESCRIPTION:   Sideband Accelerator Callback PKT RECEIVE HANDLER
+ *                Handles Decrypt and Encrypt operation callbacks
+ **********************************************************************/
+void recv_sb_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    int i;
+    int len;
+    int p;
+    netTestHead_T * p_res;
+    Ti_Pkt * tip;
+    unsigned int templen;
+    int err;
+    char * p_pkt;
+    netTestHead_T * p_head;
+    netTestHead_T temp_head;
+    int tag_cmp=0;
+    unsigned int hash[4];
+    uint8_t *p_spi;
+    netTestSA_t *p_sa_info;
+
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+#else
+    int coreid=0;
+#endif
+    //nwal_AppId time;
+    unsigned long time = 0;
+    unsigned long delta_time = 0;
+    /* loop over received pkts */
+    for(i=0;i<n_pkts;i++)
+   {
+        tip = p_recv[i];
+        Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+        len = Pktlib_getPacketLen(tip);//real length
+
+        /*p_sa_info is for rx context */
+        p_sa_info = (netTestSA_t*)meta[i].u.rx_sb_meta->appCtxId;
+        if (p_sa_info == NULL)
+        {
+            printf("recv_sb_cb(): trie_lookup failed\n");
+            continue;
+        }
+
+        //is this a decrypt (rx_tunnel) complete
+        if ((int)meta[i].u.rx_sb_meta->appId == p_sa_info->rx_tunnel)
+        {
+            //time = hplib_mUtilGetPmuCCNT();
+            //delta_time = time -(unsigned long) meta[i].u.rx_sb_meta->appCtxId;
+            stats[coreid].total_decrypt_time += delta_time;
+            stats[coreid].sb_rx+=1;
+            //copy hash out of meta data (for some reason it needs endian conversion)
+            hash[0]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[0]);
+            hash[1]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[1]);
+            hash[2]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[2]);
+            hash[3]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[3]);
+            if(stats[coreid].sb_rx<=16)
+            {
+                char *tp = (char *) &hash[0];
+                //netTest_utilDumpHeader((long*)p_pkt, stats[coreid].sb_rx, (int)meta[i].u.rx_sb_meta->appId,0);
+            }
+            tag_cmp = memcmp(&p_pkt[len-p_sa_info->auth_tag_size],(char*) &hash[0],p_sa_info->auth_tag_size); //todo, really use meta->authTagLen
+            stats[coreid].n_auth_ok += !(tag_cmp);
+            flip_and_send_pkt(tip, p_pkt, len,1, 0);  //flip packet to echo back and send
+        }
+        //this is an encrypt (tx tunnel) complete
+        else if((int)meta[i].u.rx_sb_meta->appId== p_sa_info->tx_tunnel )
+        {
+            hash[0]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[0]);
+            hash[1]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[1]);
+            hash[2]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[2]);
+            hash[3]= netTest_utilHtonl( meta[i].u.rx_sb_meta->pAuthTag[3]);
+            stats[coreid].sb_tx+=1;
+            if(stats[coreid].sb_tx<=16)
+            {
+                //netTest_utilDumpHeader((long*)p_pkt, stats[coreid].sb_tx, (int)meta[i].u.rx_sb_meta->appId,0);
+            }
+            //put the computed tag in the packet
+             memcpy(&p_pkt[len-p_sa_info->auth_tag_size],(char*)&hash[0],p_sa_info->auth_tag_size); //todo, really use meta->authTagLen
+            {
+                PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+                nwalTxPktInfo_t meta_tx={0};
+                // now send directly 
+                meta2.sa_handle=nwal_HANDLE_INVALID;
+                meta_tx.txFlag1 = (NWAL_TX_FLAG1_DO_IPV4_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID);//only outer IP header checksum. no udp checksum possible since pkt is already encrypted
+                meta_tx.startOffset = 0;
+                meta_tx.ipOffBytes = netTest_MAC_HEADER_LEN;
+                meta_tx.l4OffBytes = 0;
+                meta_tx.l4HdrLen = 0;
+                meta_tx.ploadLen = 0;
+                time = hplib_mUtilGetPmuCCNT();
+                delta_time = time -(unsigned long) meta[i].u.rx_sb_meta->appCtxId;
+                stats[coreid].total_encrypt_time += delta_time;
+
+                /* post it to netcp tx channel*/
+                meta2.u.tx_meta=&meta_tx;
+                netapi_pktioSend(netcp_tx_chan_no_crypto,tip,&meta2,&err);
+                //netapi_pktioSend(netcp_tx_chan_esp,tip,&meta2,&err);
+                hplib_cacheWbInv(p_pkt,len);
+                stats[coreid].tx +=1;
+            }
+        }
+        else printf("netapi recv_sb_cb: unknown appiD %x \n",meta[i].u.rx_sb_meta->appId );
+    }
+}
+
+/**********************************************************************
+ * FUNCTION PURPOSE:  Packet receive Callback
+ *
+ **********************************************************************
+ * DESCRIPTION:   packet Receive callback
+ **********************************************************************/
+void recv_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    int i;
+    int len;
+    int p;
+    netTestHead_T * p_res;
+    Ti_Pkt * tip;
+    unsigned int templen;
+    int err = 0;
+    char * p_pkt;
+    netTestHead_T * p_head;
+    netTestHead_T temp_head;
+    netTestSA_t *p_sa_info;
+    uint8_t *p_spi;
+    uint8_t p_iv[16];
+    uint8_t p_add[8];
+    uint8_t p_add1[1500];
+    int16_t       retVal;
+    unsigned long t1;
+    unsigned long t2;
+    unsigned long long ct1;
+    unsigned long long ct2;
+    unsigned long long n_c_ops;
+    nwalGlobCxtInfo_t   nwalGlobCxt;
+    nwalLocCxtInfo_t    nwalLocCxt;
+
+    Cppi_HostDesc*          pPloadDesc;
+    int ifno;
+    uint16_t enet_port = 0;
+
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+#else
+    int coreid=0;
+#endif
+    p_head=&temp_head;
+
+    t1=hplib_mUtilGetPmuCCNT();
+    ct1 =Osal_cache_op_measure(&n_c_ops);
+
+    /* loop over received pkts */
+    for(i=0;i<n_pkts;i++)
+    {
+        ifno = ((unsigned int)meta[i].u.rx_meta->appId)&0xff;
+        
+        enet_port = meta[i].u.rx_meta->enetPort;
+        tip = p_recv[i];
+
+        Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);/*ignore templen */
+        len = Pktlib_getPacketLen(tip)-4;   /*real length, subtract mac trailer */
+        Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+        Pktlib_setPacketLen(tip,len);
+
+        if(((unsigned int)meta[i].u.rx_meta->appId) == expPkt_appid)
+        {
+            netapi_Log("recv_cb: received exception packet\n");
+            Pktlib_freePacket(tip);
+            if(((unsigned int)meta[i].u.rx_meta->rxFlag1  & NWAL_RX_IP_FRAGMENT_PKT) ==
+                                             NWAL_RX_IP_FRAGMENT_PKT)
+            {
+                stats[coreid].exceptionPktsFrag+=1;
+            }
+            else
+            {
+                stats[coreid].exceptionPktsOther+=1;
+            }
+            continue;
+        }
+        //debug: validate descriptor */
+        if(Pktlib_getNextPacket(tip) != 0) 
+        {
+            printf(" rcv_cb, nexpkt != NULL");
+        }
+
+        if(coreid<TUNE_NETAPI_NUM_CORES)
+        {
+            stats[coreid].rx+=1;
+            if (ifno < TUNE_NETAPI_MAX_NUM_MAC)
+                stats[coreid].if_rx[ifno]+=1;
+        }
+
+#ifdef DEBUG_DESC
+        if(coreid<TUNE_NETAPI_NUM_CORES)
+        {
+            if (stats[coreid].rx<16)
+            {
+                netapi_Log(">rx dmp.."); 
+                netTest_utilDumpDescr((long *) tip, stats[coreid].rx);
+            }
+            else if (stats[coreid].rx>99) 
+            {
+                netapi_Log(">rx dmp.."); 
+                netTest_utilDumpDescr((long *) tip,stats[coreid].rx);
+            }
+        }
+#endif
+#if 0
+        //
+        if(stats[coreid].rx<=16)
+        {
+            netTest_utilDumpHeader((long*)p_pkt,stats[coreid].rx, (int)meta[i].u.rx_meta->appId,meta[i].u.rx_meta->rxFlag1);
+            netTest_utilDumpBuffer((long*)p_pkt,len);
+        }
+#endif
+        /* check header */
+        memcpy(p_head,&p_pkt[netTest_MAC_HEADER_LEN],sizeof(netTestHead_T));
+
+        /* check for IPSEC ESP or AH packet, 0x32 is ESP tunnel mode, 0x33 is AH tunnel mode*/
+        if (((p_head->ip[2]&0x0000ff00)==0x00003200) || ((p_head->ip[2]&0x0000ff00)==0x00003300))
+        {
+            if (!netTest_utilCheckHeader(p_head,&meta[i]))
+            {
+                printf("recv_cb: error in ipsec pkt\n");
+                stats[coreid].n_bad+=1;Pktlib_freePacket(tip); 
+                continue;
+            }
+
+            //process IP SEC PACKET
+            if (netTestCfg.ipsec_mode_rx == IPSEC_MODE_RX_SIDEBAND)
+            {
+                p_spi = &(p_pkt[netTest_MAC_HEADER_LEN+netTest_IP_HEADER_LEN]);
+                p_sa_info = (netTestSA_t *) trie_lookup(p_trie_sa_rx, (char *)p_spi ,4);
+                if (p_sa_info == NULL)
+                {
+                    printf("recv_cb(): trie_lookup() failed\n");
+                    continue;
+                }
+
+                //ship to crypto for decrypt!!
+                //12 byte auth tag
+                PKTIO_METADATA_T meta2 = {PKTIO_META_SB_TX,{0},0};
+                nwalDmTxPayloadInfo_t meta_tx={0};
+
+                meta2.sa_handle = (void*) p_sa_info->rx_tunnel;
+
+                memcpy(&meta_tx, &(p_sa_info->tx_payload_info), sizeof(nwalDmTxPayloadInfo_t));
+
+                meta_tx.encSize = len - p_sa_info->tx_payload_info.encOffset -p_sa_info->auth_tag_size;
+                meta_tx.authSize = len - meta_tx.authOffset - p_sa_info->auth_tag_size;
+
+                if (p_sa_info->cipherMode == NWAL_SA_EALG_AES_CTR)
+                {
+                    memcpy(&p_iv[0], &p_sa_info->key_params->pEncKey[16], 4);
+                    memcpy(&p_iv[4], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                    p_iv[12] = 0;
+                    p_iv[13] = 0;
+                    p_iv[14] = 0;
+                    p_iv[15] = 1;
+                    meta_tx.pEncIV = &p_iv[0];
+                 
+                }
+                else if ((p_sa_info->cipherMode == NWAL_SA_EALG_AES_GCM) ||
+                            (p_sa_info->cipherMode == NWAL_SA_EALG_AES_CCM))
+                {
+                        memcpy(&p_iv[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                        meta_tx.pEncIV = &p_iv[0];
+                        /* aad is the ESP header which is 8 bytes */
+                        memcpy(&p_add[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN], 8);
+                        meta_tx.pAad= &p_add[0];
+                        meta_tx.aadSize = 8;
+                }
+                else if (p_sa_info->authMode == NWAL_SA_AALG_GMAC)
+                {
+                    memcpy(&p_iv[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN], 8);
+                        meta_tx.pAuthIV= &p_iv[0];
+                        /* aad is the ESP header which is 8 bytes */
+                        memcpy(&p_add[0], &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN], 8);
+                        meta_tx.pAad= &p_add[0];
+                        meta_tx.aadSize = 8;
+                }
+                else if (p_sa_info->cipherMode ==  NWAL_SA_EALG_NULL)
+                {
+                    meta_tx.pEncIV = NULL;
+                }
+                else
+                {
+                    meta_tx.pEncIV = &p_pkt[netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN + netTest_ESP_HEADER_LEN ];
+                }
+               
+                meta_tx.appCtxId = (nwal_AppId)p_sa_info;
+
+                /* post it to netcp sb tx channel*/
+                meta2.u.tx_sb_meta=&meta_tx;
+
+                netapi_pktioSend(netcp_sb_tx_chan,tip,&meta2,&err);
+                continue;
+            }
+            else
+            {
+                //inflow mode.  flip and send
+                flip_and_send_pkt(tip,p_pkt,len,1, enet_port);
+            }
+        }
+        /* check for udp protocol */
+        else if ((p_head->ip[2]&0x0000ff00)!=0x00001100)
+         //else if ((p_head->ip[2]&0x00ff0000)!=0x00110000)
+        {
+            stats[coreid].n_new+=1;Pktlib_freePacket(tip); continue;
+        }
+        else  //non ipsec
+        {
+            if (!netTest_utilCheckHeader(p_head,&meta[i]))
+            {
+                stats[coreid].n_bad+=1;Pktlib_freePacket(tip);
+                continue;
+            }
+            //just flip and send
+            flip_and_send_pkt(tip,p_pkt,len,0, enet_port);
+        }
+    }
+    t2=hplib_mUtilGetPmuCCNT();
+    ct2 =Osal_cache_op_measure(&n_c_ops);
+    stats[coreid].app_cycles +=  (unsigned long long) (t2-t1);
+    stats[coreid].tx_cache_cycles += (unsigned long long) (ct2-ct1);
+}
+
+/* Templates to build command labels at startup up time, required by open_pktio_tx_channels() */
+nwalTxPktInfo_t txPktInfoESP = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                                                                                  /* ipOffBytes */
+    0,                                                                                                  /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                                             /* l4HdrLen */
+    0,                                                                                                  /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+nwalTxPktInfo_t txPktInfoAH = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_AH_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM | NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN + netTest_IPSEC_AH_FIXED_HDR_SIZE,                    /* saAhIcvOffBytes */
+    12,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                             /* ipOffBytes */
+    0,                                                                                                  /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                                            /* l4HdrLen */
+    0,                                                                                                  /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+nwalTxPktInfo_t txPktInfoNoCrypto = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    0,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                                                                                  /* ipOffBytes */
+    netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN,                                        /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                             /* l4HdrLen */
+    0,                                                                         /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+void close_pktio_channels(void)
+{
+    int err;
+    netapi_pktioClose(netcp_tx_chan_esp ,&err);
+    netapi_pktioClose(netcp_tx_chan_ah ,&err);
+    netapi_pktioClose(netcp_sb_tx_chan ,&err);
+    netapi_pktioClose(netcp_tx_chan_no_crypto,&err);
+}
+
+void open_pktio_tx_channels(void)
+{
+    int err;
+    /* open netcp default  TX for ESP packets */
+    netcp_tx_chan_esp= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_esp)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_ESP_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoESP;
+            netapi_pktioControl(netcp_tx_chan_esp, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /*/* open netcp default  TX for AH packets */
+    netcp_tx_chan_ah= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_ah)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_AH_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoAH;
+            netapi_pktioControl(netcp_tx_chan_ah, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /* open netcp default  TX channels for non-Crypto packets */
+    netcp_tx_chan_no_crypto= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_no_crypto)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan_no_crypto, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /* open netcp default  TX channels for SB crypto */
+    netcp_sb_tx_chan= netapi_pktioOpen(netapi_handle, NETCP_SB_TX, NULL, &netcp_sb_tx_cfg,  &err);
+    if (!netcp_sb_tx_chan)
+    {
+        printf("pktio open SB TX failed err=%d\n",err);
+        exit(1);
+    }
+}
+
+#ifdef netTest_DSP_FASTPATH
+void setup_netTestDSPFastPath(NETAPI_T handle)
+
+{
+    int i;
+    int err = 0;
+    PKTIO_CFG_T dsp_pktio_cfg;
+    NETCP_CFG_CLASSIFIER_T dsp_classi;
+    NETCP_CFG_ROUTE_T dsp_route;
+    char dsp_name[PKTIO_MAX_NAME];
+
+    memset(&dsp_pktio_cfg, 0, sizeof (PKTIO_CFG_T));
+    memset(&dsp_classi, 0, sizeof (NETCP_CFG_CLASSIFIER_T));
+    memset(&dsp_route, 0, sizeof (NETCP_CFG_ROUTE_T));
+    for (i = 0; i < CPU_NUM_REM_FAST_PATH_CORES; i++)
+    {
+        snprintf(&dsp_name[0],PKTIO_MAX_NAME-1, "%s%d","dsp_chan", i);
+        dsp_pktio_cfg.flags1 = PKTIO_RX;
+        dsp_pktio_cfg.flags2 = PKTIO_PKT;
+        dsp_pktio_cfg.qnum = TEST_NWAL_BASE_REM_FP_RX_PKT_QUEUE + i;
+        dsp_pktio_cfg.max_n = 8;
+
+        /* pktio channels created here will NOT be POLLED by net_test arm application */
+        dsp_pktio_channels[i] = netapi_pktioCreate(handle,
+                                               &dsp_name[0],
+                                               (PKTIO_CB)recv_cb,
+                                               &dsp_pktio_cfg,
+                                               &err);
+
+        dsp_classi.classType =NETCP_CFG_CLASS_TYPE_L4;
+        dsp_classi.u.c_l4.iface = netTestCfg.dsp_mac;
+        
+        dsp_classi.u.c_l4.ip = ip_rule[netTestCfg.dsp_ip];
+        dsp_classi.u.c_l4.proto = NWAL_APP_PLOAD_PROTO_UDP;
+        dsp_classi.u.c_l4.appProto.udpPort = TEST_NWAL_BASE_REM_FP_UDP_PORT + i;
+
+        dsp_route.p_dest_q = dsp_pktio_channels[i];
+       
+        dsp_route.p_flow = (NETCP_CFG_FLOW_T*)NETCP_DEFAULT_FLOW;
+        
+        dsp_classifers[i] = netapi_netcpCfgAddClass(handle, 
+                                &dsp_classi, 
+                                (NETCP_CFG_ROUTE_HANDLE_T) &dsp_route, 
+                                NETCP_CFG_ACTION_TO_SW,
+                                NULL,
+                                &err);
+
+        if (err != NETAPI_ERR_OK)
+        {
+            netapi_Log("setup_netTestDSPFastPath: netapi_netcpCfgAddClass failed for core %d\n", i);
+        }
+    }
+    printf("DSP Path fath setup complete\n");
+}
+
+void teardown_netTestDSPFastPath()
+{
+    int i;
+    int err=0;
+
+    for (i = 0; i < CPU_NUM_REM_FAST_PATH_CORES; i++)
+    {
+        netapi_netcpCfgDelClass(netapi_handle,
+                                dsp_classifers[i],
+                                &err);
+        if (err != NETAPI_ERR_OK)
+        {
+            printf("teardown_netTestDSPFastPath: netapi_netcpCfgDelClass failed for core %d\n", i);
+        }
+
+        netapi_pktioDelete(dsp_pktio_channels[i],
+                           &err);
+        if (err != NETAPI_ERR_OK)
+        {
+            printf("teardown_netTestDSPFastPath: netapi_pktioDelete failed for core %d\n", i);
+        }
+    }
+    printf("DSP Path fath teardown complete\n");
+}
+#endif
+
+
+#ifdef netTest_MULTI_THREAD
+NETAPI_T worker_nh[TUNE_NETAPI_NUM_CORES];
+
+void slow_path_thread(uint32_t index)
+{
+    int err, i;;
+    uint32_t thread_num;
+    PKTIO_HANDLE_T *rx_chan;
+    PKTIO_HANDLE_T *sb_rx_chan;
+
+
+    cpu_set_t cpu_set;
+
+    thread_num = netTestCfg.sp_thread_num[index];
+    netapi_Log("slow_path_thread, mypid: %d, core_id %d\n", gettid(), netTestCfg.sp_thread_num[index]);
+
+    CPU_ZERO( &cpu_set);
+#ifdef CORTEX_A8
+    for (i = netTestCfg.sp_proc_start[index]; i <= netTestCfg.sp_proc_end[index];i++)
+    {
+        printf("slow_path_thread: setting cpu %d to cpu_set\n", i);
+        CPU_SET( 0, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#else
+    for (i = netTestCfg.sp_proc_start[index]; i <= netTestCfg.sp_proc_end[index];i++)
+    {
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+    worker_nh[thread_num] = netapi_init(NETAPI_CORE_MASTER,NULL);
+
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("slow_path_thread: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    netapi_setCookie(worker_nh[thread_num],(void*)(thread_num | NET_TEST_SP_THREAD_MASK));
+
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],&our_sched_cfg, &err);
+    if (!scheduler[thread_num]) 
+    {
+        printf("sched create failed for core%d\n",thread_num);
+        goto ERR_slow_path_thread;
+    }
+    scheduler[thread_num]->config.yield = NETAPI_TRUE;
+    scheduler[thread_num]->config.pollGarbageQ = NETAPI_TRUE;
+    scheduler[thread_num]->config.pollCtrlQ = NETAPI_TRUE;
+    printf("Slow Path thread: %d setup complete, running on ARM CORE: %d\n", i,i);
+    /* Entry point to scheduler */
+    netapi_schedRun(scheduler[thread_num], &err);
+
+ERR_slow_path_thread:
+    printf("slow_path_thread: calling netapi_shutdown\n");
+    netapi_shutdown(worker_nh[thread_num]);
+}
+
+void fast_path_thread(uint32_t index)
+{
+    int err, i;
+    PKTIO_HANDLE_T *rx_chan;
+    PKTIO_HANDLE_T *sb_rx_chan;
+    uint32_t thread_num;
+
+
+    cpu_set_t cpu_set;
+
+    CPU_ZERO( &cpu_set);
+    thread_num = netTestCfg.fp_thread_num[index];
+#ifdef CORTEX_A8
+    for (i = netTestCfg.fp_proc_start[index]; i <= netTestCfg.fp_proc_end[index];i++)
+    {
+        CPU_SET( 0, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#else
+    for (i = netTestCfg.fp_proc_start[index]; i <= netTestCfg.fp_proc_end[index];i++)
+    {
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+    hplib_mSpinLockLock(&net_test_thread_lock);
+    worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,NULL);
+    
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("fast_path_thread: netapi_init failure, exiting\n");
+        hplib_mSpinLockUnlock(&net_test_thread_lock);
+        exit(1);
+    }
+    hplib_mSpinLockUnlock(&net_test_thread_lock);
+    /* open netcp default RX channels*/
+    rx_chan = netapi_pktioOpen(worker_nh[thread_num], NETCP_RX, (PKTIO_CB) recv_cb, &netcp_rx_cfg,  &err);
+
+    netcp_rx_cfg.flags2 = PKTIO_PKT;
+
+    if(masterType == NETAPI_SYS_MASTER)
+        netapi_pktioOpen(worker_nh[thread_num], "sysMaster", (PKTIO_CB) recv_cb, &netcp_rx_cfg,  &err);
+
+    else if(masterType == NETAPI_PROC_MASTER)
+        netapi_pktioOpen(worker_nh[thread_num], "procMaster", (PKTIO_CB) recv_cb, &netcp_rx_cfg,  &err);
+
+    /* create a pktio channel for specially classified pkts */
+    /* open netcp default tx, rx queues for sideband crypto */
+    sb_rx_chan = netapi_pktioOpen(worker_nh[thread_num], NETCP_SB_RX, (PKTIO_CB) recv_sb_cb, &netcp_sb_rx_cfg,  &err);
+
+    netapi_setCookie(worker_nh[thread_num],(void*)thread_num);
+    
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],
+                                            &our_sched_cfg,
+                                            &err);
+    if (!scheduler[thread_num]) 
+        {
+        printf("sched create failed for core%d\n",thread_num);
+        goto ERR_fast_path_thread;
+    }
+
+ 
+    scheduler[thread_num]->config.yield = NETAPI_FALSE;
+    scheduler[thread_num]->config.pollGarbageQ = NETAPI_FALSE;
+    scheduler[thread_num]->config.pollCtrlQ = NETAPI_FALSE;
+   /* Entry point to scheduler */
+    printf("Fast Path thread: %d setup complete, running on ARM CORE: %d\n", i,i);
+    netapi_schedRun(scheduler[thread_num], &err);
+
+ERR_fast_path_thread:
+    netapi_pktioClose(rx_chan, &err);
+    netapi_pktioClose(sb_rx_chan, &err);
+    
+    printf("fast_path_thread: calling netapi_shutdown\n");
+    netapi_shutdown(worker_nh[thread_num]);
+}
+
+#endif
+/***************************************
+ ********** test driver*****************
+ ***************************************/
+int main(int argc, char **argv)
+{
+    int err,i;
+    Pktlib_HeapCfg      heapCfg;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    FILE * fpr = NULL;
+    int c;
+    int configFilePresent = 0;
+
+    static char usage[] = "usage: %s -f < config File Name> -t <masterType: procMaster or sysMater> >\n";
+#ifdef netTest_MULTI_THREAD
+    cpu_set_t cpu_set;
+#endif
+     /* install signal handler for ^c */
+    signal(SIGINT,netTest_utilMySig);
+
+
+    while ((c = getopt (argc, argv, "f:t:?")) != -1)
+    {
+       switch (c)
+       {
+            case 'f':
+                fpr = fopen(optarg, "r");
+                if(fpr)
+                    configFilePresent =1;
+                break;
+            case 't':
+                if(strcmp("sysMaster", optarg) == 0)
+                {
+                    masterType = NETAPI_SYS_MASTER;
+                }
+                else if (strcmp("procMaster", optarg) == 0)
+                {
+                    masterType = NETAPI_PROC_MASTER;
+                }
+                else
+                {
+                    printf("%s\n", usage);
+                }
+                break;
+
+            case '?':
+                printf("optionValue %s: %d\n", optarg, masterType);
+                exit(EXIT_FAILURE);
+                break;
+            default:
+                break;
+        }
+    }
+
+    if (!configFilePresent)
+    {
+        fpr = fopen(input_file_name, "r");
+        if (fpr == NULL)
+        {
+            printf("main: Missing config file\n");
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    if (initRm())
+    {
+        printf("main: initRm() returned error\n");
+        exit(1);
+    }
+    hplib_mSpinLockInit(&net_test_thread_lock );
+    our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+    memset(&config_file, 0, sizeof(netTestConfigFile_t));
+    memset(&netTestCfg, 0, sizeof(netTestConfig_t));
+
+    netTest_utilProcessConfigFile(fpr,&config_file);
+
+    netTest_utilParseMac(&config_file);
+
+    /* parse slow path/fast path thread configuration parameters */
+    netTest_utilParseThreadParams(&config_file);
+
+    netTest_utilParseIP(&config_file);
+
+    netTest_utilParseIpsecMode(&config_file);
+
+    /* DSP mac processing */
+    parse_dsp_mac(&config_file.dsp_mac[0]);
+
+    /* DSP IP processing */
+    parse_dsp_ip(&config_file.dsp_ip[0]);
+
+    /* IPSEC interface number processing */
+    parse_simple_param_u32((char*)&config_file.ipsec_if_no[0], &netTestCfg.ipsec_if_no);
+
+    netTest_utilParseSA(&config_file);
+
+    parse_simple_param_u32(&config_file.dest_udp_port_config, &netTestCfg.dest_udp_port_config);
+
+    memset(&sa_info, 0, sizeof(sa_info));
+
+
+#ifdef netTest_MULTI_THREAD
+    /* assign main net_test thread to run on core 0 */
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+
+    /* create netapi */
+
+    netapi_handle = netapi_init(masterType,
+                                &our_netapi_default_cfg);
+
+    if (netapi_handle == NULL)
+    {
+        printf("main: netapi_init failure, exiting\n");
+        closeRm();
+        exit(1);
+    }
+
+    /* configure expection packet handling with netapi */
+    expPkt_appid = netapi_netcpCfgExceptions(netapi_handle, 
+                                             7,
+                                             NETCP_CFG_ACTION_TO_SW,
+                                             (NETCP_CFG_ROUTE_HANDLE_T) NULL);
+
+    /* open the main heap */
+    ourHeap = Pktlib_findHeapByName("netapi");
+    if (!ourHeap)
+    {
+        printf("Pktlib_findHeapByName()  fail\n");
+        closeRm();
+        exit(1);
+    }
+
+    open_pktio_tx_channels();
+
+    /* create scheduler instance */
+    our_sched =netapi_schedOpen(netapi_handle,&our_sched_cfg, &err);
+    if (!our_sched)
+    {
+        printf("sched create failed\n");
+        closeRm();
+        exit(1);
+    }
+
+
+    /*create net_test MAC interfaces, attach IP to created MAC interfaces */
+    netTest_utilCreateInterfaces(netTestCfg.num_macs, netTestCfg.num_ips, 0);
+
+    /* lookup Database for SA context, this is used by packet processing routines to get RX and TX SA information*/
+    p_trie_sa_rx = trie_new();
+    p_trie_sa_tx = trie_new();
+    if (!p_trie_sa_rx || !p_trie_sa_tx)
+    {
+        printf("trie alloc for SA  failed\n");
+        closeRm();
+        exit(1);
+    }
+
+#ifdef netTest_DSP_FASTPATH
+    if (masterType == NETAPI_SYS_MASTER)
+    {
+        setup_netTestDSPFastPath(netapi_handle);
+    }
+#endif
+
+    netTest_utilCreateDefaultFlow(netapi_handle, masterType);
+    /* Create RX SA's, RX Policy and TX SA's, all SA configuration parameters are read from net_test_config.txt file */
+    netTest_utilCreateSecAssoc();
+
+#ifdef netTest_MULTI_THREAD
+{
+    /* create and set affinity of slow path and fast path threads to
+    * specific CPU cores as specified in the net_test_config.txt file */
+    netTest_utilCreateSpFpThreads(netTestCfg.num_sp_threads, 
+                                  (NET_TEST_FUNC_PTR) slow_path_thread,
+                                  netTestCfg.num_fp_threads,
+                                  (NET_TEST_FUNC_PTR) fast_path_thread);
+
+    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");
+
+
+
+
+    int c;
+    //this thread of execution (main) now just waits on user input
+    for(;;)
+    {
+       printf(">");
+       c=getchar();
+       if (c=='q')
+       {
+            QUIT=1;
+            printf("net_test_loopback: please wait for application shutdown and resource cleanup\n");
+            break;
+       }
+       else if (c=='s') netTest_utilsStatsCb(netapi_handle, &netcp_stats);
+       else if (c=='h') printf("'q' to quit,  's' for stats, 'h' for help\n");
+    }
+
+        netTest_utilRemoveSpFpThreads(netTestCfg.num_sp_threads, netTestCfg.num_fp_threads);
+}
+#else
+    /*********************************************/
+    /**************Entry point into scheduler ****/
+    /*********************************************/
+    //netTest_utilCreateSecAssoc(netcp_sb_rx_chan, netcp_sb_tx_chan,netcp_tx_chan);
+    netapi_schedRun(our_sched, &err);
+#endif
+
+    /* done */
+    netTest_utilsStatsCb(netapi_handle, NULL);
+
+
+    /* cleanup*/
+     netTest_utilDeleteSecAssoc();
+
+    netTest_utilDeleteInterfaces(netTestCfg.num_macs, netTestCfg.num_ips);
+
+    /* close pktio channels we opened via open_pktio_tx_channels() */
+    close_pktio_channels();
+#ifdef netTest_DSP_FASTPATH
+    if (masterType == NETAPI_SYS_MASTER)
+    {
+        teardown_netTestDSPFastPath();
+    }
+#endif
+
+    netapi_shutdown(netapi_handle);
+    closeRm();
+    printf("net_test shutdown complete\n");
+
+}
+
+#if 1
+/* Stub functions */
+Trie * route_init(void)
+{
+    return NULL;
+}
+void route_add(Trie * Pt, unsigned long * Pdest_ipBE, void * Pour_route)
+{
+}
+#endif
diff --git a/ti/runtime/netapi/test/net_test_max_params.c b/ti/runtime/netapi/test/net_test_max_params.c
new file mode 100755
index 0000000..888942c
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_max_params.c
@@ -0,0 +1,462 @@
+/******************************************
+ * File: net_test.c
+ * Purpose: Application for testing out max configuration parameters
+ *          such as SA's, MACs/IP interfaces
+ **************************************************************
+ * FILE:  net_test.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include "net_test.h"
+#include "ti/drv/nwal/test/fw_rm.h"
+#include <signal.h>
+#include <pthread.h>
+
+extern int QUIT;
+extern netTestStats_T stats[TUNE_NETAPI_NUM_CORES];
+extern paSysStats_t netcp_stats;
+/* Global definitions */
+#ifdef netTest_MULTI_THREAD
+    cpu_set_t cpu_set;
+#endif
+
+
+#define SA_CREATE_LOOP_COUNT 64
+#define IP_CREATE_LOOP_COUNT 64
+#define MAC_CREATE_LOOP_COUNT 59
+
+
+netTestConfig_t netTestCfg;
+static  netTestConfigFile_t config_file;
+
+char    input_file_name[] = "net_test_config_max_iface.txt";
+
+nwal_RetValue       nwalRetVal;
+Pktlib_HeapHandle ourHeap;
+
+PKTIO_HANDLE_T *netcp_rx_chan;
+PKTIO_HANDLE_T *netcp_tx_chan_no_crypto;
+PKTIO_HANDLE_T *netcp_tx_chan_esp;
+PKTIO_HANDLE_T *netcp_tx_chan_ah;
+PKTIO_HANDLE_T *netcp_sb_tx_chan;
+PKTIO_HANDLE_T *netcp_sb_rx_chan;
+
+PKTIO_CFG_T our_chan_cfg={PKTIO_RX_TX, PKTIO_LOCAL, PKTIO_Q_ANY, 8};
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_rx_cfg2={PKTIO_RX, (PKTIO_GLOBAL|PKTIO_PKT), PKTIO_Q_ANY, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_sb_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_sb_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+
+
+NETCP_CFG_EXCEPTION_PKT_T expPkt_appid;
+
+Trie *p_trie_sa_rx;
+Trie *p_trie_sa_tx;
+
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+TUNE_NETAPI_PERM_MEM_SZ,
+128,  //start of packet offset for hw to place data on rx for default flow
+TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+64, //#descriptors w/o buffers in default heap
+TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+128,       //tail room
+256,      //extra room
+0,
+NULL,
+18,
+0x2000
+};
+
+NETAPI_T netapi_handle;
+NETAPI_SCHED_HANDLE_T * our_sched;
+#ifdef netTest_MULTI_THREAD
+NETAPI_SCHED_HANDLE_T * scheduler[TUNE_NETAPI_NUM_CORES];
+#endif
+NETAPI_SCHED_CONFIG_T our_sched_cfg={
+  NETAPI_SCHED_DURATION|NETAPI_SCHED_CBV, 0, house, 5000000  //every 5000000 poll loops
+};
+
+NETCP_CFG_IP_T ip_rule[NET_TEST_MAX_IP];
+NETCP_CFG_MACIF_T mac[NET_TEST_MAX_MAC];
+
+
+
+/* security objects. (for loopback mode) */
+netTestSA_t sa_info[MAX_SEC_INDEX];
+
+NETCP_CFG_IPSEC_POLICY_T rx_policy[MAX_SEC_INDEX];
+
+/* stub functions */
+void recv_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    return;
+}
+
+void flip_and_send_pkt(Ti_Pkt *tip,  unsigned char * p_pkt, int len, int flag, uint16_t enet_port)
+{
+    return;
+}
+
+
+
+void recv_sb_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    return;
+}
+
+Trie * route_init(void)
+{
+    return NULL;
+}
+void route_add(Trie * Pt, unsigned long * Pdest_ipBE, void * Pour_route)
+{
+}
+
+#ifdef netTest_MULTI_THREAD
+NETAPI_T worker_nh[TUNE_NETAPI_NUM_CORES];
+
+void slow_path_thread(uint32_t thread_num)
+{
+    return;
+}
+
+void fast_path_thread(uint32_t thread_num)
+{
+    return;
+}
+
+#endif
+
+/* Templates to build command labels at startup up time, required by open_pktio_tx_channels() */
+nwalTxPktInfo_t txPktInfoESP = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                                                                                  /* ipOffBytes */
+    0,                                                                                                  /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                                             /* l4HdrLen */
+    0,                                                                                                  /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+nwalTxPktInfo_t txPktInfoAH = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_AH_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM | NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN + netTest_IPSEC_AH_FIXED_HDR_SIZE,                    /* saAhIcvOffBytes */
+    12,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                             /* ipOffBytes */
+    0,                                                                                                  /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                                            /* l4HdrLen */
+    0,                                                                                                  /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+nwalTxPktInfo_t txPktInfoNoCrypto = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    0,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    0,                                                                                                  /* ipOffBytes */
+    netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN,                                        /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                             /* l4HdrLen */
+    0,                                                                         /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+void close_pktio_channels(void)
+{
+    int err;
+    netapi_pktioClose(netcp_tx_chan_esp ,&err);
+    netapi_pktioClose(netcp_tx_chan_ah ,&err);
+    netapi_pktioClose(netcp_sb_tx_chan ,&err);
+    netapi_pktioClose(netcp_tx_chan_no_crypto,&err);
+}
+
+void open_pktio_tx_channels(void)
+{
+    int err;
+    /* open netcp default  TX for ESP packets */
+    netcp_tx_chan_esp= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_esp)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_ESP_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoESP;
+            netapi_pktioControl(netcp_tx_chan_esp, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /* open netcp default  TX for AH packets */
+    netcp_tx_chan_ah= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_ah)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_AH_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoAH;
+            netapi_pktioControl(netcp_tx_chan_ah, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /* open netcp default  TX channels for non-Crypto packets */
+    netcp_tx_chan_no_crypto= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_no_crypto)
+    {
+        printf("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_L4CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan_no_crypto, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /* open netcp default  TX channels for SB crypto */
+    netcp_sb_tx_chan= netapi_pktioOpen(netapi_handle, NETCP_SB_TX, NULL, &netcp_sb_tx_cfg,  &err);
+    if (!netcp_sb_tx_chan)
+    {
+        printf("pktio open SB TX failed err=%d\n",err);
+        exit(1);
+    }
+}
+/***************************************
+ ********** test driver*****************
+ ***************************************/
+int main(int argc, char **argv)
+{
+    int err,i;
+    Pktlib_HeapCfg      heapCfg;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    FILE * fpr = NULL;
+
+
+    setvbuf(stdout,NULL,_IONBF,0);
+     /* install signal handler for ^c */
+    signal(SIGINT,netTest_utilMySig);
+
+    if (argc == 2)
+    {
+        printf("main: filename1 %s\n", argv[1]);
+        fpr = fopen(argv[1], "r");
+    }
+    else
+    {
+        fpr = fopen(input_file_name, "r");
+    }
+    if (fpr == NULL)
+    {
+        printf("error opening configfile\n");
+        exit(1);
+    }
+    else
+    {
+        memset(&config_file, 0, sizeof(netTestConfigFile_t));
+        memset(&netTestCfg, 0, sizeof(netTestConfig_t));
+        netTest_utilProcessConfigFile(fpr,&config_file);
+#if 1
+        netTest_utilParseMac(&config_file);
+
+        /* parse slow path/fast path thread configuration parameters */
+        netTest_utilParseThreadParams(&config_file);
+
+        netTest_utilParseIP(&config_file);
+
+        netTest_utilParseIpsecMode(&config_file);
+
+        /* DSP mac processing */
+        parse_dsp_mac(&config_file.dsp_mac[0]);
+
+       /* DSP IP processing */
+        parse_dsp_ip(&config_file.dsp_ip[0]);
+
+        /* IPSEC interface number processing */
+        parse_simple_param_u32((char*)&config_file.ipsec_if_no[0], &netTestCfg.ipsec_if_no);
+
+        netTest_utilParseSA(&config_file);
+#endif
+    }
+
+    memset(&sa_info, 0, sizeof(sa_info));
+
+
+#ifdef netTest_MULTI_THREAD
+    /* assign main net_test thread to run on core 0 */
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+
+    /* create netapi */
+    netapi_handle = netapi_init(NETAPI_SYS_MASTER, &our_netapi_default_cfg);
+    if (netapi_handle == NULL)
+    {
+        printf("main: netapi_init failure, exiting\n");
+        exit(1);
+    }
+
+    /* open the main heap */
+    ourHeap = Pktlib_findHeapByName("netapi");
+    if (!ourHeap)
+    {
+        printf("Pktlib_findHeapByName()  fail\n");
+        exit(1);
+    }
+
+    open_pktio_tx_channels();
+
+    /* create scheduler instance */
+    our_sched =netapi_schedOpen(netapi_handle,&our_sched_cfg, &err);
+    if (!our_sched) {printf("sched create failed\n"); exit(1);}
+
+
+    /*create net_test MAC interfaces, attach IP to created MAC interfaces */
+    netTest_utilCreateInterfaces(netTestCfg.num_macs, netTestCfg.num_ips,0);
+
+    /* lookup Database for SA context, this is used by packet processing routines to get RX and TX SA information*/
+    p_trie_sa_rx = trie_new();
+    p_trie_sa_tx = trie_new();
+    if (!p_trie_sa_rx || !p_trie_sa_tx)
+        {printf("trie alloc for SA  failed\n"); exit(1);}
+
+
+#ifdef TEST_SA
+    /* Create RX SA's, RX Policy and TX SA's, all SA configuration parameters are read from net_test_config.txt file */
+    netTest_utilCreateSecAssoc();
+#endif
+#ifdef netTest_MULTI_THREAD
+{
+    int c;
+
+
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+            printf(">");
+            c=getchar();
+            if (c=='q')
+            {
+                QUIT=1;
+                break;
+            }
+            else if (c=='h')
+                printf("'q' to quit,  's' for stats, 'h' for help\n");
+        }
+}
+#else
+    /*********************************************/
+    /**************Entry point into scheduler ****/
+    /*********************************************/
+    netapi_schedRun(our_sched, &err);
+#endif
+
+    /* cleanup*/
+     netTest_utilDeleteSecAssoc();
+
+    netTest_utilDeleteInterfaces(netTestCfg.num_macs, netTestCfg.num_ips);
+
+    /* close pktio channels we opened via open_pktio_tx_channels() */
+    close_pktio_channels();
+    
+    netapi_shutdown(netapi_handle);
+
+}
+
diff --git a/ti/runtime/netapi/test/net_test_router.c b/ti/runtime/netapi/test/net_test_router.c
new file mode 100755
index 0000000..c6d1875
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_router.c
@@ -0,0 +1,800 @@
+/******************************************************************************
+ * File: net_test_router.c
+ * Purpose: net_test_router application
+ ******************************************************************************
+ * FILE:  net_test_router.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  net_test_router application
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ******************************************************************************/
+
+#include "netapi.h"
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+#include "net_test_thread_utils.h"
+
+#include <signal.h>
+#include <pthread.h>
+#include <sys/resource.h>
+#include "router.h"
+extern int QUIT;
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+
+
+#if defined(DEVICE_K2H)
+#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/drv/qmss/device/k2k/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
+#elif defined (DEVICE_K2L)
+#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/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+#else /*Default */
+#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
+#endif
+/* Global definitions */
+
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+
+hplib_spinLock_T net_test_thread_lock;
+netTestConfig_t netTestCfg;
+static  netTestConfigFile_t config_file;
+
+char    input_file_name[] = "/etc/transportnetlib/test/net_test_config.txt";
+
+nwal_RetValue       nwalRetVal;
+Pktlib_HeapHandle ourHeap;
+
+PKTIO_HANDLE_T *netcp_tx_chan_no_crypto;
+PKTIO_HANDLE_T *netcp_rx_chan;
+PKTIO_HANDLE_T *netcp_tx_chan_esp;
+PKTIO_HANDLE_T *netcp_tx_chan_ah;
+
+
+
+
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 8};
+
+
+
+NETCP_CFG_EXCEPTION_PKT_T expPkt_appid;
+
+Trie *p_trie_sa_rx;
+Trie *p_trie_sa_tx;
+
+
+#include "router.c"
+Trie * our_router;
+
+OUR_ROUTE_T routes[MAX_ROUTES]=
+
+{
+    {0,{0xD4,0xbe,0xd9,0x00,0xd3,0x7e, 0x00,0x01,0x02,0x03,0x14,0x02,0x08,0x00},0},
+    {0,{0x00,0x00,0x0,0x00,0x0,0x0, 0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00},0},
+    {0,{0xD4,0xbe,0xd9,0x00,0xd3,0x7e, 0x00,0x01,0x02,0x03,0x14,0x02,0x08,0x00},0},
+    {0,{0x00,0x15,0x60,0xa1,0xf7,0xbe, 0x00,0x01,0x02,0x03,0x04,0x05,0x08,0x00},0},
+    {0,{0xd4,0xbe,0xd9,0x00,0xd3,0x7e, 0x00,0x01,0x02,0x03,0x04,0x05,0x08,0x00},0}
+};
+unsigned int ip[MAX_ROUTES]={BE(0x0a0100c8),BE(0x0a00000a),BE(0x0a02000a),BE(0xc0a8010a),BE(0x9eda6719)};
+
+void recv_cb_router(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+
+extern netTestStats_T stats[];
+extern paSysStats_t netcp_stats;
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+    TUNE_NETAPI_PERM_MEM_SZ,
+    128,  //start of packet offset for hw to place data on rx for default flow
+    TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+    TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+    TUNE_NETAPI_DEFAULT_NUM_BUFFERS,   //#descriptors+buffers in default heap
+    64, //#descriptors w/o buffers in default heap
+    TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+    128,  //tail room
+    256,  //extra room
+    0,
+    NULL,
+    -1,
+    -1
+};
+
+
+
+void house(NETAPI_SCHED_HANDLE_T *s);
+NETAPI_T netapi_handle;
+NETAPI_SCHED_HANDLE_T * our_sched;
+#ifdef netTest_MULTI_THREAD
+NETAPI_SCHED_HANDLE_T * scheduler[TUNE_NETAPI_NUM_CORES];
+#endif
+NETAPI_SCHED_CONFIG_T our_sched_cfg={
+  NETAPI_SCHED_DURATION|NETAPI_SCHED_CBV, 0, house, 5000000  //every 5000000 poll loops
+};
+
+
+NETCP_CFG_IP_T ip_rule[NET_TEST_MAX_IP];
+NETCP_CFG_MACIF_T mac[NET_TEST_MAX_MAC];
+
+
+
+/* security objects. (for loopback mode) */
+netTestSA_t sa_info[MAX_SEC_INDEX];
+
+
+NETCP_CFG_IPSEC_POLICY_T rx_policy[MAX_SEC_INDEX];
+
+
+
+
+/*************************END NETAPI OBJECTS***********************/
+
+void update_header(netTestHead_T * p_head, int len)
+{
+   unsigned char *p = (unsigned char *) &p_head->udp[1];
+   len -= (20+14);
+   /* update ip checksum */
+   /* update udp checksum */
+   /* update length */
+   *p= (len&0xff00)>>8;
+   *(p+1) = len&0xff;
+}
+
+#ifdef netTest_MULTI_THREAD
+/* Templates to build command labels at startup up time, required by open_pktio_tx_channels() */
+nwalTxPktInfo_t txPktInfoESP = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_DO_IPV4_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    1,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    netTest_MAC_HEADER_LEN,                                                        /* ipOffBytes */
+    0,                          /* l4OffBytes */
+    0,                         /* l4HdrLen */
+    0,                                                                                   /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+
+nwalTxPktInfo_t txPktInfoAH = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPSEC_AH_CRYPTO| NWAL_TX_FLAG1_DO_IPV4_CHKSUM | NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN + netTest_IPSEC_AH_FIXED_HDR_SIZE,                    /* saAhIcvOffBytes */
+    12,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    netTest_MAC_HEADER_LEN,   /* ipOffBytes */
+    0,                    /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                                            /* l4HdrLen */
+    0,                                                                                                  /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+nwalTxPktInfo_t txPktInfoNoCrypto = 
+{
+    NULL,                                                                                               /* p_pkt */
+    NWAL_TX_FLAG1_DO_IPV4_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID,      /* txFlags */
+    0,                                                                                                  /* lpbackPass */
+    0,                                                                                                  /* enetport */
+    0,                                                                                                  /* msuSize */
+    0,                                                                                                   /* startOffset */
+    0,                                                    /* saOffBytes */
+    0,                                                                                                  /* saPayLoadLen */
+    0               ,                                                                                    /* saAhIcvOffBytes */
+    0,                                                                                                 /* saAhMacSize */
+    0,                                                                                                  /* etherLenOffBytes */
+    netTest_MAC_HEADER_LEN,         /* ipOffBytes */
+    netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN,                                        /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                                             /* l4HdrLen */
+    0,                                                                         /* pseudoHdrChecksum */
+    0                                                                                                   /* pLoadLen */
+};
+
+void close_pktio_channels(void)
+{
+    int err;
+    netapi_pktioClose(netcp_tx_chan_no_crypto ,&err);
+    netapi_pktioClose(netcp_tx_chan_esp ,&err);
+    netapi_pktioClose(netcp_tx_chan_ah ,&err);
+}
+
+
+
+void open_pktio_tx_channels()
+{
+    int err;
+    /* open netcp default TX channels for non-ipsec*/
+    netcp_tx_chan_no_crypto= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_no_crypto)
+    {
+        netapi_Log("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan_no_crypto, NULL, &cfg, &control, &err);
+    }
+    /* open netcp default TX for ESP packets */
+    netcp_tx_chan_esp= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_esp)
+    {
+        netapi_Log("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_ESP_L3CKSUM_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoESP;
+            netapi_pktioControl(netcp_tx_chan_esp, NULL, &cfg, &control, &err);
+        }
+    }
+
+    /*/* open netcp default  TX for AH packets */
+    netcp_tx_chan_ah= netapi_pktioOpen(netapi_handle, NETCP_TX, NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan_ah)
+    {
+        netapi_Log("pktio open TX failed err=%d\n",err);
+        exit(1);
+    }
+    else
+    {
+        if(netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_INFLOW)
+        {
+            PKTIO_CONTROL_T control;
+            control.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg;
+            cfg.fast_path_cfg.fp_send_option = PKTIO_FP_AH_PORT;
+            cfg.fast_path_cfg.txPktInfo= &txPktInfoAH;
+            netapi_pktioControl(netcp_tx_chan_ah, NULL, &cfg, &control, &err);
+        }
+    }
+}
+
+
+
+
+NETAPI_T worker_nh[TUNE_NETAPI_NUM_CORES];
+void slow_path_thread(uint32_t index)
+{
+    int err,i;
+    uint32_t thread_num;
+    PKTIO_HANDLE_T *rx_chan;
+    PKTIO_HANDLE_T *sb_tx_chan;
+    PKTIO_HANDLE_T *sb_rx_chan;
+    cpu_set_t cpu_set;
+
+    thread_num = netTestCfg.sp_thread_num[index];
+    printf("slow_path_thread for index %d  called for thread %d\n", index, thread_num);
+
+    CPU_ZERO( &cpu_set);
+#ifdef CORTEX_A8
+   for (i = netTestCfg.sp_proc_start[index]; i <= netTestCfg.sp_proc_end[index];i++)
+    {
+        printf("slow_path_thread: setting cpu %d to cpu_set\n", i);
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+#else
+    for (i = netTestCfg.sp_proc_start[index]; i <= netTestCfg.sp_proc_end[index];i++)
+    {
+        printf("slow_path_thread: setting cpu %d to cpu_set\n", i);
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+    worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
+                                      NULL);
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("slow_path_thread: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) worker_nh[thread_num];
+
+   /* open netcp RX channel */
+    //rx_chan = netapi_pktioOpen(worker_nh[thread_num], NETCP_RX, (PKTIO_CB) recv_cb_router, &netcp_rx_cfg,  &err);
+
+
+
+    netapi_setCookie(worker_nh[thread_num],(void*) (thread_num | NET_TEST_SP_THREAD_MASK));
+      
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],&our_sched_cfg, &err);
+    if (!scheduler[thread_num]) 
+    {
+        netapi_Log("sched create failed for core%d\n",thread_num); 
+        exit(1);
+    }
+      scheduler[thread_num]->config.yield = NETAPI_FALSE;
+      scheduler[thread_num]->config.pollGarbageQ = NETAPI_TRUE;
+      scheduler[thread_num]->config.pollCtrlQ = NETAPI_TRUE;
+            /*********************************************/
+    /**************Entry point into scheduler ****/
+    /*********************************************/
+    netapi_schedRun(scheduler[thread_num], &err);
+    netapi_Log("slow_path_thread: core %d worker thread done\n",thread_num);
+
+    //netapi_pktioClose(rx_chan, &err);
+    netapi_shutdown(worker_nh[thread_num]);
+}
+
+
+void fast_path_thread(uint32_t index)
+{
+    int err,i;
+    uint32_t thread_num;
+    PKTIO_HANDLE_T *rx_chan;
+    PKTIO_HANDLE_T *sb_tx_chan;
+
+    cpu_set_t cpu_set;
+
+    thread_num = netTestCfg.fp_thread_num[index];
+    printf("fast_path_thread for index %d  called for thread %d\n", index, thread_num);
+    CPU_ZERO( &cpu_set);
+#ifdef CORTEX_A8
+    for (i = netTestCfg.fp_proc_start[index]; i <= netTestCfg.fp_proc_end[index];i++)
+    {
+        printf("fast_path_thread: setting cpu %d to cpu_set\n", i);
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#else
+    for (i = netTestCfg.fp_proc_start[index]; i <= netTestCfg.fp_proc_end[index];i++)
+    {
+        printf("fast_path_thread: setting cpu %d to cpu_set\n", i);
+        CPU_SET( i, &cpu_set);
+    }
+    hplib_utilSetupThread(thread_num, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+    hplib_mSpinLockLock(&net_test_thread_lock);
+    worker_nh[thread_num]=netapi_init(NETAPI_CORE_MASTER,
+                                      NULL);
+    if (worker_nh[thread_num] == NULL)
+    {
+        printf("fast_path_thread: netapi_init failure, exiting\n");
+        hplib_mSpinLockUnlock(&net_test_thread_lock);
+        exit(1);
+    }
+    hplib_mSpinLockUnlock(&net_test_thread_lock);
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) worker_nh[thread_num];
+
+   /* open netcp RX channel */
+    rx_chan = netapi_pktioOpen(worker_nh[thread_num], NETCP_RX, (PKTIO_CB) recv_cb_router, &netcp_rx_cfg,  &err);
+    netapi_setCookie(worker_nh[thread_num],(void*)thread_num);
+
+    scheduler[thread_num] =netapi_schedOpen(worker_nh[thread_num],&our_sched_cfg, &err);
+    if (!scheduler[thread_num]) 
+        {
+        netapi_Log("sched create failed for core%d\n",thread_num); 
+        exit(1);
+    }
+
+    /*********************************************/
+    /**************Entry point into scheduler ****/
+    /*********************************************/
+    scheduler[thread_num]->config.yield = NETAPI_FALSE;
+     scheduler[thread_num]->config.pollGarbageQ = NETAPI_FALSE;
+     scheduler[thread_num]->config.pollCtrlQ = NETAPI_FALSE;
+     //sleep(100000);
+    netapi_schedRun(scheduler[thread_num], &err);
+    netapi_Log("fast_path_thread: core %d worker thread done\n",thread_num);
+
+    netapi_pktioClose(rx_chan, &err);
+    netapi_shutdown(worker_nh[thread_num]);
+}
+#endif
+
+/***************************************
+ ********** test driver*****************
+ ***************************************/
+int main(int argc, char **argv)
+{
+    int err,i;
+    Pktlib_HeapCfg      heapCfg;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    FILE * fpr = NULL;
+
+    cpu_set_t cpu_set;
+    /* install signal handler for ^c */
+    signal(SIGINT,netTest_utilMySig);
+
+    if (argc == 2)
+    {
+        fpr = fopen(argv[1], "r");
+    }
+    else
+    {
+        fpr = fopen(input_file_name, "r");
+    }
+    if (fpr == NULL)
+    {
+        exit(1);
+    }
+    else
+    {
+        if (initRm())
+        {
+            printf("main: initRm() returned error\n");
+            exit(1);
+        }
+        hplib_mSpinLockInit(&net_test_thread_lock );
+        our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+        memset(&config_file, 0, sizeof(netTestConfigFile_t));
+        memset(&netTestCfg, 0, sizeof(netTestConfig_t));
+        netTest_utilProcessConfigFile(fpr,&config_file);
+        netTest_utilParseMac(&config_file);
+
+        /* parse slow path/fast path thread configuration parameters */
+        netTest_utilParseThreadParams(&config_file);
+
+        netTest_utilParseIP(&config_file);
+
+        netTest_utilParseIpsecMode(&config_file);
+
+        /* DSP mac processing */
+        parse_dsp_mac(&config_file.dsp_mac[0]);
+
+       /* DSP IP processing */
+        parse_dsp_ip(&config_file.dsp_ip[0]);
+
+        netTest_utilParseRoutes(&config_file, &routes[0], &our_router);
+        
+        /* IPSEC interface number processing */
+        parse_simple_param_u32((char*)&config_file.ipsec_if_no[0], &netTestCfg.ipsec_if_no);
+
+        netTest_utilParseSA(&config_file);
+    }
+
+    memset(&sa_info, 0, sizeof(sa_info));
+
+#ifdef netTest_MULTI_THREAD
+    /* assign main net_test thread to run on core 0 */
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0, &cpu_set, hplib_spinLock_Type_LOL);
+#endif
+    /* create netapi */
+    our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+    netapi_handle = netapi_init(NETAPI_SYS_MASTER,
+                                &our_netapi_default_cfg);
+
+    if (netapi_handle == NULL)
+    {
+        printf("main: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    /* configure expection packet handling with netapi */
+    expPkt_appid = netapi_netcpCfgExceptions(netapi_handle,
+                                             7,
+                                             NETCP_CFG_ACTION_TO_SW,
+                                             (NETCP_CFG_ROUTE_HANDLE_T) NULL);
+
+    /* open the main heap */
+    ourHeap = Pktlib_findHeapByName("netapi");
+    if (!ourHeap)
+    {
+        netapi_Log("Pktlib_findHeapByName()  fail\n");
+        exit(1);
+    }
+
+    /* Open all required PKTIO TX channels */
+    open_pktio_tx_channels();
+
+    netapi_Log("net_test> %d bytes left in our CMA area\n", netapi_getBufMemRemainder());
+    /* create scheduler instance */
+    our_sched =netapi_schedOpen(netapi_handle,&our_sched_cfg, &err);
+    if (!our_sched) {netapi_Log("sched create failed\n"); exit(1);}
+
+
+    /*create net_test MAC interfaces, attach IP to created MAC interfaces */
+    netTest_utilCreateInterfaces(netTestCfg.num_macs, netTestCfg.num_ips,1);
+
+    /* Lookup Database for SA context, this is used by packet processing routines to get RX and TX SA information*/
+    p_trie_sa_rx = trie_new();
+    p_trie_sa_tx = trie_new();
+   if (!p_trie_sa_rx || !p_trie_sa_tx)
+        {netapi_Log("trie alloc for SA  failed\n"); exit(1);}
+
+    /* Create RX SA's, RX Policy and TX SA's, all SA configuration parameters are read from net_test_config.txt file */
+    netTest_utilCreateSecAssoc();
+
+
+#ifdef netTest_MULTI_THREAD
+{
+    int c;
+    /* create and set affinity of slow path and fast path threads to
+    * specific CPU cores as specified in the net_test_config.txt file */
+     netTest_utilCreateSpFpThreads(netTestCfg.num_sp_threads, 
+                                  (NET_TEST_FUNC_PTR) slow_path_thread,
+                                  netTestCfg.num_fp_threads,
+                                  (NET_TEST_FUNC_PTR) fast_path_thread);
+
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+           printf(">");
+           c=getchar();
+           if (c=='q') {QUIT=1;break;}
+           else if (c=='s') netTest_utilsStatsCb(netapi_handle, &netcp_stats);
+           else if (c=='h') printf("'q' to quit,  's' for stats, 'h' for help\n");
+        }
+        netTest_utilRemoveSpFpThreads(netTestCfg.num_sp_threads, netTestCfg.num_fp_threads);
+}
+#else
+    /*********************************************/
+    /**************Entry point into scheduler ****/
+    /*********************************************/
+    netapi_schedRun(our_sched, &err);
+#endif
+
+/* done */
+netTest_utilsStatsCb(netapi_handle, NULL);
+
+
+
+    /* cleanup*/
+    netTest_utilDeleteSecAssoc();
+    netTest_utilDeleteInterfaces(netTestCfg.num_macs, netTestCfg.num_ips);
+
+    /* close pktio channels we opened via open_pktio_tx_channels() */
+    close_pktio_channels();
+    netapi_shutdown(netapi_handle);
+}
+
+static inline void send_it(Ti_Pkt *tip, int len, netTestSA_t * p_sec, int out_port)
+{
+  unsigned long st1;
+  unsigned long st2;
+  int err=0;
+  PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+  nwalTxPktInfo_t meta_tx2={0};
+  st1=hplib_mUtilGetPmuCCNT();
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+    //int coreid = our_core;
+#else
+    int coreid=0;
+#endif
+  if (len<60) 
+  { 
+     unsigned int templen;
+     char * p_pkt;
+     len=60; 
+     Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+     Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+     stats[coreid].tx_min+=1;
+  }
+  Pktlib_setPacketLen(tip,len);
+  meta_tx2.txFlag1 = (NWAL_TX_FLAG1_DO_IPV4_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID );
+  meta_tx2.startOffset = 0;
+  meta_tx2.ipOffBytes = netTest_MAC_HEADER_LEN;
+  meta_tx2.ploadLen = len ;
+  meta_tx2.enetPort=out_port;
+  if(p_sec)
+  {   
+       meta_tx2.txFlag1 |= NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO ;
+       meta2.sa_handle = (void*)p_sec->tx_tunnel;
+       meta_tx2.saOffBytes=netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN;
+       meta_tx2.saPayloadLen=len-netTest_MAC_HEADER_LEN - netTest_IP_HEADER_LEN;   //don't include tag, mac and outer header
+       meta2.u.tx_meta=&meta_tx2;
+       netapi_pktioSend(netcp_tx_chan_esp,tip,&meta2,&err);
+       stats[coreid].sec_tx+=1;
+  }
+  else
+  {
+      meta2.u.tx_meta=&meta_tx2;
+      netapi_pktioSend(netcp_tx_chan_no_crypto,tip,&meta2,&err);
+
+  }
+  stats[coreid].tx +=1;
+  st2=hplib_mUtilGetPmuCCNT();
+  stats[coreid].send_cycles += (unsigned long long) (st2-st1);  
+} 
+void recv_cb_router(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    int i;
+    int len;
+    int p;
+    Ti_Pkt * tip;
+    unsigned int templen;
+    char * p_pkt;
+    netTestHead_T temp_head;
+    unsigned int appid;
+    IP_netTestHead_T th;
+    netTestSA_t *sec_data=NULL;
+    unsigned long t1;
+    unsigned long t2;
+    unsigned long long ct1;
+    unsigned long long ct2;
+    unsigned short ip_pl;
+    unsigned long long n_c_ops;
+    int ifno;
+    int out_port;
+#ifdef netTest_MULTI_THREAD
+        int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+        //int coreid = our_core;
+#else
+    int coreid=0;
+#endif
+    t1=hplib_mUtilGetPmuCCNT();
+    ct1 =Osal_cache_op_measure(&n_c_ops);
+    for(i=0;i<n_pkts;i++)
+    {
+        ifno = ((unsigned int)meta[i].u.rx_meta->appId)&0xff;
+        if(coreid<TUNE_NETAPI_NUM_CORES) 
+        {
+            stats[coreid].rx+=1;
+            if (ifno < TUNE_NETAPI_MAX_NUM_MAC)
+                stats[coreid].if_rx[ifno]+=1;
+        }
+        tip = p_recv[i];
+        Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+        len = Pktlib_getPacketLen(tip)-4;//real length, subtract mac trailer
+        appid = ((unsigned int)meta[i].u.rx_meta->appId)&0xff000000;
+        switch(appid)
+        {
+           case(NETAPI_NETCP_MATCH_IPSEC):
+           case(NETAPI_NETCP_MATCH_IPSEC_POLICY):
+           {
+             int tailen=12+2;
+             memcpy(&temp_head,&p_pkt[14],sizeof(netTestHead_T));
+             if (!netTest_utilCheckHeader(&temp_head,&meta[i])) {
+                stats[coreid].n_bad+=1;
+                Pktlib_freePacket(tip); 
+                continue;
+             }
+             tailen+=p_pkt[len-12-2]; //padding length  (12)should come from sec_ptr
+             p_pkt = &p_pkt[8+16+20];   //16= iv len, should come from sec_ptr
+             len -= (8+16+20+tailen);  //16= iv len should come from sec ptr
+            
+             //now check inner headder.
+             memcpy(&th,&p_pkt[14],20);
+             if (!netTest_utilCheckHeader(&temp_head,&meta[i])) {
+                stats[coreid].n_bad+=1;
+                Pktlib_freePacket(tip);
+                continue;
+             }
+             Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+             Pktlib_setPacketLen(tip,len);
+             
+             if (route_pkt(our_router, tip, &th, p_pkt, &len,&sec_data,&out_port)<0)
+              {
+                stats[coreid].n_bad+=1;
+                Pktlib_freePacket(tip);
+             }
+             else
+             {
+               send_it(tip,len,sec_data,out_port);
+             }
+             break;
+           }
+           case(NETAPI_NETCP_MATCH_GENERIC_MAC):
+              if((p_pkt[12]!=0x8)||(p_pkt[13]!=0x00)) 
+              {
+                stats[coreid].n_new+=1;
+                Pktlib_freePacket(tip); 
+                continue;
+              }
+              if (!netTest_utilCheckHeader(&temp_head,&meta[i])) 
+              {
+                stats[coreid].n_bad+=1;
+                Pktlib_freePacket(tip);
+                continue;
+              }
+              memcpy(&th,&p_pkt[14],20);
+              ip_pl= (((unsigned char *)&th.w1)[2]<<8) | ((unsigned char *)&th.w1)[3];
+              if ((ip_pl+14)<60)
+              {
+                len-= (60-(ip_pl+14));
+                stats[coreid].rx_min+=1;
+              }
+              Pktlib_setPacketLen(tip,len);
+              if (route_pkt(our_router, tip, &th, p_pkt, &len,&sec_data,&out_port)<0)
+              {
+                stats[coreid].n_bad+=1;
+                Pktlib_freePacket(tip);
+              }
+              else
+              {
+                 send_it(tip,len,sec_data,out_port);
+              }
+              break;
+           case(NETAPI_NETCP_MATCH_GENERIC_IP):
+              Pktlib_freePacket(tip); 
+              stats[coreid].n_new=1;
+              break;
+           default:
+              stats[coreid].n_new+=1;
+              Pktlib_freePacket(tip);
+              break;
+       }
+}
+t2=hplib_mUtilGetPmuCCNT();
+ct2 =Osal_cache_op_measure(&n_c_ops);
+stats[coreid].app_cycles +=  (unsigned long long) (t2-t1);
+stats[coreid].tx_cache_cycles += (unsigned long long) (ct2-ct1);
+return;
+}
+
+/* STUB functions required for compilation */
+void recv_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+}
+
+void recv_sb_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+}
+
diff --git a/ti/runtime/netapi/test/net_test_sa_utils.c b/ti/runtime/netapi/test/net_test_sa_utils.c
new file mode 100755
index 0000000..cdb87a1
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_sa_utils.c
@@ -0,0 +1,831 @@
+/******************************************
+ * File: net_test_sa_utils.c
+ * Purpose: net_test application security associations utilities
+ **************************************************************
+ * FILE:  net_test_sa_utils.c
+ * 
+ * DESCRIPTION:  net_test application security associations utilities
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include "net_test.h"
+#include "ti/runtime/netapi/netapi.h"
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+
+#include <signal.h>
+#include <pthread.h>
+
+#include <ti/drv/sa/salld.h>
+#include <ti/drv/pa/pa.h>
+
+extern NETAPI_T netapi_handle;
+extern netTestConfig_t netTestCfg;
+extern netTestConfig_t config;
+extern netTestSA_t sa_info[];
+extern NETCP_CFG_IPSEC_POLICY_T rx_policy[];
+
+/* pktio channels externs */
+extern PKTIO_HANDLE_T *netcp_rx_chan;
+extern PKTIO_HANDLE_T *netcp_rx_chan2;
+extern PKTIO_HANDLE_T *netcp_tx_chan;
+extern PKTIO_HANDLE_T *netcp_tx_chan_ah;
+extern PKTIO_HANDLE_T *netcp_sb_tx_chan;
+extern PKTIO_HANDLE_T *netcp_sb_rx_chan;
+extern PKTIO_CFG_T our_chan_cfg;
+extern PKTIO_CFG_T netcp_rx_cfg;
+extern PKTIO_CFG_T netcp_rx_cfg2;
+extern PKTIO_CFG_T netcp_tx_cfg;
+extern PKTIO_CFG_T netcp_sb_rx_cfg;
+extern PKTIO_CFG_T netcp_sb_tx_cfg;
+/* end pktio channels externs */
+
+extern Trie *p_trie_sa_rx;
+extern Trie *p_trie_sa_tx;
+
+
+
+void  netTest_utilBuildSADB(int i)
+{
+    long tmp_spi;
+    long tmp_tunnel;
+    if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_HMAC_SHA1) &&
+        (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_AES_CBC))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+        
+        sa_info[i].tx_payload_info.encOffset = netTest_MAC_HEADER_LEN +
+                                               netTest_IP_HEADER_LEN +
+                                               netTest_ESP_HEADER_LEN +
+                                               netTest_AES_CBC_IV_LEN;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_ICV_LEN;
+
+        sa_info[i].iv_len=16;
+        sa_info[i].bl=16;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0; 
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID ;
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+            trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_NULL) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_AES_CTR))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset = netTest_MAC_HEADER_LEN +
+                                               netTest_IP_HEADER_LEN +
+                                               netTest_ESP_HEADER_LEN +
+                                               netTest_AES_CTR_IV_LEN;
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = 0;
+        sa_info[i].iv_len=8;
+        sa_info[i].bl=8;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+
+        sa_info[i].key_params = &netTestCfg.key_params[i];
+
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_HMAC_SHA2_256) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_AES_CTR))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset = netTest_MAC_HEADER_LEN +
+                                               netTest_IP_HEADER_LEN +
+                                               netTest_ESP_HEADER_LEN +
+                                               netTest_AES_CTR_IV_LEN;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_ICV_LEN;
+        sa_info[i].iv_len=8;
+        sa_info[i].bl=8;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+
+        sa_info[i].key_params = &netTestCfg.key_params[i];
+
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_HMAC_SHA2_256) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_3DES_CBC))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset = netTest_MAC_HEADER_LEN +
+                                               netTest_IP_HEADER_LEN +
+                                               netTest_ESP_HEADER_LEN +
+                                               netTest_3DES_CBC_IV_LEN;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_ICV_LEN;
+
+        sa_info[i].iv_len=8;
+        sa_info[i].bl=8;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID ;
+
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_HMAC_MD5) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_NULL))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_NULL_ESP_HEADER_LEN +
+                                                       netTest_NULL_IV_LEN +
+                                                       24;
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=4;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_ICV_LEN;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_AH_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_NULL) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_AES_GCM))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_ESP_HEADER_LEN +
+                                                       netTest_AES_GCM_IV_LEN;
+
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=4;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_AES_GCM_CCM_ICV_LEN;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_NULL) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_NULL))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+         sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_ESP_HEADER_LEN;
+
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=0;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = 0;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_NULL) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_AES_CCM))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_ESP_HEADER_LEN +
+                                                       netTest_AES_CCM_IV_LEN;
+
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=4;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_AES_GCM_CCM_ICV_LEN;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+        
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_AES_XCBC) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_NULL))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_ESP_HEADER_LEN +
+                                                       netTest_NULL_IV_LEN;
+
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=4;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        //sa_info[i].tx_payload_info.ploadLen = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_ICV_LEN;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM|
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+        
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+    else if ((netTestCfg.sa[i].authMode== NWAL_SA_AALG_GMAC) &&
+             (netTestCfg.sa[i].cipherMode == NWAL_SA_EALG_NULL))
+    {
+        /* static configuration, will not change */
+        sa_info[i].tx_payload_info.aadSize = 0;
+        sa_info[i].tx_payload_info.pAad = NULL;
+        sa_info[i].tx_payload_info.pAuthIV = NULL;
+        sa_info[i].tx_payload_info.authOffset = netTest_MAC_HEADER_LEN +
+                                                netTest_IP_HEADER_LEN;
+
+        sa_info[i].tx_payload_info.encOffset =         netTest_MAC_HEADER_LEN +
+                                                       netTest_IP_HEADER_LEN +
+                                                       netTest_ESP_HEADER_LEN +
+                                                       netTest_AES_GMAC_IV_LEN;
+
+        sa_info[i].iv_len=0;
+        sa_info[i].bl=4;
+
+        /* dynamic configuration, will  be calculated on the fly */
+        sa_info[i].tx_payload_info.authSize = 0;
+        sa_info[i].tx_payload_info.encSize = 0;
+        sa_info[i].tx_payload_info.pEncIV = 0;
+        sa_info[i].tx_payload_info.pAuthIV = 0;
+
+        sa_info[i].cipherMode = netTestCfg.sa[i].cipherMode;
+        sa_info[i].authMode = netTestCfg.sa[i].authMode;
+        sa_info[i].inner_ip_offset = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].auth_tag_size = netTest_AES_GMAC_ICV_LEN;
+
+        sa_info[i].tx_pkt_info.enetPort = 0;
+        sa_info[i].tx_pkt_info.ipOffBytes = sa_info[i].tx_payload_info.encOffset;
+        sa_info[i].tx_pkt_info.l4HdrLen = netTest_UDP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.l4OffBytes = sa_info[i].inner_ip_offset + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.startOffset = 0;
+        sa_info[i].tx_pkt_info.lpbackPass = 0;
+        sa_info[i].tx_pkt_info.ploadLen = 0;
+        sa_info[i].tx_pkt_info.pPkt = NULL;
+        sa_info[i].tx_pkt_info.saOffBytes = netTest_MAC_HEADER_LEN  + netTest_IP_HEADER_LEN;
+        sa_info[i].tx_pkt_info.saPayloadLen = 0;
+        sa_info[i].tx_pkt_info.pseudoHdrChecksum =0;
+       
+        sa_info[i].tx_pkt_info.txFlag1 = NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO |
+                                         NWAL_TX_FLAG1_DO_UDP_CHKSUM |
+                                         NWAL_TX_FLAG1_META_DATA_VALID;
+        
+        sa_info[i].dir =netTestCfg.sa[i].dir;
+        tmp_spi = netTest_utilHtonl((long)(netTestCfg.sa[i].spi));
+        tmp_tunnel = netTest_utilHtonl((long)(netTestCfg.tunnel_id[i]));
+        sa_info[i].spi =tmp_spi;
+        sa_info[i].tunnel_id = tmp_tunnel;
+        sa_info[i].src = *((long *)&netTestCfg.sa[i].src.ipv4[0]);
+        sa_info[i].dst = *((long *)&netTestCfg.sa[i].dst.ipv4[0]);
+        if (netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+           trie_insert(p_trie_sa_rx,(char *)&tmp_spi,4, (void *) &sa_info[i]);
+        }
+        else
+        {
+           trie_insert(p_trie_sa_tx,(char *)&tmp_tunnel,4, (void *) &sa_info[i]);
+        }
+    }
+
+}
+NETCP_CFG_ROUTE_T routeInfo;
+PKTIO_HANDLE_T *pPktioHandle;
+
+int netTest_utilCreateDefaultFlow(NETAPI_T handle, int masterType)
+{
+    int err = 0;
+    PKTIO_CFG_T pktio_cfg;
+    Qmss_QueueHnd   qHandle;
+
+    memset(&pktio_cfg, 0, sizeof (PKTIO_CFG_T));
+    memset(&routeInfo, 0, sizeof (NETCP_CFG_ROUTE_T));
+
+    pktio_cfg.flags1 = PKTIO_RX | PKTIO_GLOBAL;
+    pktio_cfg.flags2 = PKTIO_PKT;
+
+    if (nwal_CreateGenPurposeQueue (&qHandle) == nwal_OK)
+    {
+        pktio_cfg.qnum = qHandle ;
+        pktio_cfg.max_n = 8;
+    }
+    else
+    {
+        return -1;
+    }
+
+    if(masterType == NETAPI_PROC_MASTER)
+    {
+        pPktioHandle = netapi_pktioCreate(handle,
+                                               "procMaster",
+                                               (PKTIO_CB)recv_cb,
+                                               &pktio_cfg,
+                                               &err);
+    }
+    else if(masterType == NETAPI_SYS_MASTER)
+    {
+        pPktioHandle = netapi_pktioCreate(handle,
+                                               "sysMaster",
+                                               (PKTIO_CB)recv_cb,
+                                               &pktio_cfg,
+                                               &err);
+    }
+    else;
+
+    if (!pPktioHandle)
+    {
+        return -1;
+    }
+    routeInfo.p_dest_q = pPktioHandle;
+    
+    routeInfo.p_flow = (NETCP_CFG_FLOW_T*)NETCP_DEFAULT_FLOW;
+    routeInfo.valid_params = NETCP_CFG_VALID_PARAM_ROUTE_TYPE;
+
+    return 0;
+}
+int netTest_utilCreateSecAssoc(void)
+{
+    nwal_RetValue       nwalRetVal;
+    int err = 0;
+    int i;
+    nwalSaIpSecId_t  nwalSaIpSecId;
+    uint32_t saId;
+    for (i=0; i < netTestCfg.num_sa;i++)
+    {
+        err = 0;
+        if(netTestCfg.sa[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+            netTest_utilBuildSADB(i);
+            saId = i;
+            sa_info[i].rx_tunnel = netapi_secAddSA(
+            netapi_handle,
+            netTestCfg.ipsec_if_no, //iface #0 
+            &netTestCfg.sa[i],
+            &netTestCfg.key_params[i],
+            netTestCfg.ipsec_mode_rx == IPSEC_MODE_RX_SIDEBAND ? NETAPI_SEC_SA_SIDEBAND: NETAPI_SEC_SA_INFLOW,
+            (NETCP_CFG_ROUTE_HANDLE_T)&routeInfo,
+            &(sa_info[i].rx_data_mode_handle),
+            &(sa_info[i].rx_inflow_mode_handle),
+            (void*) saId,
+            &err);
+            if (err)
+            {
+                exit(1);
+            }
+
+
+            if (netTestCfg.ipsec_mode_rx == IPSEC_MODE_RX_INFLOW)
+            {
+                //assume inner and outer ip is the same
+                rx_policy[i]= netapi_secAddRxPolicy( netapi_handle,
+                             sa_info[i].rx_tunnel,  //link to tunnel above
+                             4,         //ipv4
+                             &netTestCfg.sa[i].src,
+                             &netTestCfg.sa[i].dst,
+                            NULL,  // no qualifiers
+                            (NETCP_CFG_ROUTE_HANDLE_T)&routeInfo,
+                            NULL, //user_data
+                             &err);
+                if (err)
+                {
+                    exit(1);
+                }
+            }
+            else
+            {
+                rx_policy[i] = 0;
+            }
+        }
+        //tx SA security stuff
+        if(netTestCfg.sa[i].dir == NWAL_SA_DIR_OUTBOUND)
+        {
+            netTest_utilBuildSADB(i);
+            saId = i;
+            sa_info[i].tx_tunnel = netapi_secAddSA( netapi_handle,
+                 0, //iface #0 
+                 &netTestCfg.sa[i],
+                 &netTestCfg.key_params[i],
+                netTestCfg.ipsec_mode_tx == IPSEC_MODE_TX_SIDEBAND ? NETAPI_SEC_SA_SIDEBAND: NETAPI_SEC_SA_INFLOW,
+                NULL,  //use default route 
+                &(sa_info[i].tx_data_mode_handle),
+                &(sa_info[i].tx_inflow_mode_handle),
+                (void*)saId,
+                &err);
+            if (err) {exit(1);}
+        }
+    }
+    return err;
+}
+
+
+void netTest_utilDeleteSecAssoc()
+{
+    int err,i;
+    for (i=0; i < netTestCfg.num_sa;i++)
+    {
+        err = 0;
+        if(sa_info[i].dir == NWAL_SA_DIR_INBOUND)
+        {
+            if (rx_policy[i])
+                netapi_secDelRxPolicy(netapi_handle, rx_policy[i], &err);
+                //delete tunnels
+            netapi_secDelSA(netapi_handle, 0, sa_info[i].rx_tunnel, &err);
+        }
+        
+        if(sa_info[i].dir == NWAL_SA_DIR_OUTBOUND)
+        {
+            netapi_secDelSA(netapi_handle, 0, sa_info[i].tx_tunnel, &err);
+        }
+    }
+}
diff --git a/ti/runtime/netapi/test/net_test_sa_utils.h b/ti/runtime/netapi/test/net_test_sa_utils.h
new file mode 100755
index 0000000..dffc7d2
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_sa_utils.h
@@ -0,0 +1,73 @@
+#ifndef __NET_TEST_SA_UTILS_H__
+#define __NET_TEST_SA_UTILS_H__
+
+//#include "net_test.h"
+//#include "net_test_utils.h"
+//#include "net_test_thread_utils.h"
+#include "ti/runtime/netapi/netapi.h"
+
+#define netTest_MAC_HEADER_LEN          14
+#define netTest_IP_HEADER_LEN           20
+#define netTest_UDP_HEADER_LEN          8
+#define netTest_ESP_HEADER_LEN          8
+#define netTest_AES_CBC_IV_LEN          16
+#define netTest_AES_CTR_IV_LEN   8
+#define netTest_3DES_CBC_IV_LEN         8
+#define netTest_AES_GCM_IV_LEN          8
+#define netTest_AES_CCM_IV_LEN          8
+#define netTest_AES_GMAC_IV_LEN          8
+#define netTest_NULL_IV_LEN             0
+#define netTest_ICV_LEN                 12
+#define netTest_HMAC_SHA256_RFC_4868_ICV_LEN 16
+#define netTest_AES_GCM_CCM_ICV_LEN     16
+#define netTest_AES_GMAC_ICV_LEN     16
+
+#define netTest_IPSEC_AH_PKT    1
+#define netTest_IPSEC_ESP_PKT   2
+
+
+#define netTest_IPSEC_AH_FIXED_HDR_SIZE 12
+
+
+#define netTest_NULL_ESP_HEADER_LEN 0
+
+typedef struct {
+    nwalDmTxPayloadInfo_t       tx_payload_info;
+    uint8_t                     inner_ip_offset;
+    NETCP_CFG_SA_T              rx_tunnel;
+    void*                       rx_data_mode_handle;
+    void*                       rx_inflow_mode_handle;
+    NETCP_CFG_SA_T              tx_tunnel;
+    void*                       tx_data_mode_handle;
+    void*                       tx_inflow_mode_handle;
+    uint8_t                     enc_key_length;
+    uint8_t                     auth_tag_size;
+    nwalTxPktInfo_t             tx_pkt_info;
+    nwal_saEALG                 cipherMode;
+    nwal_saAALG                 authMode;
+    /*stuff for routing use case */
+    unsigned int                src;  //BE
+    unsigned int                dst;  //BE
+    unsigned int                spi;  //BE
+    unsigned int                seq;  //BE
+    int                         iv_len; //iv len (size of iv in pkt)
+    int                         bl; //block len (for padding calc)
+
+   /* Save NETCP CMD details during create time */
+    nwalTxDmPSCmdInfo_t         rx_dmPSCmdInfo;
+    nwalTxDmPSCmdInfo_t         tx_dmPSCmdInfo;
+    nwalTxPSCmdInfo_t           tx_psCmdInfo;
+    uint32_t                    swInfo0;
+    uint32_t                    swInfo1;
+
+    uint32_t                    dir;
+    uint32_t                    tunnel_id;
+    nwalSecKeyParams_t*         key_params;
+} netTestSA_t;
+
+void  netTest_utilBuildSADB(int i);
+int netTest_utilCreateSecAssoc(void);
+
+void netTest_utilDeleteSecAssoc(void);
+
+#endif
diff --git a/ti/runtime/netapi/test/net_test_thread_utils.c b/ti/runtime/netapi/test/net_test_thread_utils.c
new file mode 100755
index 0000000..4b412c2
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_thread_utils.c
@@ -0,0 +1,109 @@
+/******************************************
+ * File: net_test_thread_utils.c
+ * Purpose: net_test application thread utilities
+ **************************************************************
+ * FILE:  net_test_thread_utils.c
+ * 
+ * DESCRIPTION:  net_test application thread utilities
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include "net_test.h"
+#include <signal.h>
+#include <pthread.h>
+#include "router.h"
+#include "net_test_thread_utils.h"
+extern netTestConfig_t netTestCfg;
+
+
+/* Global definitions */
+pthread_t *sp_threads;
+pthread_t *fp_threads;
+
+void netTest_utilCreateSpFpThreads(uint8_t num_sp_threads,NET_TEST_FUNC_PTR slow_path_thread,
+                                   uint8_t num_fp_threads, NET_TEST_FUNC_PTR fast_path_thread)
+{
+    int i;
+
+    sp_threads = malloc( sizeof( pthread_t ) * num_sp_threads );
+    if (sp_threads == NULL)
+    {
+        perror( "malloc" );
+        exit(1);
+    }
+
+    for (i = 0; i < num_sp_threads; i++)
+    {
+        if (pthread_create( &sp_threads[i], NULL, (void*)slow_path_thread,
+                    (void *) i))
+        {
+            perror( "pthread_create" );
+            exit(1);
+        }
+    }
+    fp_threads = malloc( sizeof( pthread_t ) * num_fp_threads);
+    if (fp_threads == NULL)
+    {
+        perror( "malloc" );
+        exit(1);
+    }
+    for (i = 0; i < num_fp_threads; i++)
+    {
+        if (pthread_create( &fp_threads[i], NULL, (void*)fast_path_thread,
+                    (void *) i))
+        {
+            perror( "pthread_create" );
+            exit(1);
+        }
+    }
+}
+void netTest_utilRemoveSpFpThreads(uint8_t num_sp_threads, uint8_t num_fp_threads)
+{
+    int i;
+    //wait for completion 
+    netapi_Log("net_test loopback main task now pending on slow/fast path completion\n");
+    for (i = 0; i < num_sp_threads; i++)
+    {
+        pthread_join( sp_threads[i], NULL );
+        printf("Slow Path thread %d has exited\n", i);
+    }
+    for (i = 0; i < num_fp_threads; i++)
+    {
+        pthread_join( fp_threads[i], NULL );
+        printf("Fast Path thread %d has exited\n", i);
+    }
+    free( sp_threads);
+    free (fp_threads);
+}
diff --git a/ti/runtime/netapi/test/net_test_thread_utils.h b/ti/runtime/netapi/test/net_test_thread_utils.h
new file mode 100755
index 0000000..242591c
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_thread_utils.h
@@ -0,0 +1,21 @@
+#ifndef __NET_TEST_UTILS_H__
+#define __NET_TEST_UTILS_H__
+
+
+#include "net_test.h"
+
+
+typedef void (*NET_TEST_FUNC_PTR)(int thread_num);
+
+
+void netTest_utilCreateSpFpThreads(uint8_t num_sp_threads,
+                                   NET_TEST_FUNC_PTR slow_path_thread,
+                                   uint8_t num_fp_threads,
+                                   NET_TEST_FUNC_PTR fast_path_thread);
+
+
+void netTest_utilRemoveSpFpThreads(uint8_t num_sp_threads,
+                                   uint8_t num_fp_threads);
+
+
+#endif
diff --git a/ti/runtime/netapi/test/net_test_utils.c b/ti/runtime/netapi/test/net_test_utils.c
new file mode 100755
index 0000000..c9fe429
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_utils.c
@@ -0,0 +1,1401 @@
+/******************************************
+ * File: net_test_utils.c
+ * Purpose: net_test application general utilities
+ **************************************************************
+ * FILE:  net_test_utils.c
+ * 
+ * DESCRIPTION:  net_test application general utilities
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include "net_test_utils.h"
+#include <signal.h>
+#include <pthread.h>
+#include "router.h"
+
+#include "ti/drv/nwal/test/fw_rm.h"
+#include <ti/drv/sa/salld.h>
+#include <ti/drv/pa/pa.h>
+
+extern NETAPI_T netapi_handle;
+extern netTestConfig_t netTestCfg;
+extern netTestConfig_t config;
+extern netTestSA_t sa_info[];
+extern NETAPI_SCHED_HANDLE_T * scheduler[];
+extern Pktlib_HeapHandle ourHeap;
+extern NETCP_CFG_IP_T ip_rule[];
+extern NETCP_CFG_MACIF_T mac[];
+
+
+
+netTestStats_T stats[NET_TEST_MAX_SP_THREAD + NET_TEST_MAX_FP_THREAD +1];
+paSysStats_t netcp_stats;
+
+
+
+static LastPktInfo_t lpInfo;
+int netTest_utilCheckHeader(netTestHead_T * p_head, PKTIO_METADATA_T * p_meta)
+{
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+#else
+    int coreid=0;
+#endif
+    if (NWAL_RX_FLAG1_META_DATA_VALID & p_meta->u.rx_meta->rxFlag1)
+    {
+        lpInfo.iface = ((unsigned int)p_meta->u.rx_meta->appId) &0xff; //last byte is interface num
+        lpInfo.ipcsum =(p_meta->u.rx_meta->rxFlag1 & NWAL_RX_FLAG1_IPV4_CHKSUM_VERIFY_MASK )== NWAL_RX_FLAG1_IPV4_CHKSUM_VERIFY_ACK ? 1 : 0;
+        lpInfo.l4csum = (p_meta->u.rx_meta->rxFlag1 & NWAL_RX_FLAG1_L4_CHKSUM_VERIFY_MASK )== ((NWAL_RX_FLAG1_L4_CHKSUM_VERIFY_ACK) << NWAL_RX_FLAG1_L4_CHKSUM_VERIFY_SHIFT) ? 1 : 0; 
+        if ((unsigned int)p_meta->u.rx_meta->appId & NETAPI_NETCP_MATCH_IPSEC)
+        {
+        stats[coreid].sec_rx++;
+        }
+        if ((unsigned int)p_meta->u.rx_meta->appId & NETAPI_NETCP_MATCH_IPSEC_POLICY)
+        {
+        stats[coreid].secp_rx++;
+        }
+
+        if ((unsigned int)p_meta->u.rx_meta->appId & NETAPI_NETCP_MATCH_CLASS)
+        {
+            int c= ((unsigned int)p_meta->u.rx_meta->appId >>8)&0xffff;
+        if (c==0)  stats[coreid].n_class0_rx +=1;
+        else if (c==1) stats[coreid].n_class1_rx +=1;
+        else if (c==2) stats[coreid].n_class2_rx +=1;
+        else netapi_Log("**NET_TEST RX -unknown class: %x\n",  p_meta->u.rx_meta->appId);
+    }
+}
+
+ return 1;
+}
+
+
+static int scnt=0;
+int QUIT;
+void netTest_utilMySig(int x)
+{
+    QUIT=1;
+    scnt+=1;
+    printf(">net_test: recv'd signal %d cnt=%d\n",x,scnt);
+    if (scnt > 10)
+    {
+        printf(">net_test: WARNING EXITING WITH PROPER SHUTDOWN, LUTS LEFT ACTIVE\n");
+        exit(1);
+    }
+}
+unsigned long netTest_utilPeek(unsigned long * p)
+{
+    return *p;
+}
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+    printf("--------dump of descriptor %d %x\n", n, (int) p);
+    printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+    printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+    printf("-----------------------------\n");
+}
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r)
+{
+    printf("--------dump of header %d %x appID=%x flag1=%x\n", n, (int) p,a,r);
+    printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+    printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+    printf("> %x %x %x %x %x %x %x %x\n",p[16],p[17],p[18],p[19],p[20],p[21],p[22],p[23]);
+    printf("> %x %x %x %x %x %x %x %x\n",p[24],p[25],p[26],p[27],p[28],p[29],p[30],p[31]);
+    printf("-----------------------------\n");
+}
+
+void   netTest_utilDumpBuffer
+(
+    unsigned long *                      buf,
+    uint32_t                      buf_length
+)
+{
+    uint8_t                       count = 0;
+    uint16_t                      dump_size;
+    uint8_t*                     tmp_buf;
+    uint8_t                       row_count;
+    static uint8_t                first = 0;
+
+    //if(first > 2) return;
+
+    //first++;
+
+    dump_size = buf_length ;
+
+    tmp_buf = (uint8_t *)(buf);
+
+    printf("netapi *:  - 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("netapi *:%02d : %02x    %02x    %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2],tmp_buf[3]);
+                break;
+            }
+            case 3:
+            {
+                printf("netapi *: %02d : %02x    %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1],tmp_buf[2]);
+                break;
+            }
+
+            case 2:
+            {
+                printf("netapi *: %02d : %02x    %02x \n",
+                      count,tmp_buf[0],tmp_buf[1]);
+                break;
+            }
+
+            case 1:
+            {
+                printf("netapi *: %02d : %02x \n",
+                      count,tmp_buf[0]);
+                break;
+            }
+
+        }
+
+        tmp_buf = tmp_buf + row_count;
+        count = count +  row_count;
+
+    }while(count < dump_size);
+
+    printf("netapi *:  - Byte hex Dump End \n");
+
+}
+long netTest_utilHtonl(long x)
+{
+    long temp = (x&0xff000000)>>24 | (x&0xff0000)>>8 | (x&0xff00)<<8 |  (x&0xff)<<24 ;
+    return temp;
+}
+
+unsigned char netTest_utilHex2Dec(char *p_s)
+{
+    int val;
+    sscanf(p_s,"%x",&val); 
+    return val&0xff;
+}
+
+/********************************************************************
+ *  FUNCTION PURPOSE: Ones complement addition utility
+ ********************************************************************
+ ********************************************************************/
+uint16_t netTest_utilOnesComplementAdd (uint16_t v1, uint16_t v2)
+{
+  uint32_t result;
+
+  result = (uint32_t)v1 + (uint32_t)v2;
+  result = (result >> 16) + (result & 0xffff);
+  result = (result >> 16) + (result & 0xffff);
+
+  return ((uint16_t)result);
+}
+
+/********************************************************************
+ *  FUNCTION PURPOSE: Ones complement checksum utility
+ ********************************************************************
+ ********************************************************************/
+ uint16_t netTest_utilOnesCompChkSum  (uint8_t *p, uint32_t nwords)
+{
+  uint16_t chksum = 0;
+  uint16_t v;
+  uint32_t i;
+  uint32_t j;
+
+  for (i = j = 0; i < nwords; i++, j+=2)  {
+    v = (p[j] << 8) | p[j+1];
+    chksum = netTest_utilOnesComplementAdd (chksum, v);
+  }
+  return (chksum);
+} /* utilOnesCompChkSum */
+
+/**************************************************************************************
+ * FUNCTION PURPOSE: Compute ipv4 psudo checksum
+ **************************************************************************************
+ * DESCRIPTION: Compute ipv4 psudo checksum
+ **************************************************************************************/
+uint16_t netTest_utilGetIPv4PsudoChkSum (uint8_t *data, uint16_t payloadLen)
+{
+  uint16_t psudo_chksum;
+
+  psudo_chksum = netTest_utilOnesCompChkSum (&data[12], 4);
+  psudo_chksum = netTest_utilOnesComplementAdd(psudo_chksum, (uint16_t) data[9]);
+  psudo_chksum = netTest_utilOnesComplementAdd(psudo_chksum, payloadLen);
+
+  return (psudo_chksum);
+
+} /* utilGetIpv4PsudoChkSum */
+
+#define CHECK_SET_PARAM(ARG1, ARG2)     \
+    do { \
+        if(strcmp(key, ARG1) == 0) { \
+        if(d1)strncpy(ARG2,d1,netTest_CONFIG_STRING_LEN); \
+        continue; \
+        } \
+    } while(0)
+
+#define CHECK_SET_PARAM2(ARG1, ARG2,  ARG3)     \
+    do { \
+        if(strcmp(key, ARG1) == 0) { \
+        if(d1) strncpy(ARG2,d1,netTest_CONFIG_STRING_LEN); \
+        if(d2) strncpy(ARG3,d2,netTest_CONFIG_STRING_LEN); \
+        continue; \
+        } \
+    } while(0)
+
+#define CHECK_SET_PARAM_SA(ARG1, ARG2, ARG3, ARG4, ARG5, \
+                                                   ARG6, ARG7, ARG8,  ARG9, ARG10, \
+                                                   ARG11, ARG12,ARG13, ARG14, ARG15, ARG16,ARG17, ARG18)     \
+    do { \
+        if(strcmp(key, ARG1) == 0) { \
+        if(d1) strncpy(ARG2,d1,netTest_CONFIG_STRING_LEN); \
+        if(d2) strncpy(ARG3,d2,netTest_CONFIG_STRING_LEN); \
+        if(d3) strncpy(ARG4,d3,netTest_CONFIG_STRING_LEN); \
+        if(d4) strncpy(ARG5,d4,netTest_CONFIG_STRING_LEN); \
+        if(d5) strncpy(ARG6, d5,netTest_CONFIG_STRING_LEN); \
+        if(d6) strncpy(ARG7,d6,netTest_CONFIG_STRING_LEN); \
+        if(d7) strncpy(ARG8,d7,netTest_CONFIG_STRING_LEN); \
+        if(d8) strncpy(ARG9,d8,netTest_CONFIG_STRING_LEN); \
+        if(d9) strncpy(ARG10,d9,netTest_CONFIG_STRING_LEN); \
+        if(d10) strncpy(ARG11,d10,netTest_CONFIG_STRING_LEN); \
+        if(d11) strncpy(ARG12,d11,netTest_CONFIG_STRING_LEN); \
+        if(d12) strncpy(ARG13,d12,netTest_CONFIG_STRING_LEN); \
+        if(d13) strncpy(ARG14,d13,netTest_CONFIG_STRING_LEN); \
+        if(d14) strncpy(ARG15,d14,netTest_CONFIG_STRING_LEN); \
+        if(d15) strncpy(ARG16,d15,netTest_CONFIG_STRING_LEN); \
+        if(d16) strncpy(ARG17,d16,netTest_CONFIG_STRING_LEN); \
+        if(d17) strncpy(ARG18,d17,netTest_CONFIG_STRING_LEN); \
+        continue; \
+        } \
+    } while(0)
+
+void netTest_utilPrintIPSecStats(Sa_IpsecStats_t     *p_saIpsecStats, nwal_saAALG auth, nwal_saEALG cipher)
+{
+#if 0
+    if(retVal != nwal_OK)
+    {
+        System_System_netapi_Log("CORE: %d Error getting IP Sec Stats: Ret Status: %d \n",
+                       retVal);
+        return(nwal_FALSE);
+    }
+    if((p_saIpsecStats->pktEncHi) ||(p_saIpsecStats->pktEncLo))
+    {
+        Debug_netapi_Log("------------- IPSec TX (Encryption Channel) Stats BEGIN --\n");
+    }
+    else
+    {
+        netapi_Log("------------- IPSec RX (Decryption Channel) Stats BEGIN --\n");
+    }
+#endif
+    printf("\nAutentication mode: %d, Encryption Mode: %d\n", auth, cipher);
+    printf("IPSec replayOld:0x%x,replayDup:0x%x,authFail:0x%x \n",
+                   p_saIpsecStats->replayOld,p_saIpsecStats->replayDup,p_saIpsecStats->authFail);
+    printf("IPSec txESN:0x%x,rxESN:0x%x,pktEncHi:0x%x,pktEncLo:0x%x,pktDecHi:0x%x,pktDecLo:0x%x \n",
+                   p_saIpsecStats->txESN,p_saIpsecStats->rxESN,p_saIpsecStats->pktEncHi,
+                   p_saIpsecStats->pktEncLo,p_saIpsecStats->pktDecHi,p_saIpsecStats->pktDecLo);
+}
+
+void netTest_utilPrintDataModeStats(Sa_DataModeStats_t     *p_saDataModeStats, nwal_saAALG auth, nwal_saEALG cipher)
+{
+
+    printf("\nAutentication mode: %d, Encryption Mode: %d\n", auth, cipher);
+    printf(" Packets processedHi: 0x%x, Packets processed Lo:0x%x\n",
+            p_saDataModeStats->pktHi, p_saDataModeStats->pktLo);
+}
+
+/******************************************************
+ * stats callback
+ *******************************************************/
+void netTest_utilStatsCbMt(NETAPI_T h, paSysStats_t* pPaStats)
+{
+
+#ifdef netTest_MULTI_THREAD
+    int coreid=Osal_nwalGetProcId();  //who we are(thread local)
+    //int coreid = our_core;
+#else
+int coreid=0;
+#endif
+
+  stats[coreid].n_stats_cb +=1;
+  if(pPaStats) memcpy(&netcp_stats,pPaStats, sizeof(paSysStats_t));
+}
+void netTest_utilsStatsCb(NETAPI_T h, paSysStats_t* pPaStats)
+{
+    uint32_t numFreeDataPackets;
+    uint32_t            numZeroBufferPackets;
+    uint32_t            numPacketsinGarbage;
+    Pktlib_HeapStats    pktLibHeapStats;
+    int i,j;
+    unsigned long long bcpp = 0;
+    unsigned long long bcpp_noc = 0;
+    unsigned long long bcpp_app = 0;
+    unsigned long long bcpp_tx = 0;
+    unsigned long long npL = 0;
+    unsigned long long cyclesL = 0;
+    unsigned long long ccyclesL = 0; //cache cycles
+    unsigned long long tmp_npL[TUNE_NETAPI_NUM_CORES];
+    unsigned long long tmp_cyclesL[TUNE_NETAPI_NUM_CORES];
+    unsigned long long tmp_ccyclesL[TUNE_NETAPI_NUM_CORES]; //cache cycles
+    NETAPI_SA_STATS_T netapi_sa_stats;
+
+    uint8_t num_threads =  netTestCfg.num_fp_threads;
+    for (j= 0;j < num_threads;j++)
+    {
+        if (netTestCfg.fp_thread_num[j] == 0)
+            continue;
+        i = netTestCfg.fp_thread_num[j];
+        printf("Per THREAD Statistics for Thread %d\n", netTestCfg.fp_thread_num[j]);;
+        printf(">*****stats @ %lld (#cbs%d) \n", hplib_mUtilGetTimestamp(),stats[i].n_stats_cb);
+        printf(">itx=%d rx=%d tx=%d bad=%d slow=%d \n>rx_class0=%d rx_class1=%d rx_class2=%dsecRx=%d\t"
+            "secPRX=%d sb_rx=%d sb_tx=%d auth_ok=%d sec_tx=%d  min_rx=%d min_tx=%d  fragPkt=%d, exceptionPktOther=%d\n",
+         stats[i].itx, stats[i].rx, stats[i].tx, stats[i].n_bad, stats[i].n_new, 
+         stats[i].n_class0_rx, stats[i].n_class1_rx,  stats[i].n_class2_rx, stats[i].sec_rx,
+         stats[i].secp_rx, stats[i].sb_rx, stats[i].sb_tx, stats[i].n_auth_ok,
+         stats[i].sec_tx, stats[i].rx_min, stats[i].tx_min, stats[i].exceptionPktsFrag, stats[i].exceptionPktsOther);
+        printf(">if rx stats:  %d %d %d\n",stats[i].if_rx[0],stats[i].if_rx[1],stats[i].if_rx[2]);
+        printf(">thread rx stats:  %d \n",stats[i].core_rx);
+
+        if (stats[i].rx && stats[i].tx)
+            printf("decrypt time per packet(avg): %lu, encrypt  time per packet(avg): %lu\n", 
+            (unsigned long) stats[i].total_decrypt_time/stats[i].rx, (unsigned long) stats[i].total_encrypt_time/stats[i].tx);
+
+
+         netapi_schedGetStats(scheduler[i],&tmp_npL[i],&tmp_cyclesL[i],&tmp_ccyclesL[i]);
+        if (tmp_npL[i] && stats[i].rx)
+        {
+            bcpp = tmp_cyclesL[i]/tmp_npL[i];
+            bcpp_noc = bcpp;
+            bcpp_app = (stats[i].app_cycles)/stats[i].rx;
+        }
+        if (stats[i].tx)
+        {
+            bcpp_tx = (stats[i].send_cycles)/stats[i].tx;
+        }
+        else
+        {
+            bcpp_tx = 0L;
+        }
+        printf(">         ++ busy cycles pp=%lld (%lld wo cache ops) (app+tx= %lld) (tx= %lld) ++\n",
+         bcpp,bcpp_noc,bcpp_app, bcpp_tx);
+        printf("\n");
+    }
+
+
+
+if(pPaStats)
+{
+       printf("C1 number of packets:           %d\n", pPaStats->classify1.nPackets);
+       printf("C1 number IPv4 packets:         %d\n", pPaStats->classify1.nIpv4Packets);
+       printf("C1 number IPv6 packets:        %d\n", pPaStats->classify1.nIpv6Packets);
+       printf("C1 number Custom packets:        %d\n", pPaStats->classify1.nCustomPackets);
+       printf("C1 number SRIO packets:        %d\n", pPaStats->classify1.nSrioPackets);
+       printf("C1 number LLC/SNAP Fail packets:        %d\n", pPaStats->classify1.nLlcSnapFail);
+       printf("C1 number table matched:        %d\n", pPaStats->classify1.nTableMatch);
+       printf("C1 number failed table matched: %d\n", pPaStats->classify1.nNoTableMatch);
+       printf("C1 number IP Fragmented packets: %d\n", pPaStats->classify1.nIpFrag);
+       printf("C1 number IP Depth Overflow: %d\n", pPaStats->classify1.nIpDepthOverflow);
+       printf("C1 number VLAN Depth Overflow: %d\n", pPaStats->classify1.nVlanDepthOverflow);
+       printf("C1 number GRE Depth Overflow: %d\n", pPaStats->classify1.nGreDepthOverflow);
+       printf("C1 number MPLS Packets: %d\n", pPaStats->classify1.nMplsPackets);
+       printf ("C1 number of parse fail:        %d\n",pPaStats->classify1.nParseFail);
+       printf("C1 number of Invalid IPv6 Opt:  %d\n", pPaStats->classify1.nInvalidIPv6Opt);
+       printf("C1 number of TX IP Fragments:  %d\n", pPaStats->classify1.nTxIpFrag);
+       printf ("C1 number of silent discard:    %d\n",pPaStats->classify1.nSilentDiscard);
+       printf("C1 number of invalid control:   %d\n", pPaStats->classify1.nInvalidControl);
+       printf ("C1 number of invalid states:    %d\n",pPaStats->classify1.nInvalidState);
+       printf ("C1 number of system fails:      %d\n",pPaStats->classify1.nSystemFail);
+       printf ("C2 number Packets  :           %d\n",pPaStats->classify2.nPackets);
+       printf ("C2 number udp           :      %d\n",pPaStats->classify2.nUdp);
+       printf ("C2 number tcp           :      %d\n",pPaStats->classify2.nTcp);
+       printf ("C2 number Custom       :      %d\n",pPaStats->classify2.nCustom);
+       printf ("C2 number silent drop   :      %d\n",pPaStats->classify2.nSilentDiscard);
+       printf ("C2 number invalid cntrl :      %d\n\n",pPaStats->classify2.nInvalidControl);
+       printf ("C2 number Modify Stats Cmd Fail :      %d\n\n",pPaStats->modify.nCommandFail);
+}
+Pktlib_getHeapStats(ourHeap, &pktLibHeapStats);
+printf("main heap stats>  #free=%d #zb=%d #garbage=%d\n", pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets, pktLibHeapStats.numPacketsinGarbage);
+printf("               >  #dataBufThreshStatus=%d #dataBufStarvCounter=%d #zBufThreshStatus=%d #zBufStarvCounter=%d \n", 
+                        pktLibHeapStats.dataBufferThresholdStatus,pktLibHeapStats.dataBufferStarvationCounter,
+                        pktLibHeapStats.zeroDataBufferThresholdStatus, pktLibHeapStats.zeroDataBufferStarvationCounter);
+
+#if 0
+netapi_Log("pa2sa descriptor area dump\n");
+for(i=0;i<TUNE_NETAPI_CONFIG_MAX_PA_TO_SA_DESC;i++)
+{
+   extern long * pa2sa_descr_base;
+   long * tip= &pa2sa_descr_base[32*i]; 
+   netTest_utilDumpDescr(tip, i);
+}
+netapi_Log("sa2pa descriptor area dump\n");
+for(i=0;i<TUNE_NETAPI_CONFIG_MAX_SA_TO_PA_DESC;i++)
+{
+   extern long * sa2pa_descr_base;
+   long * tip= &sa2pa_descr_base[32*i]; 
+   netTest_utilDumpDescr(tip, i);
+}
+#endif
+    for (i = 0; i < netTestCfg.num_sa; i++)
+    {
+        /* Statistics for RX Tunnel */
+        memset(&netapi_sa_stats, 0, sizeof(netapi_sa_stats));
+        if (netTestCfg.sa[i].dir ==NWAL_SA_DIR_INBOUND )
+        {
+            netapi_getSaStats(netapi_handle, sa_info[i].rx_tunnel, &netapi_sa_stats);
+            if (netapi_sa_stats.validParams & NETAPI_IPSEC_STAT_VALID)
+            {
+                netTest_utilPrintIPSecStats(&(netapi_sa_stats.saIpsecStats), 
+                                 netTestCfg.sa[i].authMode,
+                                 netTestCfg.sa[i].cipherMode);
+            }
+            if (netapi_sa_stats.validParams & NETAPI_SIDEBAND_DATA_MODE_STAT_VALID)
+            {
+                netTest_utilPrintDataModeStats(&(netapi_sa_stats.dataModeStats),
+                                   netTestCfg.sa[i].authMode,
+                                   netTestCfg.sa[i].cipherMode);
+            }
+        }
+        else if (netTestCfg.sa[i].dir ==NWAL_SA_DIR_OUTBOUND)
+        {
+            netapi_getSaStats(netapi_handle, sa_info[i].tx_tunnel, &netapi_sa_stats);
+            if (netapi_sa_stats.validParams & NETAPI_IPSEC_STAT_VALID)
+            {
+                 netTest_utilPrintIPSecStats(&(netapi_sa_stats.saIpsecStats), 
+                                   netTestCfg.sa[i].authMode,
+                                   netTestCfg.sa[i].cipherMode);
+            }
+            if (netapi_sa_stats.validParams & NETAPI_SIDEBAND_DATA_MODE_STAT_VALID)
+            {
+                netTest_utilPrintDataModeStats(&(netapi_sa_stats.dataModeStats),
+                                    netTestCfg.sa[i].authMode,
+                                    netTestCfg.sa[i].cipherMode);
+            }
+        }
+        else
+            netapi_Log("netTest_utilsStatsCb: invalid SA direction\n");
+    }
+    netapi_dump_internal_heap_stats();
+}
+
+
+
+
+void parse_dsp_mac(char * p_mac_str)
+{
+    if (strlen(&p_mac_str[0]))
+    {
+        sscanf(p_mac_str,"mac%d",&netTestCfg.dsp_mac);
+    }
+}
+
+void parse_dsp_ip(char * p_ip_str)
+{
+    if (strlen(&p_ip_str[0]))
+    {
+        sscanf(p_ip_str,"ip%d",&netTestCfg.dsp_ip);
+    }
+}
+
+void netTest_utilParseOneKey(char *p_key_str, unsigned char *p_key)
+{
+    int index = 0;
+    int i;
+    if (strlen(&p_key_str[0]))
+    {
+        char * pch = strtok (&p_key_str[0],",");
+
+        while (pch != NULL)
+        {
+            p_key[index] = netTest_utilHex2Dec(pch);
+            index++;
+            pch = strtok (NULL,",");
+        }
+    }
+}
+
+void netTest_utilParseOneIP(char * p_ip_addr_str, unsigned char * p_ip)
+{
+    int index = 0;
+    int i;
+    if (strlen(&p_ip_addr_str[0]))
+    {
+        char * pch = strtok (&p_ip_addr_str[0],".");
+
+        while (pch != NULL)
+        {
+            p_ip[index] = atoi(pch);
+            index++;
+            pch = strtok (NULL,".");
+        }
+    }
+}
+
+void netTest_utilParseOneMac(char * p_mac_str, unsigned char *p_mac)
+{
+    int index = 0;
+    int i;
+    if (strlen(&p_mac_str[0]))
+    {
+        char *pch = strtok (&(p_mac_str[0]),"-");
+
+        while (pch != NULL)
+        {
+            p_mac[index] = netTest_utilHex2Dec(pch);
+            index++;
+            pch = strtok (NULL,"-");
+        }
+    }
+}
+
+void netTest_utilParseMac(netTestConfigFile_t *pConfig)
+{
+    int i;
+    int port = 0;
+    for(i=0;i<NET_TEST_MAX_MAC;i++)
+    {
+        if (strlen(&pConfig->mac[i][0]))
+        {
+            netTestCfg.num_macs++;
+            netTest_utilParseOneMac(&pConfig->mac[i][0],&netTestCfg.mac[i][0]);
+            sscanf(&pConfig->switch_port[i][0],"swp%d",&netTestCfg.switch_port[i]);
+        }
+    }
+    netapi_Log("netTest_utilParseMac: number of mac address %d\n", netTestCfg.num_macs);
+
+}
+void netTest_utilParseIP(netTestConfigFile_t *pConfig)
+{
+    int i;
+
+    for(i=0;i<NET_TEST_MAX_IP;i++)
+    {
+        if (strlen(&pConfig->ip[i][0]))
+        {
+            netTestCfg.num_ips++;
+            netTest_utilParseOneIP(&pConfig->ip[i][0],&netTestCfg.ip[i].ipv4[0]);
+            sscanf(&pConfig->attach_iface[i][0],"mac%d",&netTestCfg.attach_iface[i]);
+        }
+    }
+    netapi_Log("netTest_utilParseIP: number of ip address %d\n", netTestCfg.num_ips);
+}
+void netTest_utilParseIpsecMode(netTestConfigFile_t *pConfig)
+{
+
+    if (strlen(&pConfig->ipsec_mode_rx[0]))
+    {
+        if (strcmp(pConfig->ipsec_mode_rx, "SIDEBAND") == 0)
+        {
+            netTestCfg.ipsec_mode_rx = IPSEC_MODE_RX_SIDEBAND;
+        }
+        else if (strcmp(pConfig->ipsec_mode_rx, "INFLOW") == 0)
+        {
+            netTestCfg.ipsec_mode_rx = IPSEC_MODE_RX_INFLOW;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseIpsecMode(), invalid RX ipsec mode in config file \n");
+        }
+    }
+
+    if (strlen(&pConfig->ipsec_mode_tx[0]))
+    {
+        if (strcmp(pConfig->ipsec_mode_tx, "SIDEBAND") == 0)
+        {
+            netTestCfg.ipsec_mode_tx = IPSEC_MODE_TX_SIDEBAND;
+        }
+        else if (strcmp(pConfig->ipsec_mode_tx, "INFLOW") == 0)
+        {
+            netTestCfg.ipsec_mode_tx = IPSEC_MODE_TX_INFLOW;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseIpsecMode(), invalid TX ipsec mode in config file \n");
+        }
+    }
+
+}
+
+void netTest_utilParseAuthMode(char *auth_mode_str, nwal_saAALG *auth_mode)
+{
+    if (strlen(auth_mode_str))
+    {
+        netapi_Log("strlen of auth_mode_str is %d\n", strlen(auth_mode_str));
+
+        if (strcmp(auth_mode_str, "NULL") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_NULL;
+        }
+        else if (strcmp(auth_mode_str, "HMAC_MD5") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_HMAC_MD5;
+        }
+        else if (strcmp(auth_mode_str, "HMAC_SHA1") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_HMAC_SHA1;
+        }
+        else if (strcmp(auth_mode_str, "HMAC_SHA2_224") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_HMAC_SHA2_224;
+        }
+        else if (strcmp(auth_mode_str, "HMAC_SHA2_256") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_HMAC_SHA2_256;
+        }
+        else if (strcmp(auth_mode_str, "GMAC") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_GMAC;
+        }
+        else if (strcmp(auth_mode_str, "AES_XCBC") == 0)
+        {
+            *auth_mode= NWAL_SA_AALG_AES_XCBC;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseAuthMode: invalid auth mode specified\n");
+        }
+    }
+}
+
+void netTest_utilParseEncryptMode(char *ency_mode_str, nwal_saEALG*encr_mode)
+{
+    if (strlen(ency_mode_str))
+    {
+        if (strcmp(ency_mode_str, "NULL") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_NULL;
+        }
+        else if (strcmp(ency_mode_str, "AES_CTR") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_AES_CTR;
+        }
+        else if (strcmp(ency_mode_str, "AES_CBC") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_AES_CBC;
+        }
+        else if (strcmp(ency_mode_str, "3DES_CBC") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_3DES_CBC;
+        }
+        else if (strcmp(ency_mode_str, "AES_CCM") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_AES_CCM;
+        }
+        else if (strcmp(ency_mode_str, "AES_GCM") == 0)
+        {
+            *encr_mode= NWAL_SA_EALG_AES_GCM;
+        }
+        else if (strcmp(ency_mode_str, "AES_XCBC") == 0)
+        {
+            *encr_mode= NWAL_SA_AALG_AES_XCBC;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseEncryptMode: invalid auth mode specified\n");
+        }
+    }
+}
+
+void netTest_utilParseProto(char *proto_str, nwal_IpSecProto *proto)
+{
+    if (strlen(proto_str))
+    {
+        if (strcmp(proto_str, "ESP") == 0)
+        {
+            *proto= nwal_IpSecProtoESP;
+            netapi_Log("netTest_utilParseProto(): setting proto  to ESP\n");
+        }
+        else if (strcmp(proto_str, "AH") == 0)
+        {
+            *proto = nwal_IpSecProtoAH;
+            netapi_Log("netTest_utilParseProto(): setting proto to AH\n");
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseProto(), invalid RX ipsec mode in config file \n");
+        }
+    }
+}
+
+
+
+void netTest_utilParseSaMode(char *mode_str, nwal_saMode *mode)
+{
+    if (strlen(mode_str))
+    {
+        if (strcmp(mode_str, "TUNNEL") == 0)
+        {
+            *mode= nwal_SA_MODE_TUNNEL;
+        }
+        else if (strcmp(mode_str, "TRANSPORT") == 0)
+        {
+            *mode = nwal_SA_MODE_TRANSPORT;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseSaMode(), invalid RX ipsec mode in config file \n");
+        }
+    }
+}
+
+void netTest_utilParseIPType(char *ip_type_str, nwal_IpType *ipType)
+{
+    if (strlen(ip_type_str))
+    {
+        if (strcmp(ip_type_str, "IPV4") == 0)
+        {
+            *ipType= nwal_IPV4;
+        }
+        else if (strcmp(ip_type_str, "IPV6") == 0)
+        {
+            *ipType = nwal_IPV6;
+        }
+        else
+        {
+            netapi_Log("netTest_utilParseIPType(), invalid RX ipsec mode in config file \n");
+        }
+    }
+}
+
+
+void parse_simple_param_u8(char* input_str, uint8_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint8_t)strtol(input_str, NULL, 0);
+    }
+}
+
+void parse_simple_param_u16(char* input_str, uint16_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint16_t)strtol(input_str, NULL, 0);
+    }
+}
+
+void parse_simple_param_u32(char* input_str, uint32_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint32_t)strtol(input_str, NULL, 0);
+    }
+}
+
+void netTest_utilParseSADir(char* dir_str, nwal_SaDir *dir)
+{
+    if (strlen(dir_str))
+    {
+        if (strcmp(dir_str, "INBOUND") == 0)
+        {
+            *dir= NWAL_SA_DIR_INBOUND;
+        }
+        else if (strcmp(dir_str, "OUTBOUND") == 0)
+        {
+            *dir = NWAL_SA_DIR_OUTBOUND;
+        }
+        else
+            netapi_Log("netTest_utilParseSADir: invalid direction\n");
+    }
+}
+void netTest_utilParseThreadConfig(char * p_thread_str, uint8_t* start, uint8_t* end)
+{
+    int index = 0;
+    int i;
+
+    if (strlen(p_thread_str))
+    {
+        char *pch = strtok (&(p_thread_str[0]),"-");
+        *start = atoi(pch);
+        pch = strtok (NULL,"-");
+        *end = atoi(pch);
+    }
+}
+
+void netTest_utilParseThreadParams(netTestConfigFile_t *pConfig)
+{
+    int i;
+    for(i=0;i<NET_TEST_MAX_FP_THREAD;i++)
+    {
+        if (strlen(&pConfig->fp[i][0]))
+        {
+            netTestCfg.num_fp_threads++;
+            netTest_utilParseThreadConfig(&pConfig->fp[i][0],
+                                         (uint8_t*)&netTestCfg.fp_proc_start[i],
+                                         (uint8_t*)&netTestCfg.fp_proc_end[i]);
+        }
+        if (strlen(&pConfig->fp_thread_num[i][0]))
+        {
+            netTestCfg.fp_thread_num[i] = atoi((char*)(&pConfig->fp_thread_num[i]));
+        }
+    }
+
+    for(i=0;i<NET_TEST_MAX_SP_THREAD;i++)
+    {
+        if (strlen(&pConfig->sp[i][0]))
+        {
+            netTestCfg.num_sp_threads++;
+            netTest_utilParseThreadConfig(&pConfig->sp[i][0],
+                                         (uint8_t*)&netTestCfg.sp_proc_start[i],
+                                         (uint8_t*)&netTestCfg.sp_proc_end[i]);
+        }
+        if (strlen(&pConfig->sp_thread_num[i][0]))
+        {
+            netTestCfg.sp_thread_num[i] = atoi((char*)(&pConfig->sp_thread_num[i]));
+        }
+    }
+}
+void netTest_utilParseSA(netTestConfigFile_t *pConfig)
+{
+    int i;
+    for(i=0;i<MAX_SEC_INDEX;i++)
+    {
+        if (strlen((char*)&pConfig->sa_config[i][0].dir))
+        {
+            netTest_utilParseSADir((char*) &pConfig->sa_config[i][0].dir, &netTestCfg.sa[i].dir);
+            parse_simple_param_u32((char*)&pConfig->sa_config[i][0].spi, &netTestCfg.sa[i].spi);
+            netTest_utilParseProto((char*)&pConfig->sa_config[i][0].proto, &netTestCfg.sa[i].proto);
+            netTest_utilParseSaMode((char*)&pConfig->sa_config[i][0].saMode, &netTestCfg.sa[i].saMode);
+            netTest_utilParseIPType((char*)&pConfig->sa_config[i][0].ipType, &netTestCfg.sa[i].ipType);
+            netTest_utilParseOneIP((char*)&pConfig->sa_config[i][0].src, (unsigned char *)&netTestCfg.sa[i].src);
+            netTest_utilParseOneIP((char*)&pConfig->sa_config[i][0].dst, (unsigned char *)&netTestCfg.sa[i].dst);
+            parse_simple_param_u32((char*)&pConfig->sa_config[i][0].replayWindow, &netTestCfg.sa[i].replayWindow);
+            netTest_utilParseAuthMode((char*)&pConfig->sa_config[i][0].authMode, &netTestCfg.sa[i].authMode);
+            netTest_utilParseEncryptMode((char*)&pConfig->sa_config[i][0].cipherMode, &netTestCfg.sa[i].cipherMode);
+            parse_simple_param_u32((char*)&pConfig->sa_config[i][0].esnLo, &netTestCfg.sa[i].esnLo);
+            parse_simple_param_u32((char*)&pConfig->sa_config[i][0].esnHi, &netTestCfg.sa[i].esnHi);
+            parse_simple_param_u16((char*)&pConfig->sa_config[i][0].encKeySize, &netTestCfg.key_params[i].encKeySize);
+            parse_simple_param_u16((char*)&pConfig->sa_config[i][0].macKeySize, &netTestCfg.key_params[i].macKeySize);
+
+
+            netTest_utilParseOneKey((char*) &pConfig->sa_config[i][0].encr_key, &netTestCfg.encr_key[i][0]);
+            netTestCfg.key_params[i].pEncKey = (uint8_t*)&netTestCfg.encr_key[i][0];
+
+            netTest_utilParseOneKey((char*)&pConfig->sa_config[i][0].auth_key, &netTestCfg.auth_key[i][0]);
+            netTestCfg.key_params[i].pAuthKey= (uint8_t*)&netTestCfg.auth_key[i][0];
+
+
+            parse_simple_param_u32((char*)&pConfig->sa_config[i][0].tunnel_id, &netTestCfg.tunnel_id[i]);
+
+            netTestCfg.num_sa++;
+        }
+    }
+}
+void netTest_utilParseRoutes(netTestConfigFile_t *pConfig, OUR_ROUTE_T *routes, Trie ** our_router)
+{
+    int i;
+    int said=0;
+    for(i=0;i<MAX_ROUTES;i++)
+    {
+        int port;
+        if (pConfig->routes[i][0])
+        {
+            port=atoi(&pConfig->ports[i][0]);
+            if((port<1)||(port>2)) continue; //bad port #: only 1 or 2 valid
+
+            if(strncmp(&pConfig->routes[i][0],"MAC",3)==0)
+            {
+               routes[i].out_port = port;
+               netTest_utilParseOneMac(&pConfig->routes[i][3],&routes[i].out_mac[0]);
+               //memcpy(&routes[i].out_mac[6], ((port==1) ?&config.mac0[0]: &config.mac1[0] ),6); 
+               memcpy(&routes[i].out_mac[6], ((port==1) ?&netTestCfg.mac[0][0]: &netTestCfg.mac[1][0] ),6);
+               routes[i].out_mac[12]=0x08;
+               routes[i].out_mac[13]=0x00;
+               routes[i].sec_ptr=NULL;
+            }
+            else if (strncmp(&pConfig->routes[i][0],"SA",2)==0)
+            {      
+               said=atoi(&pConfig->routes[i][2]) ;
+               routes[i].sec_ptr=&sa_info[said];
+            }
+        }
+    }
+    *our_router = route_init();
+    for (i=0;i<MAX_ROUTES;i++)
+    {
+      unsigned long ip_be;
+      int route_index;
+      if (pConfig->dst_ips[i][0])
+      {
+         netTest_utilParseOneIP(&pConfig->dst_ips[i][0],(unsigned char *)&ip_be);
+         sscanf(&pConfig->paths[i][0],"route%d",&route_index);
+         route_add(*our_router,&ip_be,(void*)&routes[route_index]);
+      }
+    }
+}
+
+void netTest_utilProcessConfigFile(FILE * fpr, netTestConfigFile_t *pConfig)
+{
+    char line[MAX_LINE_LENGTH + 1];
+    int i;
+    static int sa_count = 0;
+ 
+    char *key, *ep;
+    char * d1, *d2, *d3, *d4;
+    char * d5, *d6, *d7, *d8;
+    char * d9, *d10, *d11, *d12;
+    char * d13, *d14, *d15, *d16, *d17;
+    char tokens[] = " :=;\n";
+    char temp_str[TEMP_STR_LEN];
+    memset(line, 0, MAX_LINE_LENGTH + 1);
+    memset(pConfig, 0, sizeof(netTestConfigFile_t));
+    while (fgets(line, MAX_LINE_LENGTH + 1, fpr))
+    {
+        if(line[0]=='#')
+            continue; //skip comment
+        key  = (char *)strtok(line, tokens);
+
+        d1 = (char *)strtok(NULL, tokens);
+        if (!key)
+            continue;
+        if (!d1) 
+            continue;
+
+        if(strlen(d1) == 0) 
+        {
+            continue;
+        }
+
+
+        d2 = (char *)strtok(NULL, tokens);
+        d3 = (char *)strtok(NULL, tokens);
+        d4 = (char *)strtok(NULL, tokens);
+        d5 = (char *)strtok(NULL, tokens);
+        d6 = (char *)strtok(NULL, tokens);
+        d7 = (char *)strtok(NULL, tokens);
+        d8 = (char *)strtok(NULL, tokens);
+        d9 = (char *)strtok(NULL, tokens);
+        d10 = (char *)strtok(NULL, tokens);
+        d11 = (char *)strtok(NULL, tokens);
+        d12 = (char *)strtok(NULL, tokens);
+        d13 = (char *)strtok(NULL, tokens);
+        d14 = (char *)strtok(NULL, tokens);
+        d15 = (char *)strtok(NULL, tokens);
+        d16 = (char *)strtok(NULL, tokens);
+        d17 = (char *)strtok(NULL, tokens);
+
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_IPSEC_MODE_RX,&(pConfig->ipsec_mode_rx[0]));
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_IPSEC_MODE_TX,&(pConfig->ipsec_mode_tx[0]));
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_IPSEC_IF_NO,&(pConfig->ipsec_if_no[0]));
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_DSP_MAC,&(pConfig->dsp_mac[0]));
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_DSP_IP,&(pConfig->dsp_ip[0]));
+        CHECK_SET_PARAM(netTest_INIT_CONFIG_STATIC_LOOPBACK_PORT,&(pConfig->dest_udp_port_config[0]));
+
+
+        for(i=0;i<MAX_SEC_INDEX;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "sa%d",i);
+            CHECK_SET_PARAM_SA(temp_str, 
+                              (char*)&pConfig->sa_config[i][0].dir,
+                              (char*)&pConfig->sa_config[i][0].spi,
+                              (char*)&pConfig->sa_config[i][0].proto,
+                              (char*)&pConfig->sa_config[i][0].saMode,
+                              (char*)&pConfig->sa_config[i][0].ipType,
+                              (char*)&pConfig->sa_config[i][0].src,
+                              (char*)&pConfig->sa_config[i][0].dst,
+                              (char*)&pConfig->sa_config[i][0].replayWindow,
+                              (char*)&pConfig->sa_config[i][0].authMode,
+                              (char*)&pConfig->sa_config[i][0].cipherMode,
+                              (char*)&pConfig->sa_config[i][0].esnLo,
+                              (char*)&pConfig->sa_config[i][0].esnHi,
+                              (char*)&pConfig->sa_config[i][0].encKeySize,
+                              (char*)&pConfig->sa_config[i][0].macKeySize,
+                              (char*)&pConfig->sa_config[i][0].encr_key,
+                              (char*)&pConfig->sa_config[i][0].auth_key,
+                              (char*)&pConfig->sa_config[i][0].tunnel_id);
+        }
+
+        for(i=0;i<MAX_ROUTES;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "route%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->routes[i][0],&pConfig->ports[i][0] );
+        }
+
+        for(i=0;i<MAX_ROUTES;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "dstip%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->dst_ips[i][0],&pConfig->paths[i][0] );
+        }
+        for(i=0;i<NET_TEST_MAX_MAC;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "mac%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->mac[i][0],&pConfig->switch_port[i][0] );
+        }
+        for(i=0;i<NET_TEST_MAX_IP;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "ip%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->ip[i][0], &pConfig->attach_iface[i][0]);
+        }
+        for(i=0;i<NET_TEST_MAX_FP_THREAD;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "fp%d",i);
+            CHECK_SET_PARAM2(temp_str, &pConfig->fp_thread_num[i][0],&pConfig->fp[i][0]);
+        }
+        for(i=0;i<NET_TEST_MAX_SP_THREAD;i++)
+        {
+            snprintf(temp_str, TEMP_STR_LEN-1, "sp%d",i);
+            CHECK_SET_PARAM2(temp_str, &pConfig->sp_thread_num[i][0],&pConfig->sp[i][0]);
+        }
+    }
+}
+
+//******************************************************
+//use scheduling housekeeping callback to generate pkts
+//******************************************************
+static int done_burst=0;
+void house(NETAPI_SCHED_HANDLE_T * s)
+{
+    Ti_Pkt * tip;
+    unsigned int len;
+    nwalTxPktInfo_t meta_tx = {0};
+    PKTIO_METADATA_T meta = {PKTIO_META_TX,{0},0};
+    int err;
+    static int house_pkts_gened=0;
+    int p;
+    unsigned char * pIpHdr,* pData;
+    unsigned int vv1,vv2,vv3;
+    unsigned int sum_vv1=0;
+    unsigned int sum_vv2=0;
+    unsigned int sum_vv3=0;
+    unsigned int sum_vv4=0;
+    unsigned int sum_vv5=0;
+
+    unsigned int nwal_flow_vv1,nwal_flow_vv2;
+    unsigned int nwal_sum_vv1=0;
+    unsigned int nwal_sum_vv2=0;
+    unsigned int nwal_sum_vv3=0;
+    unsigned int nwal_sum_vv4=0;
+    unsigned int nwal_sum_vv5=0;
+    unsigned int nwal_sum_vv6=0;
+
+    unsigned int nwal_sum_flow_vv1=0;
+    unsigned int nwal_sum_flow_vv2=0;
+    unsigned long long cache_op_b1;
+    unsigned long long  cache_op_b2;
+    unsigned long long  n_c_ops;
+    static int first =0;
+    Cppi_HostDesc*      pPktDesc;
+    NETAPI_SCHED_SHUTDOWN_T sched_shutdown;
+
+    uint32_t coreid = 0;  //who we are
+#ifdef netTest_MULTI_THREAD
+    NETAPI_T nh= netapi_schedGetHandle(s);
+    coreid=(uint32_t) netapi_getCookie(nh);
+
+    if (QUIT) 
+    {
+        sched_shutdown.shutdown_type = NETAPI_SCHED_SHUTDOWN_NOW;
+        netapi_schedClose(s,&sched_shutdown,&err); 
+        return;
+    }
+
+    
+    /* only slow path threads get netcp stats */
+    if (coreid & NET_TEST_SP_THREAD_MASK)
+    {
+        netapi_netcpCfgReqStats(nh, netTest_utilStatsCbMt, 0,&err); 
+    }
+
+    coreid = NET_TEST_THREAD_NUM_MASK & coreid;
+#else
+    coreid = NET_TEST_THREAD_NUM_MASK & coreid;
+    if(done_burst)
+    {
+        house_pkts_gened+=TX_BURST;
+        netapi_Log("net_test> request stats at n=%d \n",house_pkts_gened);
+        netapi_netcpCfgReqStats(netapi_handle, netTest_utilsStatsCb, 0,&err);
+        if (err!=0) {netapi_Log("stats req failed\n");}
+        if (house_pkts_gened >= np2process+ 100)
+        {
+            sched_shutdown.shutdown_type = NETAPI_SCHED_SHUTDOWN_NOW;
+            netapi_schedClose(s,&sched_shutdown,&err);
+        }
+        return;
+    }
+    done_burst=1;
+    Osal_cache_op_measure_reset();
+    memset(&meta_tx,0,sizeof(meta_tx));
+    for(p=0;p<TX_BURST;p++) {  
+    //reguest stats 
+    if ((house_pkts_gened>0) && (! (house_pkts_gened%1000)) )
+    {
+       netapi_Log("net_test> request stats at n=%d \n",house_pkts_gened);
+       netapi_netcpCfgReqStats(netapi_handle, netTest_utilsStatsCb, 0,&err); 
+       if (err!=0) {netapi_Log("stats req failed\n");}
+    }
+
+
+    if (house_pkts_gened >= np2process+ 100)
+    {
+        //shutdown
+        sched_shutdown.shutdown_type = NETAPI_SCHED_SHUTDOWN_NOW;
+        netapi_schedClose(s,&sched_shutdown,&err);
+        continue;
+    }
+
+    else if (house_pkts_gened >= np2process) { house_pkts_gened+=1;  continue;}
+
+    /* manufacture a pkt to transmit */
+    tip = get_pkt(house_pkts_gened, &len, ourHeap, netTest_PKT_LEN,&testPkt[0]  , TEST_netTest_PKT_LEN);
+    if(!tip) { house_pkts_gened +=1; continue; }
+
+
+    /* set the pkt length */
+    vv1 = hplib_mUtilGetPmuCCNT();
+    Pktlib_setPacketLen(tip, len);
+
+    /* set up meta data */
+    meta.sa_handle=nwal_HANDLE_INVALID;
+    /* #define BENCH_UDP_SEND */
+#ifdef BEND_UDP_SEND
+    meta_tx.txFlag1 = (NWAL_TX_FLAG1_DO_IPV4_CHKSUM | NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID);
+    meta_tx.startOffset = 0;
+    /* GONE in V2 meta_tx.pktLen = len; */
+    meta_tx.ipOffBytes = TEST_PKT_IP_OFFSET_BYTES;
+    meta_tx.l4OffBytes = TEST_PKT_UDP_OFFSET_BYTES;
+    meta_tx.l4HdrLen = TEST_PKT_UDP_HDR_LEN;
+    //GONE in V2 meta_tx.ploadOffBytes = TEST_PKT_PLOAD_OFFSET_BYTES;
+    meta_tx.ploadLen = TEST_PAYLOAD_LEN;
+
+    Pktlib_getDataBuffer(tip,&pData,&len);
+    if(house_pkts_gened &0x1)
+    {
+        memcpy(&pData[6],&netTestCfg.mac[1][0] ,6);
+    }
+    pIpHdr = pData + meta_tx.ipOffBytes;
+    meta_tx.pseudoHdrChecksum =
+        netTest_utilGetIPv4PsudoChkSum(pIpHdr,(TEST_PAYLOAD_LEN+TEST_PKT_UDP_HDR_LEN));
+#else
+    Pktlib_getDataBuffer(tip,&pData,&len);
+    if(house_pkts_gened &0x1)
+    {
+        memcpy(&pData[6],&netTestCfg.mac[1][0] ,6);
+    }
+    meta_tx.txFlag1 = NWAL_TX_FLAG1_META_DATA_VALID;
+    meta_tx.startOffset = 0;
+    meta_tx.ploadLen = TEST_PAYLOAD_LEN;
+#endif
+   /* post it to netcp tx channel*/
+   meta.u.tx_meta=&meta_tx;
+#ifdef DEBUG_DESC
+    if (house_pkts_gened<16) netTest_utilDumpDescr((long *) tip, house_pkts_gened);
+    else if (house_pkts_gened>99) netTest_utilDumpDescr((long *) tip,house_pkts_gened);
+#endif
+
+    if(!first)
+    {
+        first++;
+        nwal_flow_vv1= hplib_mUtilGetPmuCCNT();
+        if(nwal_initPSCmdInfo(pktio_mGetNwalInstance(netcp_tx_chan),
+                             &meta_tx,
+                             &flowPSCmdInfo) != nwal_OK)
+        {
+            netapi_Log("nwal_initPSCmdInfo() ERROR \n");
+        }
+        nwal_flow_vv2= hplib_mUtilGetPmuCCNT();
+        nwal_sum_flow_vv1 += (nwal_flow_vv1-vv1); 
+        nwal_sum_flow_vv2 += (nwal_flow_vv2-nwal_flow_vv1); 
+    }
+    cache_op_b1= Osal_cache_op_measure(&n_c_ops);
+    vv2= hplib_mUtilGetPmuCCNT();
+#ifdef BEND_UDP_SEND
+    nwal_mCmdSetL4CkSumPort(  tip,
+                             &flowPSCmdInfo,
+                             TEST_PKT_UDP_OFFSET_BYTES,
+                             (TEST_PKT_UDP_HDR_LEN + TEST_PAYLOAD_LEN),
+                             meta_tx.pseudoHdrChecksum,
+                             meta_tx.enetPort);
+#else
+    nwal_mCmdSetPort  (tip,
+                      &flowPSCmdInfo,  //could be NULL
+                      0);  //port 0 -> switch decides
+
+#endif
+
+    pPktDesc = Pktlib_getDescFromPacket(tip);
+    /* Send the packet out to transmit Q*/
+    Qmss_queuePushDescSize (flowPSCmdInfo.txQueue, 
+                        pPktDesc, 
+                        NWAL_DESC_SIZE);
+    vv3= hplib_mUtilGetPmuCCNT();
+    cache_op_b2= Osal_cache_op_measure(&n_c_ops);
+
+    sum_vv1 += (vv2-vv1);
+    if(!house_pkts_gened)
+    {
+        /* first packet. Take out the PS command label creation cost */
+        sum_vv1 = sum_vv1 - nwal_sum_flow_vv2;
+    }
+
+    sum_vv3 += (vv3-vv2)-(long) (cache_op_b2-cache_op_b1); //sub out cache op cost
+
+    // netapi_Log("pktio send. full=%d metadata=%d netapi_pktioSend=%d\n", vv3-vv1,  vv2-vv1,  vv3-vv2);
+    stats[coreid].itx +=1;
+    house_pkts_gened +=1;
+    }
+    {
+        unsigned long long  ccycles;
+        ccycles =Osal_cache_op_measure(&n_c_ops);
+        if (sum_vv1) 
+        {
+            netapi_Log("BURST NWAL Fast send %d pkts.  metadata=%d Cmd Label Creation Cost=%d  nwal Fast Send Cost (less cacheop)= %d n_c_ops=%lld cache_op_time=%lld (pp-> %d)\n", 
+              stats[coreid].itx, sum_vv1/stats[coreid].itx,  nwal_sum_flow_vv2, sum_vv3/stats[coreid].itx, 
+              n_c_ops, ccycles, n_c_ops? (ccycles/(n_c_ops/2L)) : 0);
+#if 0
+            netapi_Log("NWAL Profile Cycles: Prof1= %d,Prof2=%d,Prof3=%d,Prof4=%d,Prof5=%d ,Prof6=%d \n",
+              nwal_sum_vv1/stats[coreid].itx,nwal_sum_vv2/stats[coreid].itx,nwal_sum_vv3/stats[coreid].itx,
+              nwal_sum_vv4/stats[coreid].itx,nwal_sum_vv5/stats[coreid].itx,nwal_sum_vv6/stats[coreid].itx);
+  
+#endif  
+
+            if(stats[core_id].itx2)
+            {
+                netapi_Log("nwal_flowSend Profile Cycles: Prof1= %d,Prof2=%d \n",
+                nwal_sum_flow_vv1/stats[coreid].itx2,nwal_sum_flow_vv2/stats[coreid].itx2);
+            }
+        }
+    }
+#endif
+}
+NETCP_CFG_ROUTE_T test_route;
+
+void netTest_utilCreateInterfaces(uint8_t num_macs, uint8_t num_ips, Bool match_action_host)
+{
+    int err, i;
+
+    if (match_action_host)
+    {
+        memset(&test_route, 0, sizeof(NETCP_CFG_ROUTE_T));
+        test_route.valid_params = NETCP_CFG_VALID_PARAM_MATCH_ACTION_DEST;
+        test_route.match_destination = NETCP_CFG_ACTION_TO_SW;
+        test_route.routeType = 0;
+        test_route.p_flow = NULL;
+        test_route.p_dest_q = NULL;
+    
+        for (i = 0; i < num_macs; i++)
+        {
+            /* add mac intefaces */
+            mac[i] = netapi_netcpCfgCreateMacInterface(
+                              netapi_handle,
+                              &netTestCfg.mac[i][0],
+                              NULL,
+                              i,
+                              netTestCfg.switch_port[i],
+                              (NETCP_CFG_ROUTE_HANDLE_T)  &test_route,
+                              (NETCP_CFG_VLAN_T ) NULL ,  //future
+                              0,
+                              1, 
+                              &err);
+           if (err)
+               netapi_Log("netapi_netcpCfgCreateMacInterface failed with error: %d\n",err);
+    
+        }
+    }
+    else
+    {
+        for (i = 0; i < num_macs; i++)
+        {
+            /* add mac intefaces */
+            mac[i] = netapi_netcpCfgCreateMacInterface(
+                              netapi_handle,
+                              &netTestCfg.mac[i][0],
+                              NULL,
+                              i,
+                              netTestCfg.switch_port[i],
+                              (NETCP_CFG_ROUTE_HANDLE_T)  NULL,
+                              (NETCP_CFG_VLAN_T ) NULL ,  //future
+                              0,
+                              1, 
+                              &err);
+           if (err)
+               netapi_Log("netapi_netcpCfgCreateMacInterface failed with error: %d\n",err);
+    
+        }
+
+    }
+    for (i = 0; i < num_ips; i++)
+    {
+        //attach an IP to this interface
+        ip_rule[i]=netapi_netcpCfgAddIp(
+                          netapi_handle,
+                          netTestCfg.attach_iface[i],
+                          nwal_IPV4,
+                          (nwalIpAddr_t*)&netTestCfg.ip[i].ipv4[0],
+                          NULL,
+                          NULL,  //all IP
+                          (NETCP_CFG_ROUTE_HANDLE_T) NULL,
+                          (void*)NULL,
+                          &err
+                          );
+        if (err)
+            netapi_Log("netapi_netcpCfgAddIp: add ip failed with error %d\n", err);
+    }
+}
+
+void netTest_utilDeleteInterfaces(uint8_t num_macs, uint8_t num_ips)
+{
+    int err,i;
+    //delete IPs and MAC Interfacess
+    for (i = 0; i < num_ips; i++)
+    {
+        err = 0;
+        netapi_netcpCfgDelIp(netapi_handle, netTestCfg.attach_iface[i], nwal_IPV4, 
+                      NULL, NULL, ip_rule[i], &err);
+    }
+    for (i = 0; i < num_macs; i++)
+    {
+        err = 0;
+        netapi_netcpCfgDelMac(netapi_handle,i,&err);
+    }
+    
+    //netapi_netcpCfgDelMac(netapi_handle,0,&err);
+    //netapi_netcpCfgDelMac(netapi_handle,1,&err);
+
+}
+
+
diff --git a/ti/runtime/netapi/test/net_test_utils.h b/ti/runtime/netapi/test/net_test_utils.h
new file mode 100755
index 0000000..f7706fa
--- /dev/null
+++ b/ti/runtime/netapi/test/net_test_utils.h
@@ -0,0 +1,228 @@
+#ifndef __NET_TEST_UTIL_H__
+#define __NET_TEST_UTIL_H__
+
+
+#include "trie.h"
+//#include "net_test.h"
+#include "ti/runtime/netapi/netapi.h"
+#include "net_test_sa_utils.h"
+
+#define MAX_SEC_INDEX          64
+#define NET_TEST_MAX_MAC                64
+#define NET_TEST_MAX_IP                 64
+#define NET_TEST_MAX_FP_THREAD 5
+#define NET_TEST_MAX_SP_THREAD 5
+#define MAX_LINE_LENGTH 512
+#define MAX_ROUTES 16
+
+#define TEMP_STR_LEN 32
+
+#define BE(x) ( (((x)&0xff000000)>>24) | (((x)&0xff0000)>>8) | (((x)&0xff00)<<8) | (((x)&0xff)<<24)  )
+
+/* The input strings requirEd for parsing certain configuration
+ * paremeters from the config file */
+#define netTest_INIT_CONFIG_IPSEC_MODE_RX          "ipsec_mode_rx"
+#define netTest_INIT_CONFIG_IPSEC_MODE_TX           "ipsec_mode_tx"
+#define netTest_INIT_CONFIG_IPSEC_IF_NO             "ipsec_if"
+#define netTest_INIT_CONFIG_DSP_MAC                 "dsp_mac"
+#define netTest_INIT_CONFIG_DSP_IP                  "dsp_ip"
+#define netTest_INIT_CONFIG_STATIC_LOOPBACK_PORT    "dest_udp_port_config"
+#define netTest_CONFIG_STRING_LEN 512
+
+//IPSEC MODE(only choose one rx and one tx)
+#define IPSEC_MODE_RX_INFLOW            1
+#define IPSEC_MODE_TX_INFLOW            2
+#define IPSEC_MODE_RX_SIDEBAND          3
+#define IPSEC_MODE_TX_SIDEBAND          4
+
+#define netTest_PKT_LEN 1400
+
+#define NET_TEST_SP_THREAD_MASK 0xF0000000
+#define NET_TEST_THREAD_NUM_MASK 0x000000FF
+
+typedef struct {
+    unsigned char           mac[NET_TEST_MAX_MAC][6];
+    uint8_t                 num_macs;
+    uint8_t                 switch_port[NET_TEST_MAX_MAC];
+    nwalIpAddr_t            ip[NET_TEST_MAX_IP];
+    uint8_t                 num_ips;
+    uint8_t                 attach_iface[NET_TEST_MAX_IP];
+    nwalIpAddr_t            local_ipsec_ip;
+    nwalIpAddr_t            remote_ipsec_ip;
+    uint8_t                 ipsec_mode_rx;
+    uint8_t                 ipsec_mode_tx;
+    int                     ipsec_if_no;
+    int                     dest_udp_port_config;
+    uint8_t                 fp_proc_start[NET_TEST_MAX_FP_THREAD];
+    uint8_t                 fp_proc_end[NET_TEST_MAX_FP_THREAD];
+    uint32_t                fp_thread_num[NET_TEST_MAX_FP_THREAD];
+    uint8_t                 num_fp_threads;
+    uint8_t                 sp_proc_start[NET_TEST_MAX_SP_THREAD];
+    uint8_t                 sp_proc_end[NET_TEST_MAX_SP_THREAD];
+    uint32_t                sp_thread_num[NET_TEST_MAX_SP_THREAD];
+    uint8_t                 num_sp_threads;
+    
+    uint8_t                 auth_key[MAX_SEC_INDEX][36];
+    uint8_t                 encr_key[MAX_SEC_INDEX][36];
+    uint32_t                tunnel_id[MAX_SEC_INDEX];
+    NETAPI_SEC_SA_INFO_T    sa[MAX_SEC_INDEX];
+    uint8_t                 num_sa;
+    nwalSecKeyParams_t      key_params[MAX_SEC_INDEX];
+    uint8_t                 dsp_mac;
+    uint8_t                 dsp_ip;
+
+} netTestConfig_t;
+
+typedef struct
+{
+    char    dir[netTest_CONFIG_STRING_LEN];
+    char    spi[netTest_CONFIG_STRING_LEN];
+    char    proto[netTest_CONFIG_STRING_LEN];
+    char    saMode[netTest_CONFIG_STRING_LEN];
+    char    ipType[netTest_CONFIG_STRING_LEN];
+    char    src[netTest_CONFIG_STRING_LEN];
+    char    dst[netTest_CONFIG_STRING_LEN];
+    char    replayWindow[netTest_CONFIG_STRING_LEN];
+    char    authMode[netTest_CONFIG_STRING_LEN];
+    char    cipherMode[netTest_CONFIG_STRING_LEN];
+    char    esnLo[netTest_CONFIG_STRING_LEN];
+    char    esnHi[netTest_CONFIG_STRING_LEN];
+    char    encKeySize[netTest_CONFIG_STRING_LEN];
+    char    macKeySize[netTest_CONFIG_STRING_LEN];
+    char    auth_key[netTest_CONFIG_STRING_LEN];
+    char    encr_key[netTest_CONFIG_STRING_LEN];
+    char    tunnel_id[netTest_CONFIG_STRING_LEN];
+} netTestConfigSA_t;
+
+typedef struct{
+    char mac[NET_TEST_MAX_MAC][netTest_CONFIG_STRING_LEN];
+    char switch_port[NET_TEST_MAX_MAC][netTest_CONFIG_STRING_LEN];
+    char ip[NET_TEST_MAX_IP][netTest_CONFIG_STRING_LEN];
+    char attach_iface [NET_TEST_MAX_MAC][netTest_CONFIG_STRING_LEN];
+    char ipsec_mode_rx[netTest_CONFIG_STRING_LEN];
+    char ipsec_mode_tx[netTest_CONFIG_STRING_LEN];
+    char routes[MAX_ROUTES][netTest_CONFIG_STRING_LEN];
+    char ports[MAX_ROUTES][netTest_CONFIG_STRING_LEN];
+    char dst_ips[MAX_ROUTES][netTest_CONFIG_STRING_LEN];
+    char paths[MAX_ROUTES][netTest_CONFIG_STRING_LEN];
+    char ipsec_if_no[netTest_CONFIG_STRING_LEN];
+    char fp_thread_num[NET_TEST_MAX_FP_THREAD][netTest_CONFIG_STRING_LEN];
+    char sp_thread_num[NET_TEST_MAX_SP_THREAD][netTest_CONFIG_STRING_LEN];
+    char sp[NET_TEST_MAX_SP_THREAD][netTest_CONFIG_STRING_LEN];
+    char fp[NET_TEST_MAX_FP_THREAD][netTest_CONFIG_STRING_LEN];
+    char tunnel_id[netTest_CONFIG_STRING_LEN];
+    netTestConfigSA_t sa_config[MAX_SEC_INDEX][netTest_CONFIG_STRING_LEN];
+    char dsp_mac[netTest_CONFIG_STRING_LEN];
+    char dsp_ip[netTest_CONFIG_STRING_LEN];
+    char dest_udp_port_config[netTest_CONFIG_STRING_LEN];
+} netTestConfigFile_t;
+
+typedef struct {
+    int iface;
+    int ipcsum;
+    int l4csum;
+} LastPktInfo_t;
+
+
+//#define netTestSA_t netTestSA_t
+
+typedef struct our_route_t
+{
+   int out_port;
+   unsigned char out_mac[14];
+   netTestSA_t * sec_ptr;
+} OUR_ROUTE_T;
+
+typedef struct {
+    long itx;  //initially generated
+    long itx2;
+    long rx;
+    long tx;
+    long n_bad;
+    long n_new;
+    long n_class0_rx;   //count of pkts classified 
+    long n_class1_rx;   //count of pkts classified 
+    long n_class2_rx;   //count of pkts classified 
+    long n_t1;
+    long n_t2;
+    long n_t3;
+    long sec_tx;
+    long sec_rx;
+    long sb_tx;
+    long sb_rx;
+    long secp_rx;
+    long n_auth_ok;
+    unsigned long long  app_cycles;
+    unsigned long long  send_cycles;
+    unsigned long long  tx_cache_cycles;
+    unsigned long long total_decrypt_time;
+    unsigned long long total_encrypt_time;
+    long rx_min;
+    long tx_min;
+    long if_rx[TUNE_NETAPI_MAX_NUM_MAC];
+    long  core_rx;
+    long  n_stats_cb;
+    long  ip;
+    long exceptionPktsFrag;
+    long exceptionPktsOther;
+} netTestStats_T;
+
+typedef struct
+{
+    long ip[5];
+    long udp[2];
+} netTestHead_T;
+
+
+
+
+
+
+void house(NETAPI_SCHED_HANDLE_T *s);
+void netTest_utilCreateInterfaces(uint8_t num_macs, uint8_t num_ips, Bool match_action_host);
+void netTest_utilDeleteInterfaces(uint8_t num_macs, uint8_t num_ips);
+
+int netTest_utilCheckHeader(netTestHead_T * p_head, PKTIO_METADATA_T * p_meta);
+void netTest_utilMySig(int x);
+unsigned long netTest_utilPeek(unsigned long * p);
+void netTest_utilDumpDescr(unsigned long *p, int n);
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r);
+void   netTest_utilDumpBuffer(unsigned long * buf,uint32_t buf_length);
+long netTest_utilHtonl(long x);
+unsigned char netTest_utilHex2Dec(char *p_s);
+uint16_t netTest_utilOnesComplementAdd (uint16_t v1, uint16_t v2);
+uint16_t netTest_utilOnesCompChkSum (uint8_t *p, uint32_t nwords);
+uint16_t netTest_utilGetIPv4PsudoChkSum (uint8_t *data, uint16_t payloadLen);
+void netTest_utilPrintIPSecStats(Sa_IpsecStats_t     *p_saIpsecStats, nwal_saAALG auth, nwal_saEALG cipher);
+void netTest_utilPrintDataModeStats(Sa_DataModeStats_t     *p_saDataModeStats, nwal_saAALG auth, nwal_saEALG cipher);
+void netTest_utilStatsCbMt(NETAPI_T h, paSysStats_t* pPaStats);
+void netTest_utilsStatsCb(NETAPI_T h, paSysStats_t* pPaStats);
+
+
+void netTest_utilParseOneMac(char * p_mac_str, unsigned char *p_mac);
+void netTest_utilParseOneKey(char *p_key_str, unsigned char *p_key);
+void netTest_utilParseOneIP(char * p_ip_addr_str, unsigned char * p_ip);
+void netTest_utilParseMac(netTestConfigFile_t *pConfig);
+void netTest_utilParseIP(netTestConfigFile_t *pConfig);
+void netTest_utilParseThreadParams(netTestConfigFile_t *pConfig);
+void netTest_utilParseIpsecMode(netTestConfigFile_t *pConfig);
+void netTest_utilParseAuthMode(char *auth_mode_str, nwal_saAALG *auth_mode);
+void netTest_utilParseEncryptMode(char *ency_mode_str, nwal_saEALG*encr_mode);
+void netTest_utilParseProto(char *proto_str, nwal_IpSecProto *proto);
+void netTest_utilParseSaMode(char *mode_str, nwal_saMode *mode);
+void netTest_utilParseIPType(char *ip_type_str, nwal_IpType *ipType);
+void netTest_utilParseSADir(char* dir_str, nwal_SaDir *dir);
+void netTest_utilParseSA(netTestConfigFile_t *pConfig);
+void netTest_utilParseRoutes(netTestConfigFile_t* pConfig, OUR_ROUTE_T* routes, Trie** our_router);
+void netTest_utilProcessConfigFile(FILE* fpr, netTestConfigFile_t* pConfig);
+void recv_cb(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+void parse_simple_param_u8(char* input_str, uint8_t *val);
+void parse_simple_param_u16(char* input_str, uint16_t *val);
+void parse_simple_param_u32(char* input_str, uint32_t *val);
+
+
+#endif
+
diff --git a/ti/runtime/netapi/test/nt_bridge.c b/ti/runtime/netapi/test/nt_bridge.c
new file mode 100755
index 0000000..839bfb6
--- /dev/null
+++ b/ti/runtime/netapi/test/nt_bridge.c
@@ -0,0 +1,1225 @@
+/******************************************
+ * File: nt_bridge.c   
+ * Purpose:  netcp bridge offload prototypes.
+ **************************************************************
+ * FILE:  nt_bench.c
+ * 
+ * DESCRIPTION:  netapi user space transport
+ *               library  test application : benchmarks
+ * 
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2013-2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ *****************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <signal.h>
+#include <pthread.h>
+#include <sched.h>
+
+#include "trie.h"
+#include "string.h"
+#include "netapi.h"
+#include "pktio.h"
+#include <ti/drv/sa/salld.h>
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+#include "net_test_thread_utils.h"
+#include "fdb.h"
+
+#if defined(DEVICE_K2H)
+#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/drv/qmss/device/k2k/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2k/src/cppi_device.c>
+#elif defined (DEVICE_K2L)
+#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/drv/qmss/device/k2e/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2e/src/cppi_device.c>
+#else /*Default */
+#include <ti/drv/qmss/device/k2h/src/qmss_device.c>
+#include <ti/drv/cppi/device/k2h/src/cppi_device.c>
+#endif /* Device */
+
+#define netapi_timing_start hplib_mUtilGetPmuCCNT
+
+extern Rm_ServiceHandle   *rmClientServiceHandle;
+
+static int scnt=0;
+static int QUIT=0;
+static int XMIT=0;
+static int CAP=0;
+volatile int RESET=0; //to reset stats
+volatile int MAC=0;
+volatile int FAST=1;
+
+uint16_t num_learned_macs = 0;
+
+uint16_t num_configured_interfaces = 0;
+
+static ntBridgeCfgFile_T config_file[MAX_INTERFACES];
+
+NETCP_CFG_ROUTE_T test_route[MAX_INTERFACES];
+
+static ntBridgeAleCfgFile_T ale_config_file;
+FDB_ENTRY_T                 ale_cfg[32];
+
+
+//*********************for checksum test
+unsigned short checksum(unsigned short *p, int len)
+{
+    unsigned short s=0;
+    int i;
+    for(i=0;i<len/2;i++) s+=p[i];
+    if (len&0x1) s+=(p[len/2+1]<<8);
+    return s;
+}
+
+#define NCSUM 1600
+unsigned long csum_val[NCSUM];
+unsigned long csum_num[NCSUM];
+unsigned long long csum_tim[NCSUM];
+//***********************************************
+
+#define CHECK_SET_PARAM(ARG1, ARG2)     \
+    do { \
+        if(strcmp(key, ARG1) == 0) { \
+        if(d1)strncpy(ARG2,d1,netTest_CONFIG_STRING_LEN); \
+        continue; \
+        } \
+    } while(0)
+
+#define CHECK_SET_PARAM2(ARG1, ARG2,  ARG3)     \
+    do { \
+        if(strcmp(key, ARG1) == 0) { \
+        if(d1) strncpy(ARG2,d1,netTest_CONFIG_STRING_LEN); \
+        if(d2) strncpy(ARG3,d2,netTest_CONFIG_STRING_LEN); \
+        continue; \
+        } \
+    } while(0)
+
+
+void parse_simple_param_u8(char* input_str, uint8_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint8_t)strtol(input_str, NULL, 0);
+    }
+}
+
+void parse_simple_param_u16(char* input_str, uint16_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint16_t)strtol(input_str, NULL, 0);
+    }
+}
+
+void parse_simple_param_u32(char* input_str, uint32_t *val)
+{
+    if (strlen(input_str))
+    {
+        *val = (uint32_t)strtol(input_str, NULL, 0);
+    }
+}
+void parse_dscp_entry_default(char* input_str_queue,
+                              char* input_str_flow,
+                              paEQosModeConfig_t* pQosShapperCfg)
+{
+    int i;
+    if (strlen(input_str_queue) && strlen(input_str_flow))
+    {
+        for(i=0;i<MAX_DSCP_ENTRIES;i++)
+        {
+                pQosShapperCfg->dscpMap[i].flowOffset =(uint16_t)strtol(input_str_flow, NULL, 0);
+                pQosShapperCfg->dscpMap[i].queueOffset = (uint16_t)strtol(input_str_queue, NULL, 0);
+        }
+    }
+}
+void parse_dscp_entry(ntBridgeCfgFile_T *pConfig, paEQosModeConfig_t* pQosShapperCfg)
+{
+    int i;
+
+    for(i=0;i<MAX_DSCP_ENTRIES;i++)
+    {
+        if ((pConfig->dscpMapF[i][0]) && (pConfig->dscpMapQ[i][0]))
+        {
+            pQosShapperCfg->dscpMap[i].flowOffset =atoi(&pConfig->dscpMapF[i][0]);
+            pQosShapperCfg->dscpMap[i].queueOffset = atoi(&pConfig->dscpMapQ[i][0]);
+            printf("parse_dsp_entry[%d]: flowOffset: %d, queueOffset: %d\n",
+                i,
+                pQosShapperCfg->dscpMap[i].flowOffset,
+                pQosShapperCfg->dscpMap[i].queueOffset);
+        }
+        else
+        {
+            pQosShapperCfg->dscpMap[i].flowOffset =0;
+            pQosShapperCfg->dscpMap[i].queueOffset = 0;
+        }
+    }
+}
+
+unsigned char ntUtilHex2Dec(char *p_s)
+{
+    int val;
+    sscanf(p_s,"%x",&val); 
+    return val&0xff;
+}
+
+void parse_pbit_entry_default(char* input_str_queue,
+                              char* input_str_flow,
+                              paEQosModeConfig_t* pQosShapperCfg)
+{
+    int i;
+    if (strlen(input_str_queue) && strlen(input_str_flow))
+    {
+        for(i=0;i<MAX_PBIT_ENTRIES;i++)
+        {
+                pQosShapperCfg->pbitMap[i].flowOffset =(uint16_t)strtol(input_str_flow, NULL, 0);
+                pQosShapperCfg->pbitMap[i].queueOffset = (uint16_t)strtol(input_str_queue, NULL, 0);
+        }
+    }
+}
+
+void parse_pbit_entry(ntBridgeCfgFile_T *pConfig, paEQosModeConfig_t* pQosShapperCfg)
+{
+    int i;
+
+    for(i=0;i<MAX_PBIT_ENTRIES;i++)
+    {
+        if ((pConfig->pbitMapF[i][0]) && (pConfig->pbitMapQ[i][0]))
+        {
+            pQosShapperCfg->pbitMap[i].flowOffset =atoi(&pConfig->pbitMapF[i][0]);
+            pQosShapperCfg->pbitMap[i].queueOffset = atoi(&pConfig->pbitMapQ[i][0]);
+            printf("parse_pbit_entry[%d]: flowOffset: %d, queueOffset: %d\n",
+                    i,
+                    pQosShapperCfg->pbitMap[i].flowOffset,
+                    pQosShapperCfg->pbitMap[i].queueOffset);
+        }
+        else
+        {
+            pQosShapperCfg->pbitMap[i].flowOffset =0;
+            pQosShapperCfg->pbitMap[i].queueOffset = 0;
+        }
+    }
+}
+void parseOneMac(char * p_mac_str, uint8_t *p_mac)
+{
+    int index = 0;
+    int i;
+    if (strlen(&p_mac_str[0]))
+    {
+        char *pch = strtok (&(p_mac_str[0]),":");
+
+        while (pch != NULL)
+        {
+            p_mac[index] = ntUtilHex2Dec(pch);
+            index++;
+            pch = strtok (NULL,":");
+        }
+        //printf("parseOneMac: 0x%x: 0x%x: 0x%x: 0x%x: 0x%x:0x%x\n",
+        //p_mac[0],p_mac[1],p_mac[2],p_mac[3],p_mac[4],p_mac[5]);
+    }
+}
+
+
+
+void parseMac(ntBridgeAleCfgFile_T *pConfig, FDB_ENTRY_T *pAleCfg)
+{
+    int i;
+    int port = 0;
+    FDB_ENTRY_T *tmp = pAleCfg;
+    for(i=0;i<32;i++)
+    {
+        if (strlen(&pConfig->mac[i][0]))
+        {
+            parseOneMac((char*)&pConfig->mac[i][0], (uint8_t*)&tmp->mac_addr);
+            sscanf(&pConfig->switch_port[i][0],"swp%d",&tmp->switch_port);
+            tmp++;
+            num_learned_macs++;
+            /* check port to be 1 or 2 */
+            //printf("parseMac: port: %d\n", tmp->switch_port);
+        }
+}
+
+
+
+}
+void parseMode(ntBridgeCfgFile_T *pConfig, paEQosModeConfig_t* pQosShapperCfg)
+{
+
+    if (strlen(&pConfig->ctrlBitMap[0]))
+    {
+        printf("parseMode: mode: %s\n", &pConfig->ctrlBitMap[0]);
+        if (strcmp(pConfig->ctrlBitMap, "dscp") == 0)
+        {
+            pQosShapperCfg->ctrlBitMap = 0; pa_IF_EQoS_ROUTE_DP_BIT_MODE;
+            
+        }
+        else if (strcmp(pConfig->ctrlBitMap, "pbit") == 0)
+        {
+            pQosShapperCfg->ctrlBitMap = pa_IF_EQoS_ROUTE_DP_BIT_MODE;
+        }
+        else
+        {
+            netapi_Log("parseMode(), invalid QOS Mode in config file \n");
+        }
+    }
+}
+
+
+
+paEQosModeConfig_t netTestQosShapperCfg[MAX_INTERFACES];
+
+
+/* Default Qos Shapper configuration for eth0 and eth1 */
+paEQosModeConfig_t netTestQosShapperCfg1 = 
+{
+    pa_IF_EQoS_ROUTE_DP_BIT_MODE,
+    {0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7},
+    {0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7},
+    1,
+    0,
+    0,
+    0,
+    0
+};
+paEQosModeConfig_t netTestQosShapperCfg2 = 
+{
+    pa_IF_EQoS_ROUTE_DP_BIT_MODE,
+    {0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7},
+    {0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7,0,0,0,1,0,2,0,3,0,4,0,5,0,6,0,7},
+    2,
+    0,
+    0,
+    0,
+    0
+};
+
+void ntBrideProcessCfgFile(FILE * fpr, ntBridgeCfgFile_T *pConfig)
+{
+    char line[MAX_LINE_LENGTH + 1];
+    int i;
+    static int sa_count = 0;
+ 
+    char *key, *ep;
+    char * d1, *d2, *d3;
+    char tokens[] = " :=;\n";
+    char temp_str[TEMP_STR_LEN];
+    memset(line, 0, MAX_LINE_LENGTH + 1);
+    //memset(pConfig, 0, sizeof(netTestConfigFile_t));
+    while (fgets(line, MAX_LINE_LENGTH + 1, fpr))
+    {
+        if(line[0]=='#')
+            continue; //skip comment
+        key  = (char *)strtok(line, tokens);
+
+        d1 = (char *)strtok(NULL, tokens);
+        if (!key)
+            continue;
+        if (!d1) 
+            continue;
+
+        if(strlen(d1) == 0) 
+        {
+            continue;
+        }
+
+        d2 = (char *)strtok(NULL, tokens);
+
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_FLOW_BASE,&(pConfig->flowBase[0]));
+
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_QUEUE_BASE,&(pConfig->queueBase[0]));
+
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_VLAN_ID,&(pConfig->vlanId[0]));
+
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_PORT,&(pConfig->port[0]));
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_INGRESS_DEF_PRI,&(pConfig->ingressDefPri[0]));
+
+        CHECK_SET_PARAM(ntBridge_INIT_CONFIG_QOS_MODE,&(pConfig->ctrlBitMap[0]));
+        CHECK_SET_PARAM2(ntBridge_INIT_CONFIG_DSCP_MAP_DEFAULT,&pConfig->dscpMapFDefault[0],&pConfig->dscpMapQDefault[0]);
+        CHECK_SET_PARAM2(ntBridge_INIT_CONFIG_PBIT_MAP_DEFAULT,&pConfig->pbitMapFDefault[0],&pConfig->pbitMapQDefault[0]);
+
+
+        for(i=0;i<MAX_DSCP_ENTRIES;i++)
+        {
+            snprintf(temp_str,TEMP_STR_LEN-1,"dscp_map_%d",i);
+
+            CHECK_SET_PARAM2(temp_str,&pConfig->dscpMapF[i][0],&pConfig->dscpMapQ[i][0]);
+        }
+
+        for(i=0;i< MAX_PBIT_ENTRIES;i++)
+        {
+            snprintf(temp_str,TEMP_STR_LEN-1,"pbit_map_%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->pbitMapF[i][0],&pConfig->pbitMapQ[i][0]);
+        }
+    }
+}
+void ntBrideProcessAleCfgFile(FILE * fpr, ntBridgeAleCfgFile_T *pConfig)
+{
+    char line[MAX_LINE_LENGTH + 1];
+    int i;
+    static int sa_count = 0;
+ 
+    char *key, *ep;
+    char * d1, *d2, *d3;
+    char tokens[] = " =;\n";
+    char temp_str[TEMP_STR_LEN];
+    memset(line, 0, MAX_LINE_LENGTH + 1);
+    //memset(pConfig, 0, sizeof(netTestConfigFile_t));
+    while (fgets(line, MAX_LINE_LENGTH + 1, fpr))
+    {
+        if(line[0]=='#')
+            continue; //skip comment
+        key  = (char *)strtok(line, tokens);
+
+        d1 = (char *)strtok(NULL, tokens);
+        if (!key)
+            continue;
+        if (!d1) 
+            continue;
+
+        if(strlen(d1) == 0) 
+        {
+            continue;
+        }
+
+        d2 = (char *)strtok(NULL, tokens);
+
+        
+        for(i=0;i< 32;i++)
+        {
+            snprintf(temp_str,TEMP_STR_LEN-1,"mac%d",i);
+            CHECK_SET_PARAM2(temp_str,&pConfig->mac[i][0],&pConfig->switch_port[i][0]);
+        }
+    }
+}
+
+//sig handler
+void netTest_utilMySig(int x)
+{
+    QUIT=1;
+    scnt+=1;
+    printf(">ifdma-test: recv'd signal %d cnt=%d\n",x,scnt);
+    if (scnt > 10) {printf(">ifdma-test: WARNING EXITING WITH PROPER SHUTDOWN, LUTS LEFT ACTIVE\n");exit(1);}
+}
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts );
+
+
+/*************debug********************/
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+    printf("--------dump of descriptor %d %x\n", n, (int) p);
+    printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+    printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+    printf("-----------------------------\n");
+}
+void netTest_utilDumpHeader(unsigned long *p, int n, int a, int r)
+{
+    printf("--------dump of header %d %x appID=%x flag1=%x\n", n, (int) p,a,r);
+    printf("> %0x %0x %0x %0x %0x %0x %0x %0x\n",
+          ntohl(p[0]),ntohl(p[1]),ntohl(p[2]),ntohl(p[3]),
+          ntohl(p[4]),ntohl(p[5]),ntohl(p[6]),ntohl(p[7]) );
+
+    printf("-----------------------------\n");
+}
+/*****************************************/
+
+
+unsigned long long CALIB=0;
+unsigned long long calibrate_idle(void)
+{
+    volatile unsigned long long  at1;
+    volatile unsigned long long  at2;
+    volatile unsigned long pt1;
+    volatile unsigned long pt2;
+    unsigned long long calib;
+    at1 = hplib_mUtilGetTimestamp();
+    pt1=netapi_timing_start();
+    for(;;)
+    {
+       pt2=netapi_timing_start()   ;
+       if ((pt2-pt1) >= 100000) break;
+    }
+    at2 = hplib_mUtilGetTimestamp();
+    
+    calib = ((unsigned long long) (pt2-pt1))/(at2-at1);
+    printf("calibrate:   arm time=%lld  -> arm cycles=%d calib=%lld\n", at2-at1, pt2-pt1, calib);
+    
+    return calib;
+}
+
+/*******************************************
+ *************NETAPI OBJECTS***************
+ *****************************************/
+static NETAPI_CFG_T our_netapi_default_cfg=
+{
+TUNE_NETAPI_PERM_MEM_SZ,
+128,  //start of packet offset for hw to place data on rx for default flow
+TUNE_NETAPI_QM_CONFIG_MAX_DESC_NUM, //max number of descriptors in system
+TUNE_NETAPI_NUM_GLOBAL_DESC,        //total we will use
+TUNE_NETAPI_DEFAULT_NUM_BUFFERS*2,   //#descriptors+buffers in default heap
+64, //#descriptors w/o buffers in default heap
+TUNE_NETAPI_DEFAULT_BUFFER_SIZE+128+128,  //size of buffers in default heap
+128,       //tail room
+256,      //extra room,
+0,
+NULL,
+18,
+0x2000
+};
+
+Pktlib_HeapHandle OurHeap;     //default heap, used by producer
+PKTIO_CFG_T netcp_rx_cfg={PKTIO_RX, PKTIO_NA, PKTIO_NA, 8};
+PKTIO_CFG_T netcp_tx_cfg={PKTIO_TX, PKTIO_NA, PKTIO_NA, 12};
+PKTIO_HANDLE_T * netcp_rx_chan;
+PKTIO_HANDLE_T * netcp_tx_chan;
+NETAPI_T netapi_handle;
+
+PKTIO_CONTROL_T zap_channel_control={PKTIO_CLEAR, NULL};
+PKTIO_CONTROL_T poll_cannel_control={PKTIO_SET_POLL_FLAGS, NULL, nwal_POLL_DEFAULT_GLOB_PKT_Q};
+
+//template for fast path
+nwalTxPktInfo_t txPktInfoNoCrypto =
+{
+    NULL,                                                       /* p_pkt */
+    NWAL_TX_FLAG1_META_DATA_VALID,                              /* txFlags */
+    0,                                                          /* lpbackPass */
+    0,                                                          /* enetport */
+    0,                                                          /* msuSize */
+    0,                                                          /* startOffset */
+    0,                                                          /* saOffBytes */
+    0,                                                          /* saPayLoadLen */
+    0,                                                          /* saAhIcvOffBytes */
+    0,                                                          /* saAhMacSize */
+    0,                                                          /* etherLenOffBytes */
+    netTest_MAC_HEADER_LEN,                                     /* ipOffBytes */
+    netTest_MAC_HEADER_LEN +netTest_IP_HEADER_LEN,              /* l4OffBytes */
+    netTest_UDP_HEADER_LEN,                                     /* l4HdrLen */
+    0,                                                          /* pseudoHdrChecksum */
+    0                                                           /* pLoadLen */
+};
+
+
+
+NETCP_CFG_ROUTE_T  test_route1 =
+{
+0,
+NULL,
+NULL,
+0,
+1,
+0,
+1
+};
+NETCP_CFG_ROUTE_T  test_route2 =
+{
+0,
+NULL,
+NULL,
+0,
+2,
+0,
+1
+};
+
+
+//#define WITH_QOS
+#ifdef WITH_QOS  //send to qos input queue, set in device tree (6409)
+//#define QOSQ 6410   /* for wrr */
+#define QOSQ 6409  /* for SP */
+PKTIO_CFG_T direct_to_cpsw_cfg={PKTIO_TX, PKTIO_GLOBAL, QOSQ, 8};
+#else  //send direct to 648, the CPSW input queue
+PKTIO_CFG_T direct_to_cpsw_cfg={PKTIO_TX, PKTIO_GLOBAL, 648, 8};
+#endif
+
+PKTIO_HANDLE_T * cpsw_tx_chan[MAX_INTERFACES];
+
+//NETCP_CFG_FLOW_T flow;
+
+
+/*************************END NETAPI OBJECTS***********************/
+
+static unsigned char all_mac[]={0,0,0,0,0,0};
+static unsigned char test_mac0[]={0,0,0,0,0,0xf};
+static unsigned char test_mac1[]={0,0,0,0,0,0xff};
+static unsigned char test_mac2[]={0xd4,0xbe,0xd9,0,0xd3,0x7e};
+static unsigned char test_mac3[]={0,0x15,0x60,0xa1,0xf7,0xbe};
+static unsigned char test_mac4[]={0xff,0xff,0xff,0x00,0x00,0x00};
+//static unsigned char test_mac0[]={0xd4,0xbe,0xd9,0x00,0xd3,0x7e};
+int test_port0 = 1;
+//static unsigned char test_mac1[]={0x00,0x15,0x60,0xa1,0xf7,0xbe};
+int test_port1 = 2;
+
+static unsigned long last_header[32/sizeof(unsigned long)];
+
+
+//stats
+int pkt_rx=0; 
+int pkt_tx=0; 
+unsigned long long pkt_rx_cycles=0L;
+unsigned long long pkt_tx_cycles=0L;
+unsigned long long pkt_cb_cycles=0L;
+unsigned long long idle_cycles=0L;
+volatile unsigned long long start_time;
+unsigned long long end_time;
+
+paSysStats_t netcp_stats;
+
+
+
+void netTest_utilStatsCbMt(NETAPI_T h, paSysStats_t* pPaStats)
+{
+    if(pPaStats)
+    {
+        memcpy(&netcp_stats,pPaStats, sizeof(paSysStats_t));
+    }
+}
+void netTest_utilsStatsCb(NETAPI_T h, paSysStats_t* pPaStats)
+{
+    if(pPaStats)
+    {
+       printf("C1 number of packets:           %d\n", pPaStats->classify1.nPackets);
+       printf("C1 number IPv4 packets:         %d\n", pPaStats->classify1.nIpv4Packets);
+       printf("C1 number IPv6 packets:        %d\n", pPaStats->classify1.nIpv6Packets);
+       printf("C1 number Custom packets:        %d\n", pPaStats->classify1.nCustomPackets);
+       printf("C1 number SRIO packets:        %d\n", pPaStats->classify1.nSrioPackets);
+       printf("C1 number LLC/SNAP Fail packets:        %d\n", pPaStats->classify1.nLlcSnapFail);
+       printf("C1 number table matched:        %d\n", pPaStats->classify1.nTableMatch);
+       printf("C1 number failed table matched: %d\n", pPaStats->classify1.nNoTableMatch);
+       printf("C1 number IP Fragmented packets: %d\n", pPaStats->classify1.nIpFrag);
+       printf("C1 number IP Depth Overflow: %d\n", pPaStats->classify1.nIpDepthOverflow);
+       printf("C1 number VLAN Depth Overflow: %d\n", pPaStats->classify1.nVlanDepthOverflow);
+       printf("C1 number GRE Depth Overflow: %d\n", pPaStats->classify1.nGreDepthOverflow);
+       printf("C1 number MPLS Packets: %d\n", pPaStats->classify1.nMplsPackets);
+       printf ("C1 number of parse fail:        %d\n",pPaStats->classify1.nParseFail);
+       printf("C1 number of Invalid IPv6 Opt:  %d\n", pPaStats->classify1.nInvalidIPv6Opt);
+       printf("C1 number of TX IP Fragments:  %d\n", pPaStats->classify1.nTxIpFrag);
+       printf ("C1 number of silent discard:    %d\n",pPaStats->classify1.nSilentDiscard);
+       printf("C1 number of invalid control:   %d\n", pPaStats->classify1.nInvalidControl);
+       printf ("C1 number of invalid states:    %d\n",pPaStats->classify1.nInvalidState);
+       printf ("C1 number of system fails:      %d\n",pPaStats->classify1.nSystemFail);
+       printf ("C2 number Packets  :           %d\n",pPaStats->classify2.nPackets);
+       printf ("C2 number udp           :      %d\n",pPaStats->classify2.nUdp);
+       printf ("C2 number tcp           :      %d\n",pPaStats->classify2.nTcp);
+       printf ("C2 number Custom       :      %d\n",pPaStats->classify2.nCustom);
+       printf ("C2 number silent drop   :      %d\n",pPaStats->classify2.nSilentDiscard);
+       printf ("C2 number invalid cntrl :      %d\n\n",pPaStats->classify2.nInvalidControl);
+       printf ("C2 number Modify Stats Cmd Fail :      %d\n\n",pPaStats->modify.nCommandFail);
+    }
+}
+
+
+//**********************************
+//producer thread
+//*********************************
+void producer_thread(int coreid)
+{
+int err;
+int i;
+Ti_Pkt * tip;
+unsigned char * pData;
+int len;
+PKTIO_METADATA_T meta = {PKTIO_META_IFDMA_TX,{0},0};
+int np;
+cpu_set_t cpu_set;
+unsigned long t1;
+unsigned long t2;
+
+    CPU_ZERO( &cpu_set);
+    CPU_SET( coreid, &cpu_set);
+    hplib_utilSetupThread(coreid,
+                          &cpu_set,
+                          hplib_spinLock_Type_LOL);
+    start_time = hplib_mUtilGetTimestamp();
+
+    /* Poll the default pktio channel for pkts from network */
+    for(i=0;!((volatile int) QUIT);i++)
+    {
+        if (FAST)
+        {
+            //netapi_netcpCfgReqStats(netapi_handle, netTest_utilStatsCbMt, 0,&err); 
+            sleep(2);
+            continue;
+        }
+        t1 = netapi_timing_start();
+        np = netapi_pktioPoll(netcp_rx_chan,NULL,&err);
+        t2 = netapi_timing_start();
+        pkt_rx+=np;
+        if (np) 
+        {
+            pkt_rx_cycles += (t2-t1);
+        }
+        else
+        {
+            idle_cycles += (t2-t1);
+        }
+        if (RESET)
+        {
+            idle_cycles=0LL;
+            start_time = hplib_mUtilGetTimestamp();
+            pkt_rx=pkt_tx=0;
+            pkt_rx_cycles=pkt_tx_cycles=0LL;
+            pkt_cb_cycles=0LL;
+            RESET=0;
+        }
+    }
+    end_time = hplib_mUtilGetTimestamp();
+    printf("nt-bench: receiver  DONE %d pkts rx,  pkt poll cycles=% u; pkt rx cycle=%u pkt tx cycles=%u idle cycles=%lld duration=%lld ticks idle pct= %lld\n",
+            pkt_rx,
+            (unsigned)(pkt_rx ?  (pkt_rx_cycles - pkt_cb_cycles)/pkt_rx : 0),
+            (unsigned)  (pkt_rx ?  (pkt_rx_cycles) /pkt_rx : 0),
+            (unsigned)  (pkt_tx ?  (pkt_tx_cycles) /pkt_tx : 0),
+            idle_cycles, (end_time-start_time), 
+            (idle_cycles*100) /( CALIB* (end_time-start_time))
+     );
+     printf("Leaving producer_thread\n");
+}
+
+
+void nt_setupQosShapper(NETAPI_T h, paEQosModeConfig_t *pqosCfg)
+{
+    int i;
+    paEmacPortConfig_t ctrl;
+    nwalLocCxtInfo_t info;
+    NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) h;
+    
+    memset(&info, 0, sizeof(nwalLocCxtInfo_t));
+
+    memset(&ctrl, 0, sizeof(paEmacPortConfig_t));
+
+    ctrl.cfgType = pa_EMAC_PORT_CFG_EQoS_MODE;
+    ctrl.numEntries = 1;
+
+    ctrl.u.eQoSModeCfg = pqosCfg;
+
+    if(pqosCfg->flowBase)
+    {
+        printf("nt_setupQosShapper: flowBase from config file: %d\n", pqosCfg->flowBase);
+        ctrl.u.eQoSModeCfg->flowBase = pqosCfg->flowBase;
+    }
+    else
+    {
+        nwal_getLocCxtInfo(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &info);
+        printf("nt_setupQosShapper: flowBase from nwal: %d\n", info.rxPktFlowId);
+        ctrl.u.eQoSModeCfg->flowBase = info.rxPktFlowId;
+    }
+    nwal_emacPortCfg(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &ctrl);
+}
+
+
+
+//******************************
+//  main program
+//*****************************
+int main(int argc, char **argv)
+{
+    int err,i;
+    int32_t             errCode;
+    Pktlib_HeapIfTable*  pPktifTable;
+    Pktlib_HeapCfg heapCfg;
+    long t1, t2 ;
+    cpu_set_t cpu_set;
+    FILE* fpr[MAX_INTERFACES];
+
+     //install signal handler for ^c
+    signal(SIGINT,netTest_utilMySig);
+
+     for(i=0; i < MAX_INTERFACES; i++)
+     {
+         fpr[i] = NULL;
+     }
+
+    memset(&config_file[0], 0, sizeof(ntBridgeCfgFile_T)*MAX_INTERFACES);
+    memset(&netTestQosShapperCfg[0], 0, sizeof(paEQosModeConfig_t)*MAX_INTERFACES);
+    memset(&ale_cfg, 0, sizeof(ntBridgeAleCfg_T));
+    memset(&ale_cfg, 0, sizeof(FDB_ENTRY_T)*32);
+
+    /* USE defautl Qos Shapper Configuration for 2 ports unless config files provided */
+    memcpy(&netTestQosShapperCfg[0], &netTestQosShapperCfg1, sizeof(paEQosModeConfig_t));
+    memcpy(&netTestQosShapperCfg[1], &netTestQosShapperCfg2, sizeof(paEQosModeConfig_t));
+
+    if (argc == 2)
+    {
+        fpr[0] = fopen(argv[1], "r");
+        num_configured_interfaces = 1;
+    }
+    else if (argc == 3)
+    {
+        fpr[0] = fopen(argv[1], "r");
+        fpr[1] = fopen(argv[2], "r");
+        num_configured_interfaces = 2;
+        
+    }
+    else
+    {
+        printf("No qos shapper input files, using default settings\n");
+        num_configured_interfaces = 2;
+    }
+
+    for (i=0;i< num_configured_interfaces;i++)
+    {
+        if (fpr[i])
+        {
+            ntBrideProcessCfgFile(fpr[i], &config_file[i]);
+
+            parse_dscp_entry_default((char*)&config_file[i].dscpMapQDefault,
+                                     (char*)&config_file[i].dscpMapFDefault,
+                                     &netTestQosShapperCfg[i]);
+            parse_pbit_entry_default((char*)&config_file[i].pbitMapQDefault,
+                                     (char*)&config_file[i].pbitMapFDefault,
+                                     &netTestQosShapperCfg[i]);
+            
+            parse_simple_param_u16((char*)&config_file[i].queueBase, &netTestQosShapperCfg[i].queueBase);
+             printf("main: netTestQos Cfg: queueBase: %d\n",netTestQosShapperCfg[i].queueBase);
+
+            parse_simple_param_u8((char*)&config_file[i].flowBase, &netTestQosShapperCfg[i].flowBase);
+            printf("main: netTestQos Cfg: flowBase: %d\n",netTestQosShapperCfg[i].flowBase);
+
+            parse_simple_param_u16((char*)&config_file[i].vlanId, &netTestQosShapperCfg[i].vlanId);
+            printf("main: netTestQos Cfg: vlanId: %d\n",netTestQosShapperCfg[i].vlanId);
+
+            parse_simple_param_u8((char*)&config_file[i].port, &netTestQosShapperCfg[i].port);
+            printf("main: netTestQos Cfg: port: %d\n",netTestQosShapperCfg[i].port);
+
+            parse_simple_param_u8((char*)&config_file[i].ingressDefPri, &netTestQosShapperCfg[i].ingressDefPri);
+            printf("main: netTestQos Cfg: ingressDefPri: %d\n",netTestQosShapperCfg[i].ingressDefPri);
+
+            parse_dscp_entry(&config_file[i], &netTestQosShapperCfg[i]);
+            parse_pbit_entry(&config_file[i], &netTestQosShapperCfg[i]);
+            parseMode(&config_file[i], &netTestQosShapperCfg[i]);
+
+        }
+    }
+
+#if 0
+    if (initRm())
+    {
+        printf("main: initRm() returned error\n");
+        exit(1);
+    }
+#endif
+    CPU_ZERO( &cpu_set);
+    CPU_SET( 0, &cpu_set);
+    hplib_utilSetupThread(0,
+                          &cpu_set,
+                          hplib_spinLock_Type_LOL);
+
+
+    /*******************************************/
+    /*************NETAPI STARTUP****************/
+    /*******************************************/
+
+    /* create netapi */
+    our_netapi_default_cfg.rmHandle = rmClientServiceHandle;
+    netapi_handle = netapi_init(NETAPI_SYS_MASTER, &our_netapi_default_cfg);
+    if (netapi_handle == NULL)
+    {
+        printf("main: netapi_init failure, exiting\n");
+        exit(1);
+    }
+    
+
+    /* open the main heap */
+    OurHeap = Pktlib_findHeapByName("netapi");
+    if (!OurHeap) {printf("findheapbyname fail\n"); exit(1);}
+
+    for(i = 0; i < MAX_INTERFACES; i++)
+    {
+        char temp_str[PKTIO_MAX_NAME] = {0};
+        direct_to_cpsw_cfg.qnum = netTestQosShapperCfg[i].queueBase;
+        snprintf(temp_str, PKTIO_MAX_NAME, "cpsw_tx%d",i);
+        cpsw_tx_chan[i]= netapi_pktioCreate(netapi_handle,&temp_str[0],NULL,
+                                     &direct_to_cpsw_cfg, &err); 
+        if (!cpsw_tx_chan[i])
+        {
+            printf("pktio open %s failed err=%d\n", &temp_str[0], err);
+            exit(1);
+        }
+    }
+
+#if 0
+    direct_to_cpsw_cfg.qnum = netTestQosShapperCfg2.queueBase;
+    
+    cpsw_tx_chan2= netapi_pktioCreate(netapi_handle,"cpsw_tx2",NULL,
+                                     &direct_to_cpsw_cfg, &err); 
+    if (!cpsw_tx_chan2){printf("pktio open CPSW TX2 failed err=%d\n",err); exit(1);}
+#endif
+
+
+    //if we want to relay network packets, we create a handle to the 
+    //default netcp receive queue here
+    netcp_rx_chan= netapi_pktioOpen(netapi_handle, NETCP_RX, (PKTIO_CB) recv_cb_net, &netcp_rx_cfg,  &err);
+    if (!netcp_rx_chan) {printf("pktio open RX failed err=%d\n",err); exit(1);}
+
+    netcp_tx_chan= netapi_pktioOpen(netapi_handle, NETCP_TX, (PKTIO_CB) NULL, &netcp_tx_cfg,  &err);
+    if (!netcp_tx_chan) {printf("pktio open TX failed err=%d\n",err); exit(1);}
+    else  //install a fast path template into the NETCP TX channel
+    {
+            PKTIO_CONTROL_T control2;
+            control2.op = PKTIO_UPDATE_FAST_PATH;
+            PKTIO_CFG_T cfg2;
+            cfg2.fast_path_cfg.fp_send_option = PKTIO_FP_NO_CRYPTO_NO_CKSUM_PORT;
+            cfg2.fast_path_cfg.txPktInfo= &txPktInfoNoCrypto;
+            netapi_pktioControl(netcp_tx_chan, NULL, &cfg2, &control2, &err);
+    }
+
+    //build route for cpsw
+    NETCP_CFG_FLOW_T flow;
+    flow.dma_engine = 1;
+    for (i = 0; i < MAX_INTERFACES;i++)
+    {
+        if(netTestQosShapperCfg[i].flowBase)
+        {
+            flow.dma_engine = 1;
+            flow.flowid = netTestQosShapperCfg[i].flowBase;
+            test_route[i].p_flow = &flow;
+        }
+        else
+        {
+            test_route[i].p_flow =NETCP_DEFAULT_FLOW;
+        }
+        test_route[i].egress_swith_port = netTestQosShapperCfg[i].port;
+        test_route[i].routeType = NWAL_ROUTE_PKTTYPE_EQOS;
+        test_route[i].valid_params = NETCP_CFG_VALID_PARAM_ROUTE_TYPE;
+        test_route[i].p_dest_q = cpsw_tx_chan[i];
+    }
+
+/*********************************************/
+/*****************end NETAPI STARTUP**********/
+/*********************************************/
+
+
+
+    //calibrate idle
+    CALIB = calibrate_idle();
+    ntoff_start();
+    ntoff_add_do_perm(&test_mac0[0],test_port0);
+    ntoff_add_do_perm(&test_mac1[0],test_port1);
+    //ntoff_add_do_perm(&test_mac2[0],test_port0);
+    //ntoff_add_do_perm(&test_mac3[0],test_port1);
+    //ntoff_add_do_perm(&test_mac4[0],test_port0);
+
+//**************************************
+//Create a worked thread
+//***************************************
+    {
+        pthread_t *thrs;
+        int procs =1; 
+        int c;
+        thrs = malloc( sizeof( pthread_t ) * procs );
+        if (thrs == NULL)
+        {
+                perror( "malloc" );
+                return -1;
+        }
+        printf( "net_test_bridge: Starting %d threads...\n", procs );
+
+        if (pthread_create( &thrs[0], NULL, (void*)producer_thread,
+                        (void *)1 ))
+        {
+                        perror( "pthread_create" );
+                        exit(1);
+        }
+        //this thread of execution (main) now just waits on user input
+        for(;;)
+        {
+            printf(">");
+            c=getchar();
+            if (c=='c') {CAP=!CAP; printf("CAPTURE= %d\n", CAP); }
+            else if (c=='t') {XMIT=!XMIT; printf("XMIT= %d\n", XMIT); }
+            else if (c=='l')
+            {
+                FILE* fprAle = NULL;
+                system("/etc/transportnetlib/test/parse_ale.sh");
+                fprAle = fopen("ale_table.txt","r");
+                if (fprAle)
+                {
+                    ntBrideProcessAleCfgFile(fprAle, &ale_config_file);
+                    //for(i=0;i<32;i++)
+                        parseMac(&ale_config_file, &ale_cfg[0]);
+                     for(i=0;i<num_learned_macs;i++)
+                     {
+                        printf("parseOneMac[%d]: 0x%x: 0x%x: 0x%x: 0x%x: 0x%x:0x%x, switch port: %d\n",
+                        i,
+                        ale_cfg[i].mac_addr[0],
+                        ale_cfg[i].mac_addr[1],
+                        ale_cfg[i].mac_addr[2],
+                        ale_cfg[i].mac_addr[3],
+                        ale_cfg[i].mac_addr[4],
+                        ale_cfg[i].mac_addr[5],
+                        ale_cfg[i].switch_port);
+                     }
+                     ntoff_learn();
+                     ntoff_show();
+                }
+            }
+            else if (c=='m') 
+            {
+                unsigned add1 = netapi_timing_start();
+                if (!MAC)
+                {
+                    //add macs
+                    ntoff_add_macs(netapi_handle,
+                                   FAST? &test_route1: NULL,
+                                   FAST );
+
+                    add1 = netapi_timing_start()-add1;
+                    printf("adding  MACs cycles=%d err=%x\n", add1,err);
+                    MAC=1;
+                }
+
+                else
+                    printf("MAC already offloaded\n");
+            }
+    
+            else if (c=='!') system("sh");
+            else if (c=='n')
+            {
+                unsigned add2 = netapi_timing_start();
+                if (MAC)
+                {
+                    ntoff_del_macs(netapi_handle);
+
+                    add2 = netapi_timing_start()-add2;
+                    printf("removing MAC cycles=%d\n",add2);
+                    MAC=0;
+                } else printf("no mac offloaded\n");
+           }
+           else if (c=='f') 
+           {
+              FAST=!FAST; printf("bridge offload = %s\n", FAST ? "netcp" : "user space");
+              if (!FAST) XMIT=1;
+           }
+           else if (c=='j')
+            {
+                netapi_netcpCfgReqStats(netapi_handle, netTest_utilStatsCbMt, 0,&err);
+                sleep(1);
+                netapi_netcpPoll(netapi_handle);
+                netTest_utilsStatsCb(netapi_handle, &netcp_stats);
+                
+            }
+           else if (c=='s') 
+           {
+              unsigned long long et= hplib_mUtilGetTimestamp();
+              printf(">NT_BENCH STATS:    %d received   %d xmitted,   %lld idle cycles,  %lld duration ticks  idle=%lld\n",
+                       pkt_rx,pkt_tx,
+                       idle_cycles,
+                       (et-start_time),
+                       (idle_cycles*100)/(CALIB*(et-start_time))
+                    );
+              Pktlib_HeapStats    pktLibHeapStats;
+              Pktlib_getHeapStats(OurHeap, &pktLibHeapStats);
+              printf("main  heap stats>  #free=%d #zb=%d #garbage=%d\n",
+                                pktLibHeapStats.numFreeDataPackets,
+                                pktLibHeapStats.numZeroBufferPackets,
+                                pktLibHeapStats.numPacketsinGarbage);
+           }
+           else if (c=='S')
+           {
+                system("/usr/bin/dumpqos.sh");
+           }
+           else if (c=='r')
+           {
+              RESET=1;
+           }
+           else if (c=='h')
+           {
+                printf("> 'q' to quit,           's' for Heap stats,  'S' for QOS stats \n");
+                printf("  'c' to toggle capture, 'd' to dump capture, 'r' to reset idle counters\n");
+                printf("  'm' to add macs,       'n' to remove macs   'l' to learn macs\n");
+                printf("  'f' toggle s/w or netcp offload, '!' shell, 'S' Chksum Stats,  'h' for help\n");
+           }
+           else if (c=='d')
+           {
+              netTest_utilDumpHeader(&last_header[0], 0,0,0);
+           }
+           else if (c == 'z')
+            {
+                nwalCtlInfo_t nwalCtrl;
+                NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) netapi_handle;
+                memset(&nwalCtrl, 0, sizeof(nwalCtlInfo_t));
+                nwalCtrl.pktCtl= NWAL_CTRL_CFG_EMAC_IF_EGRESS_EQOS_MODE;
+                nwalCtrl.matchAction =  NWAL_MATCH_ACTION_HOST;
+                nwalCtrl.appRxPktFlowId = NWAL_FLOW_NOT_SPECIFIED;
+                nwalCtrl.appRxPktQueue = NWAL_QUEUE_NOT_SPECIFIED;
+
+                for (i=0; i < MAX_INTERFACES;i++)
+                {
+                    nt_setupQosShapper(netapi_handle,(paEQosModeConfig_t*)&netTestQosShapperCfg[i]);
+                }
+                nwal_control(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &nwalCtrl);
+            }
+            else if (c=='q')
+            {
+                nwalCtlInfo_t nwalCtrl;
+                NETAPI_HANDLE_T * n = (NETAPI_HANDLE_T *) netapi_handle;
+                memset(&nwalCtrl, 0, sizeof(nwalCtlInfo_t));
+                nwalCtrl.pktCtl = NWAL_CTRL_CFG_EMAC_IF_EGRESS_EQOS_MODE;
+                nwalCtrl.matchAction = NWAL_MATCH_ACTION_DISCARD;
+                nwal_control(((NETAPI_GLOBAL_T*) (n->global))->nwal_context.nwalInstHandle, &nwalCtrl);
+
+                QUIT=1;
+                break;
+            }
+        }
+
+        //wait for completion 
+        printf("main task now pending on thread completion\n");
+        for (i = 0; i < procs; i++)
+                pthread_join( thrs[i], NULL );
+
+        free( thrs);
+    }
+
+    /*************************************************
+     ************CLEAN UP****************************
+     ************************************************/
+    //get rid of rule, in the case that we are relaying packets
+    //also close our netcp rx channel
+    if (MAC) 
+    {
+        ntoff_del_macs(netapi_handle);
+#if 0
+       netapi_netcpCfgDelMac(netapi_handle,0,&err);
+       netapi_netcpCfgDelMac(netapi_handle,1,&err);
+#endif
+    }
+    ntoff_stop();
+    netapi_pktioClose(netcp_rx_chan,&err);
+    netapi_pktioClose(netcp_tx_chan,&err);
+    for(i=0;i < MAX_INTERFACES; i++)
+    {
+        netapi_pktioDelete(cpsw_tx_chan[i],&err);
+    }
+
+
+    //done
+    netapi_shutdown(netapi_handle);
+    //!finished!
+}
+static inline void sendit(Ti_Pkt *tip, int len, int out_port)
+{
+      int err=0;
+      PKTIO_METADATA_T meta2 = {PKTIO_META_TX,{0},0};
+      nwalTxPktInfo_t meta_tx2={0};
+      if (len<60)
+      {
+         unsigned int templen;
+         char * p_pkt;
+         len=60;
+         Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+         Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) tip, p_pkt,len);
+      }
+      Pktlib_setPacketLen(tip,len);
+      meta_tx2.txFlag1 = NWAL_TX_FLAG1_META_DATA_VALID ; 
+      meta_tx2.ploadLen = len ;
+      meta_tx2.enetPort=out_port;
+      meta2.u.tx_meta=&meta_tx2;
+      netapi_pktioSend(netcp_tx_chan,tip,&meta2,&err);
+}
+
+//receive callback for packets from net (for consumer)
+void recv_cb_net(struct PKTIO_HANDLE_Tag * channel, Ti_Pkt* p_recv[],
+                         PKTIO_METADATA_T meta[], int n_pkts,
+                         uint64_t ts )
+{
+    int i;
+    Ti_Pkt * tip;
+    int len;
+    unsigned long t1;
+    unsigned long t2;
+    unsigned long t3;
+    unsigned long t4;
+    pasahoLongInfo_t* protoInfo; 
+    int ifno;
+    int out_port;
+
+    t1= netapi_timing_start();
+    for(i=0;i<n_pkts;i++)
+    {
+        tip = p_recv[i];
+        len = Pktlib_getPacketLen(tip);
+
+        if (CAP)
+        {
+           unsigned int templen;
+           char * p_pkt;
+           unsigned long val;
+           unsigned long cs1;
+           unsigned long cs2;
+           Pktlib_getDataBuffer(tip,(uint8_t**)&p_pkt,&templen);//ignore templen
+           memcpy(last_header,p_pkt,32);
+           cs1= netapi_timing_start();
+           val= (unsigned long) checksum((unsigned short *)p_pkt,len);
+           cs2= netapi_timing_start();
+           templen = (len >= NCSUM)? NCSUM-1: len;
+           csum_num[templen]+=1;
+           csum_val[templen]+=val;
+           csum_tim[templen]+= (unsigned long long) (cs2-cs1); 
+        }
+
+        if (XMIT)
+        {
+            protoInfo=nwal_mGetProtoInfo(tip);
+            ifno = nwal_mGetRxEmacPort( protoInfo);
+            //----------------------------------------------------
+            //very trivial bridging -> just output to other port!
+            //----------------------------------------------------
+            if (ifno ==1) out_port=2; else out_port=1;
+            t3= netapi_timing_start();
+            sendit(tip,len,out_port);
+            pkt_tx+=1;
+            t4= netapi_timing_start();
+            pkt_tx_cycles += (t4-t3);
+        }
+        else
+        {
+          Pktlib_freePacket((Ti_Pkt*)tip);
+        }
+    }
+    t2 = netapi_timing_start();
+    pkt_cb_cycles += (t2-t1);
+    }
+
+
+
+
+
diff --git a/ti/runtime/netapi/test/router.c b/ti/runtime/netapi/test/router.c
new file mode 100755
index 0000000..d580578
--- /dev/null
+++ b/ti/runtime/netapi/test/router.c
@@ -0,0 +1,173 @@
+#include "trie.h"
+#include "net_test.h"
+#include "router.h"
+
+
+
+
+Trie * route_init(void)
+{
+    Trie *Pt = trie_new();
+    return Pt;
+}
+
+ 
+
+void route_add(Trie * Pt, unsigned long * Pdest_ipBE, void * Pour_route)
+{
+
+   trie_insert(Pt,(char *)Pdest_ipBE, sizeof(int), Pour_route); 
+}
+
+//route the packet 
+//  lookup next hop in route trie
+int route_pkt(Trie *Pt, void * Ppkt, IP_netTestHead_T *Phead, unsigned char * Pbuf, int * Plen, netTestSA_t **Prs, int *PoutPort)
+{
+    OUR_ROUTE_T *Pr;
+    int ret;
+    Pr = trie_lookup(Pt, (char *) &Phead->dst, 4);
+    if (!Pr ) return -1;  //can't route
+    if (Pr->sec_ptr) 
+    {
+        if(!Prs) return -3;
+        //tunnel i/f
+        ret=process_tunnel(Pt, Ppkt, Phead, Pbuf, Plen, Pr, PoutPort);
+        *Prs = Pr->sec_ptr;
+        return ret;
+    }
+    if (Prs) *Prs=NULL;
+    //simple route
+    //copy new mac
+    memcpy(Pbuf,Pr->out_mac,14);
+    Pbuf[14+8]-=1;  //ttl--
+    //todo do check ttl!
+    Pbuf[14+10]=0; Pbuf[14+11]=0;  //zap [outer] header checksum
+    if(PoutPort) *PoutPort=Pr->out_port;
+    return 1;
+}
+
+int process_tunnel(Trie *Pt, void *Ppkt, IP_netTestHead_T * Phead, 
+                   unsigned char * Pbuf, int* Plen, OUR_ROUTE_T * Proute,
+                   int * PoutPort)
+{
+unsigned char *sb = Pbuf;
+unsigned char *eb= &Pbuf[*Plen]; 
+int newlen=*Plen;
+int seq;
+int pl_len;
+int new_pl_len;
+int pad_len;
+//unsigned char IV[20];
+netTestSA_t * p_sec=Proute->sec_ptr;
+unsigned char *pc;
+int nb;
+int i;
+int ret;
+
+/* move sb to new start */
+sb = sb - p_sec->iv_len-8-20;  //make room for esp header and new outer ip
+newlen +=  (Pbuf-sb);
+
+//adjust IP_Header to make outer:
+Phead->src=p_sec->src;
+Phead->dst=p_sec->dst;
+
+//next_proto
+pc = (unsigned char *)&Phead->w3;
+pc[1]=50;
+
+//payload len
+pc= (unsigned char*)&Phead->w1;
+pl_len=  ((pc[2]<<8) | (pc[3]));  
+
+//only for non-zero bl
+if (p_sec->bl)
+{
+  nb = pl_len/ (p_sec->bl);       //128bits for AES
+  pad_len =   pl_len - nb*p_sec->bl;
+  if (p_sec->bl==16) //AES based
+  {
+    switch(pad_len)
+    {
+    case(15):
+      pad_len=15;
+      break;
+    default:
+      pad_len = p_sec->bl-pad_len-2;
+    }
+  }
+  else //assume 8 byte block (DES)
+  {
+    switch(pad_len)
+    {
+    case(7):
+      pad_len=7;
+      break;
+    default:
+      pad_len = p_sec->bl-pad_len-2;
+    }
+  }
+}
+else
+{
+   pad_len=0;
+}
+
+new_pl_len = pl_len  +20+ 8 + p_sec->iv_len + pad_len + p_sec->auth_tag_size +2;
+pc[2] =  (new_pl_len&0xff00)>>8;
+pc[3] =  (new_pl_len&0xff);
+memcpy(&sb[14],Phead,20);  //copy outer ip header into buffer 
+
+//build esp header
+memcpy(&sb[14+20],(unsigned char *)&p_sec->spi,4);
+seq=BE(p_sec->seq); //TODO: multicore safe ;  CHECK to make sure that SA does this, if so remove this code
+p_sec->seq+=1;
+memcpy(&sb[14+24],(unsigned char *)&seq,4);
+
+//IV: don't need:   Sa does it.
+//memcpy(&sb[14+28],&IV[0],p_sec->iv_len);
+
+//Padding, trailer, room for tag
+for(i=1;i<=pad_len;i++) *eb++ = i;
+*eb++=pad_len; //pad len
+*eb++=4;  //next proto= ipinip
+newlen += pad_len+2+p_sec->auth_tag_size;
+Cppi_setData (Cppi_DescType_HOST, (Cppi_Desc *) Ppkt, sb,newlen);
+Pktlib_setPacketLen(Ppkt,newlen);
+
+//now route based on outer ip
+ret=route_pkt(Pt, Ppkt, Phead, sb, &newlen,NULL,PoutPort);
+if (ret<0) return ret;
+*Plen=newlen;
+return 1;
+} 
+//#define TEST
+#ifdef TEST
+#define NR 4
+OUR_ROUTE_T routes[]=
+{
+{1,{0x00,0x01,0x2,0x03,0x4,0x2, 0x00,0x01,0x02,0x03,0x14,0x02,0x00,0x80},0},
+{2,{0x00,0x01,0x2,0x03,0x4,0x3, 0x00,0x01,0x02,0x03,0x24,0x02,0x00,0x80},0},
+{3,{0x00,0x01,0x2,0x03,0x4,0x4, 0x00,0x01,0x02,0x03,0x34,0x02,0x00,0x80},0},
+{4,{0x00,0x01,0x2,0x03,0x4,0x5, 0x00,0x01,0x02,0x03,0x44,0x02,0x00,0x80},0}};
+
+unsigned int ip[]={BE(0x0a000010),BE(0xa0000110),BE(0x0a000210),BE(0x0a000310)};
+Trie *rt;
+char tp[1500];
+IP_netTestHead_T th={0x00,0x00,0x00,0x01020304,0x1002000a};
+main()
+{
+int i;
+int l;
+int out_port;
+rt = route_init();
+for (i=0;i<NR;i++)
+{  
+  route_add(rt,&ip[i],&routes[i]);
+}
+
+memcpy(&tp[14],&th,20);
+l=1500;
+route_pkt(rt, 0, &th, &tp[0],&l,NULL,&out_port);
+}
+#endif
diff --git a/ti/runtime/netapi/test/router.h b/ti/runtime/netapi/test/router.h
new file mode 100755
index 0000000..5377400
--- /dev/null
+++ b/ti/runtime/netapi/test/router.h
@@ -0,0 +1,34 @@
+#ifndef __ROUTER_H__
+#define __ROUTER_H__
+
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+
+#include "net_test.h"
+#include "net_test_sa_utils.h"
+#include "net_test_utils.h"
+
+typedef struct
+{
+  unsigned long w1;
+  unsigned long w2;
+  unsigned long w3;
+  unsigned long src;
+  unsigned long dst;
+} IP_netTestHead_T;
+
+Trie * route_init(void);
+void route_add(Trie * Pt, unsigned long * Pdest_ipBE, void * Pour_route);
+
+
+int route_pkt(Trie *Pt, void * Ppkt, IP_netTestHead_T *Phead, unsigned char * Pbuf, int * Plen, netTestSA_t **Prs, int *PoutPort);
+int process_tunnel(Trie *Pt, void *Ppkt, IP_netTestHead_T * Phead,
+                   unsigned char * Pbuf, int* Plen, OUR_ROUTE_T * Proute,
+                   int * PoutPort);
+
+#endif
diff --git a/ti/runtime/netapi/test/stubs.c b/ti/runtime/netapi/test/stubs.c
new file mode 100755
index 0000000..b8ce04b
--- /dev/null
+++ b/ti/runtime/netapi/test/stubs.c
@@ -0,0 +1,2 @@
+/* stubs .. */
+/* place holder...*/
diff --git a/ti/runtime/netapi/test/trie.c b/ti/runtime/netapi/test/trie.c
new file mode 100755
index 0000000..b407c52
--- /dev/null
+++ b/ti/runtime/netapi/test/trie.c
@@ -0,0 +1,327 @@
+/*
+
+Copyright (c) 2005, Simon Howard
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+ * Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the 
+   distribution.
+ * Neither the name of the C Algorithms project nor the names of its 
+   contributors may be used to endorse or promote products derived 
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
+ *ALSO:   TI modifications made to support binary data keys
+*
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+*/
+
+/* Trie: fast mapping of strings to values */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "trie.h"
+
+typedef struct _TrieNode TrieNode;
+
+struct _TrieNode {
+        void *data;
+        unsigned int use_count;
+        TrieNode *next[256];
+};
+
+struct _Trie {
+        TrieNode *root_node;
+};
+
+static void trie_free_node(TrieNode *node)
+{
+        int i;
+
+        if (node == NULL)
+                return;
+        
+        /* First, free all subnodes */
+
+        for (i=0; i<256; ++i) {
+                trie_free_node(node->next[i]);
+        }
+
+        /* Free this node */
+
+        free(node);
+}
+
+Trie *trie_new(void)
+{
+        Trie *new_trie;
+
+        new_trie = (Trie *) malloc(sizeof(Trie));
+        new_trie->root_node = NULL;
+
+        return new_trie;
+}
+
+void trie_free(Trie *trie)
+{
+        /* Free the subnode, and all others by implication */
+
+        trie_free_node(trie->root_node);
+
+        /* Free the trie */
+
+        free(trie);
+}
+
+void trie_insert(Trie *trie, char *key, int keylen, void *value)
+{
+        TrieNode **rover;
+        TrieNode *node;
+        unsigned char *p;
+        unsigned char c;
+        int k;
+
+        /* Cannot insert NULL values */
+
+        if (value == NULL) {
+                return;
+        }
+
+        /* Search down the trie until we reach the end of string,
+         * creating nodes as necessary */
+
+        rover = &trie->root_node;
+        p = (unsigned char *) key;
+
+        for (k=0;;) {
+
+                node = *rover;
+
+                if (node == NULL) {
+                        
+                        /* Node does not exist, so create it */
+
+                        node = (TrieNode *) malloc(sizeof(TrieNode));
+                        memset(node, 0, sizeof(TrieNode));
+
+                        /* Link in to the trie */
+
+                        *rover = node;
+                }
+
+                /* One more use of this node */
+
+                ++node->use_count;
+
+                /* Current character */
+
+                c = *p;
+
+                /* Reached the end of string?  If so, we're finished. */
+
+                if (k>=keylen) {
+
+                        /* Set the data at the node we have reached */
+
+                        node->data = value;
+
+                        break;
+                }
+
+                /* Advance to the next node in the chain */
+
+                rover = &node->next[c];
+                ++p; 
+                k+=1;
+        }
+}
+
+void trie_remove(Trie *trie, char *key, int keylen)
+{
+        TrieNode *node;
+        TrieNode *next;
+        TrieNode **last_next_ptr;
+        unsigned char *p;
+        unsigned char c;
+        int k=0;
+        
+        /* First, search down to the ending node so that the data can
+         * be removed. */
+
+        /* Search down the trie until the end of string is reached */
+
+        node = trie->root_node;
+
+        for (p=(unsigned char *) key, k=0; k<keylen; ++p, k+=1) {
+
+                if (node == NULL) {
+                        /* Not found in the tree. Return. */
+
+                        return;
+                }
+
+                /* Jump to the next node */
+
+                c = *p;
+                node = node->next[c];
+        }
+
+        /* Remove the data at this node */
+
+        node->data = NULL;
+
+        /* Now traverse the tree again as before, decrementing the use
+         * count of each node.  Free back nodes as necessary. */
+
+        node = trie->root_node;
+        last_next_ptr = &trie->root_node;
+        p = key;
+
+        for (k=0;;k++) {
+
+                /* Find the next node */
+                
+                c = *p;
+                next = node->next[c];
+
+                /* Free this node if necessary */
+
+                --node->use_count;
+
+                if (node->use_count <= 0) {
+                        free(node);
+
+                        /* Set the "next" pointer on the previous node to NULL,
+                         * to unlink the free'd node from the tree.  This only
+                         * needs to be done once in a remove.  After the first
+                         * unlink, all further nodes are also going to be
+                         * free'd. */
+
+                        if (last_next_ptr != NULL) {
+                                *last_next_ptr = NULL;
+                                last_next_ptr = NULL;
+                        }
+                }
+                
+                /* Go to the next character or finish */
+
+                if (k>=keylen) {
+                        break;
+                } else {
+                        ++p;
+                }
+
+                /* If necessary, save the location of the "next" pointer
+                 * so that it may be set to NULL on the next iteration if
+                 * the next node visited is freed. */
+
+                if (last_next_ptr != NULL) {
+                        last_next_ptr = &node->next[c];
+                }
+                
+                /* Jump to the next node */
+
+                node = next;
+        }
+}
+
+void *trie_lookup(Trie *trie, char *key, int keylen)
+{
+        TrieNode *node;
+        unsigned char *p;
+        unsigned char c;
+        int k=0;
+
+        /* Search down the trie until the end of string is found */
+        
+        node = trie->root_node;
+        p = (unsigned char *) key;
+
+        while (k<keylen ) {
+                if (node == NULL) {
+                        /* Not found - reached end of branch */
+
+                        return NULL;
+                }
+
+                /* Advance to the next node in the chain, next character */
+
+                c = *p;
+                node = node->next[c];
+                ++p;
+                k+=1;
+        }
+        /* bug! */
+        
+        return (node ? node->data : NULL);
+
+}
+
+int trie_num_entries(Trie *trie)
+{
+        /* To find the number of entries, simply look at the use count
+         * of the root node. */
+
+        if (trie->root_node == NULL) {
+                return 0;
+        } else {
+                return trie->root_node->use_count;
+        }
+}
+
+//#define TEST
+#ifdef TEST
+main()
+{
+Trie * p_trie;
+char * p_res;
+p_trie = trie_new();
+if (!p_trie) {netapi_Log("trie alloc failed\n"); exit(1);}
+
+trie_insert(p_trie,"key1","this is key 1");
+trie_insert(p_trie,"key12","this is key 2");
+trie_insert(p_trie,"key3","this is key 3");
+trie_insert(p_trie,"key4","this is key 4");
+
+p_res= trie_lookup(p_trie,"key1");
+netapi_Log("lookup %s = %s\n", "key1", p_res ?  p_res : "not found");
+
+p_res= trie_lookup(p_trie,"key12");
+netapi_Log("lookup %s = %s\n", "key2", p_res ?  p_res : "not found");
+
+p_res= trie_lookup(p_trie,"key3");
+netapi_Log("lookup %s = %s\n", "key3", p_res ?  p_res : "not found");
+
+p_res= trie_lookup(p_trie,"key4");
+netapi_Log("lookup %s = %s\n", "key4", p_res ?  p_res : "not found");
+
+p_res= trie_lookup(p_trie,"key5");
+netapi_Log("lookup %s = %s\n", "key5", p_res ?  p_res : "not found");
+
+p_res= trie_lookup(p_trie,"k5");
+netapi_Log("lookup %s = %s\n", "k5", p_res ?  p_res : "not found");
+
+trie_free(p_trie);
+
+}
+#endif
diff --git a/ti/runtime/netapi/test/trie.h b/ti/runtime/netapi/test/trie.h
new file mode 100755
index 0000000..e77dcc6
--- /dev/null
+++ b/ti/runtime/netapi/test/trie.h
@@ -0,0 +1,127 @@
+/*
+
+Copyright (c) 2005, Simon Howard
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+ * Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the 
+   distribution.
+ * Neither the name of the C Algorithms project nor the names of its 
+   contributors may be used to endorse or promote products derived 
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
+ *  Copyright (c) Texas Instruments Incorporated 2010-2011
+ * ALSO: TI mods to support binary keys
+ * REVISION HISTORY:  rev 0.0.1 
+ *
+*/
+
+/**
+ * @file trie.h
+ *
+ * @brief Fast string lookups
+ *
+ * A trie is a data structure which provides fast mappings from strings
+ * to values.
+ *
+ * To create a new trie, use @ref trie_new.  To destroy a trie,
+ * use @ref trie_free.
+ *
+ * To insert a value into a trie, use @ref trie_insert. To remove a value
+ * from a trie, use @ref trie_remove.  
+ *
+ * To look up a value from its key, use @ref trie_lookup.
+ *
+ * To find the number of entries in a trie, use @ref trie_num_entries.
+ */
+
+#ifndef ALGORITHM_TRIE_H
+#define ALGORITHM_TRIE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _Trie Trie;
+
+/**
+ * Create a new trie.
+ *
+ * @return                   Pointer to a new trie structure.
+ */
+
+Trie *trie_new(void);
+
+/** 
+ * Destroy a trie.
+ *
+ * @param trie               The trie to destroy.
+ */
+
+void trie_free(Trie *trie);
+
+/**
+ * Insert a new key-value pair into a trie.
+ *
+ * @param trie               The trie.
+ * @param key                The key to access the new value.
+ * @param value              The value.
+ */
+
+void trie_insert(Trie *trie, char *key, int keylen, void *value);
+
+/**
+ * Look up a value from its key in a trie.
+ *
+ * @param trie               The trie.
+ * @param key                The key.
+ * @return                   The value associated with the key, or NULL if
+ *                           not found in the trie.
+ */
+
+void *trie_lookup(Trie *trie, char *key, int keylen);
+
+/**
+ * Remove an entry from a trie.
+ *
+ * @param trie               The trie.
+ * @param key                The key of the entry to remove.
+ */
+
+void trie_remove(Trie *trie, char *key, int keylen);
+
+/** 
+ * Find the number of entries in a trie.
+ *
+ * @param trie               The trie.
+ * @return                   Count of the number of entries in the trie.
+ */
+
+int trie_num_entries(Trie *trie);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* #ifndef ALGORITHM_TRIE_H */
+
diff --git a/ti/runtime/netapi/tools/armcc b/ti/runtime/netapi/tools/armcc
new file mode 100755
index 0000000..617e400
--- /dev/null
+++ b/ti/runtime/netapi/tools/armcc
@@ -0,0 +1,2 @@
+#!/bin/sh
+/opt/CodeSourcery/Sourcery_G++_Lite/bin/arm-none-linux-gnueabi-gcc -march=armv7-a -O2 -mcpu='cortex-a8' -pthread -D _GNU_SOURCE $1.c  -o $1 -static-libgcc -lpthread
diff --git a/ti/runtime/netapi/tools/armdump b/ti/runtime/netapi/tools/armdump
new file mode 100755
index 0000000..1f4c09a
--- /dev/null
+++ b/ti/runtime/netapi/tools/armdump
@@ -0,0 +1,2 @@
+
+/opt/CodeSourcery/Sourcery_G++_Lite/bin/arm-none-linux-gnueabi-objdump -D $1 
diff --git a/ti/runtime/netapi/tools/davinci_clocks b/ti/runtime/netapi/tools/davinci_clocks
new file mode 100755
index 0000000..2f7137a
--- /dev/null
+++ b/ti/runtime/netapi/tools/davinci_clocks
@@ -0,0 +1,56 @@
+ref_clk                          users=39     122880000 Hz
+  main_pll                       users=38 pll 983040000 Hz
+    main_div_chip_clk1           users= 3 pll 983040000 Hz
+      emif4f                     users= 1 psc 983040000 Hz
+      crypto                     users= 0 psc 983040000 Hz
+      monza_rst_ctrl             users= 1 psc 983040000 Hz
+      rac                        users= 0 psc 983040000 Hz
+      gem0                       users= 0 psc 983040000 Hz
+      gem1                       users= 0 psc 983040000 Hz
+      gem2                       users= 0 psc 983040000 Hz
+      gem3                       users= 0 psc 983040000 Hz
+      rsax2_1                    users= 0 psc 983040000 Hz
+      rsax2_0                    users= 0 psc 983040000 Hz
+    main_div_gem_trace_clk       users= 1 pll 245760000 Hz
+    main_div_chip_clk2           users= 1 pll 491520000 Hz
+      vusr                       users= 0 psc 491520000 Hz
+      pciex                      users= 0 psc 491520000 Hz
+      msmcsram                   users= 0 psc 491520000 Hz
+      tcp3d                      users= 0 psc 491520000 Hz
+      tcp3d_b                    users= 0 psc 491520000 Hz
+    main_div_chip_clk3           users= 3 pll 327680000 Hz
+      vcp2_a                     users= 0 psc 327680000 Hz
+      debugss_trc                users= 0 psc 327680000 Hz
+      tetb_trc                   users= 0 psc 327680000 Hz
+      pktproc                    users= 1 psc 327680000 Hz
+      cpgmac                     users= 1 psc 327680000 Hz
+      bcp                        users= 0 psc 327680000 Hz
+      tac                        users= 0 psc 327680000 Hz
+      fftc                       users= 0 psc 327680000 Hz
+      aif2                       users= 0 psc 327680000 Hz
+      vcp2_b                     users= 0 psc 327680000 Hz
+      vcp2_c                     users= 0 psc 327680000 Hz
+      vcp2_d                     users= 0 psc 327680000 Hz
+    main_div_stm_clk             users= 1 pll 163840000 Hz
+    main_div_emif_ptv_clk        users= 1 pll  15360000 Hz
+    main_div_chip_clk6           users=20 pll 163840000 Hz
+      modrst0                    users=19     163840000 Hz
+        timer0                   users= 2     163840000 Hz
+        timer1                   users= 2     163840000 Hz
+        uart0                    users= 2     163840000 Hz
+        uart1                    users= 2     163840000 Hz
+        aemif                    users= 2     163840000 Hz
+        usim                     users= 1     163840000 Hz
+        i2c                      users= 2     163840000 Hz
+        spi                      users= 2     163840000 Hz
+        gpio                     users= 2     163840000 Hz
+        key_mgr                  users= 1     163840000 Hz
+    main_div_slowsys_clk         users= 1 pll  15360000 Hz
+    main_div_chip_smreflex_clk   users= 2 pll  81920000 Hz
+      src3_pwr                   users= 1 psc  81920000 Hz
+    main_div_chip_clk3_srio      users= 1 pll 327680000 Hz
+      srio                       users= 0 psc 327680000 Hz
+    main_div_psc_clk6            users= 1 pll 163840000 Hz
+    main_div_chip_dftclk4        users= 1 pll 245760000 Hz
+    main_div_chip_dftclk8        users= 1 pll 122880000 Hz
+
diff --git a/ti/runtime/netapi/tools/dsp_core_setup.sh b/ti/runtime/netapi/tools/dsp_core_setup.sh
new file mode 100755
index 0000000..c36a9c9
--- /dev/null
+++ b/ti/runtime/netapi/tools/dsp_core_setup.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+mpmcl load dsp7 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp7
+#
+mpmcl load dsp6 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp6
+#
+mpmcl load dsp5 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp5
+#
+mpmcl load dsp4 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp4
+#
+mpmcl load dsp3 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp3
+#
+mpmcl load dsp2 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp2
+#
+mpmcl load dsp1 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp1
+#
+mpmcl load dsp0 /home/root/nwalPktRouterArmMASTERk2hTestProject.out
+#
+mpmcl run dsp0
+#
+#
diff --git a/ti/runtime/netapi/tools/dumpdesc.c b/ti/runtime/netapi/tools/dumpdesc.c
new file mode 100755
index 0000000..2e2a1d6
--- /dev/null
+++ b/ti/runtime/netapi/tools/dumpdesc.c
@@ -0,0 +1,132 @@
+/*
+ * devmem2.c: Simple program to read/write from/to any location in memory.
+ *
+ *  Copyright (C) 2000, Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
+ *
+ *
+ * This software has been developed for the LART computing board
+ * (http://www.lart.tudelft.nl/). The development has been sponsored by
+ * the Mobile MultiMedia Communications (http://www.mmc.tudelft.nl/)
+ * and Ubiquitous Communications (http://www.ubicom.tudelft.nl/)
+ * projects.
+ *
+ * The author can be reached at:
+ *
+ *  Jan-Derk Bakker
+ *  Information and Communication Theory Group
+ *  Faculty of Information Technology and Systems
+ *  Delft University of Technology
+ *  P.O. Box 5031
+ *  2600 GA Delft
+ *  The Netherlands
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <signal.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <termios.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+
+//netTest_utilDumpDescr
+void netTest_utilDumpDescr(unsigned long *p, int n)
+{
+   printf("--------dump of descriptor %d %x\n", n, (int) p);
+   printf("> %x %x %x %x %x %x %x %x\n",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+   printf("> %x %x %x %x %x %x %x %x\n",p[8],p[9],p[10],p[11],p[12],p[13],p[14],p[15]);
+   printf("-----------------------------\n");
+}
+
+static inline unsigned long netapi_timing_start(void)
+{
+        volatile int vval;
+        //read clock
+        asm volatile("mrc p15, 0, %0, c9, c13, 0" :  "=r"(vval));
+        return vval;
+}
+static inline unsigned long netapi_timing_stop(void)
+{
+        volatile int vval2;
+        //read clock
+        asm volatile("mrc p15, 0, %0, c9, c13, 0" :  "=r"(vval2));
+        return vval2;
+}
+
+  
+#define FATAL do { fprintf(stderr, "Error at line %d, file %s (%d) [%s]\n", \
+  __LINE__, __FILE__, errno, strerror(errno)); exit(1); } while(0)
+ 
+#define MAP_SIZE 4096UL
+#define MAP_MASK (MAP_SIZE - 1)
+
+
+int cached = 0;
+int test_loc = 1;
+int sum=0;
+
+int main(int argc, char **argv) {
+    int fd;
+    void *map_base, *virt_addr; 
+#define N 50
+        unsigned long read_result[N], writeval;
+        off_t target;
+        int access_type = 'w';
+volatile unsigned long t1;
+volatile unsigned long t2;
+int i;
+int num2dump=32;
+
+        
+        if(argc < 2) {
+                fprintf(stderr, "\nUsage:\t%s { address } nun ] ]\n"
+                        "\taddress : memory address to act upon\n"
+                        "\tnum    : #descriptors to be dumped (def 32)\n\n",
+                        argv[0]);
+                exit(1);
+        }
+        target = strtoul(argv[1], 0, 0);
+        if (argc ==3) num2dump=atoi(argv[2]);
+
+
+    if((fd = open("/dev/mem", ((cached) ? (O_RDWR) : (O_RDWR | O_SYNC)))) == -1) FATAL;
+    netapi_Log("/dev/mem opened.\n"); 
+    fflush(stdout);
+    
+    /* Map one page */
+    map_base = mmap(0, MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, target & ~MAP_MASK);
+    if(map_base == (void *) -1) FATAL;
+    netapi_Log("Memory mapped at address %p. (cached=%d)\n", map_base,cached); 
+    fflush(stdout);
+    
+    virt_addr = map_base + (target & MAP_MASK);
+for(i=0;i<num2dump;i++)
+{
+   long * tip= &((long *)virt_addr)[32*i];
+   netTest_utilDumpDescr(tip, i);
+}
+    if(munmap(map_base, MAP_SIZE) == -1) FATAL;
+    close(fd);
+    return 0;
+}
+
diff --git a/ti/runtime/netapi/tools/eqos/dumpqos.sh b/ti/runtime/netapi/tools/eqos/dumpqos.sh
new file mode 100755
index 0000000..b17701a
--- /dev/null
+++ b/ti/runtime/netapi/tools/eqos/dumpqos.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+#dump L2 Shaper Config and Stats
+#
+echo "**************eth0 L2 QOS:*********************"
+echo " "
+echo "HP Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-hp/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-hp/packets_discarded`
+echo "  - Bytes Sent      = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-hp/bytes_forwarded`
+echo "  - Bytes Dropped   = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-hp/bytes_discarded`
+echo " "
+
+echo "WRR0 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr0/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr0/packets_discarded`
+echo "  - Bytes Sent      = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr0/bytes_forwarded`
+echo "  - Bytes Dropped   = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr0/bytes_discarded`
+echo " "
+
+echo "WRR1 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr1/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr1/packets_discarded`
+echo "  - Bytes Sent      = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr1/bytes_forwarded`
+echo "  - Bytes Dropped   = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr1/bytes_discarded`
+echo " "
+
+echo "WRR2 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr2/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr2/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr2/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr2/bytes_discarded`
+echo " "
+
+echo "WRR3 Queue:"
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr3/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr3/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr3/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr3/bytes_discarded`
+echo " "
+
+echo "WRR4 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr4/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr4/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr4/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr4/bytes_discarded`
+echo " "
+
+echo "WRR5 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr5/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr5/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr5/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-wrr5/bytes_discarded`
+echo " "
+
+echo "BE Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-be/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-be/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-be/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l21-be/bytes_discarded`
+echo " "
+
+echo "***********eth1 L2 QOS:**********************"
+echo " "
+echo "HP Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-hp/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-hp/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-hp/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-hp/bytes_discarded`
+echo " "
+
+echo "WRR0 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr0/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr0/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr0/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr0/bytes_discarded`
+echo " "
+
+echo "WRR1 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr1/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr1/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr1/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr1/bytes_discarded`
+echo " "
+
+echo "WRR2 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr2/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr2/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr2/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr2/bytes_discarded`
+echo " "
+
+echo "WRR3 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr3/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr3/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr3/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr3/bytes_discarded`
+echo " "
+
+echo "WRR4 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr4/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr4/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr4/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr4/bytes_discarded`
+echo " "
+
+echo "WRR5 Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr5/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr5/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr5/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-wrr5/bytes_discarded`
+echo " "
+
+echo "BE Queue: "
+echo "  - Packets Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-be/packets_forwarded`
+echo "  - Packets Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-be/packets_discarded`
+echo "  - Bytes   Sent    = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-be/bytes_forwarded`
+echo "  - Bytes   Dropped = " `cat /sys/devices/soc.0/hwqueue.6/qos-inputs-2//statistics/l22-be/bytes_discarded`
+echo " "
diff --git a/ti/runtime/netapi/tools/eqos/parse_ale.awk b/ti/runtime/netapi/tools/eqos/parse_ale.awk
new file mode 100755
index 0000000..fa8a7fd
--- /dev/null
+++ b/ti/runtime/netapi/tools/eqos/parse_ale.awk
@@ -0,0 +1,21 @@
+BEGIN {j=0}
+// { for(i=1;i<=NF;i++){
+          if ($i ~ "addr") {f=1}
+          else if ($i ~ "port") {f=2;}
+          else if (f==1)
+          {
+            split($i,x,",")
+            printf("mac%d =  %s ", j,x[1]);
+            j++;
+            f=0;
+          }
+          else if (f==2)
+          {
+            printf("swp%d \n", $i);
+            f=0;
+          }
+         }
+       }
+
+END {}
+
diff --git a/ti/runtime/netapi/tools/eqos/parse_ale.sh b/ti/runtime/netapi/tools/eqos/parse_ale.sh
new file mode 100755
index 0000000..e4f6b09
--- /dev/null
+++ b/ti/runtime/netapi/tools/eqos/parse_ale.sh
@@ -0,0 +1 @@
+cat /sys/devices/soc.0/2090000.netcp/ale_table| grep "touched" | grep "addr" | awk -f /etc/transportnetlib/test/parse_ale.awk > ale_table.txt
diff --git a/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.sh b/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.sh
new file mode 100755
index 0000000..9cf2590
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.sh
@@ -0,0 +1,8 @@
+
+sudo ip xfrm state add src 192.168.1.10 dst 192.168.1.100 proto esp spi 0x66666666 mode tunnel reqid 100 replay-window 64 aead "rfc4309(ccm(aes))" 0x00112233445566778899aabbccddeeff001122 128;
+
+sudo ip xfrm policy add dir out src 192.168.1.10 dst 192.168.1.100 proto udp tmpl src 192.168.1.10 dst 192.168.1.100 proto esp mode tunnel reqid 100;
+
+sudo ip xfrm state add src 192.168.1.100 dst 192.168.1.10 proto esp spi 0x66666666 mode tunnel reqid 100 replay-window 64 aead "rfc4309(ccm(aes))" 0x00112233445566778899aabbccddeeff001122 128;
+
+sudo ip xfrm policy add dir in src 192.168.1.100 dst 192.168.1.10 proto udp tmpl src 192.168.1.100 dst 192.168.1.10 proto esp mode tunnel reqid 100;
diff --git a/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.txt b/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.txt
new file mode 100644
index 0000000..a79bfbe
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/aes_ccm.txt
@@ -0,0 +1 @@
+Cipher: aes-ccm loopback sucess.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.sh b/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.sh
new file mode 100755
index 0000000..c5ac88a
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.sh
@@ -0,0 +1,8 @@
+
+sudo ip xfrm state add src 192.168.1.10 dst 192.168.1.100 proto esp spi 0x55555555 mode tunnel reqid 100 replay-window 64 aead "rfc4106(gcm(aes))" 0x00112233445566778899aabbccddeeff00112233 128;
+
+sudo ip xfrm policy add dir out src 192.168.1.10 dst 192.168.1.100 proto udp tmpl src 192.168.1.10 dst 192.168.1.100 proto esp mode tunnel reqid 100;
+
+sudo ip xfrm state add src 192.168.1.100 dst 192.168.1.10 proto esp spi 0x55555555 mode tunnel reqid 100 replay-window 64 aead "rfc4106(gcm(aes))" 0x00112233445566778899aabbccddeeff00112233 128;
+
+sudo ip xfrm policy add dir in src 192.168.1.100 dst 192.168.1.10 proto udp tmpl src 192.168.1.100 dst 192.168.1.10 proto esp mode tunnel reqid 100;
diff --git a/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.txt b/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.txt
new file mode 100644
index 0000000..366162e
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/aes_gcm.txt
@@ -0,0 +1 @@
+Cipher: aes-gcm loopback sucess.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/aes_xcbc.txt b/ti/runtime/netapi/tools/ipsec_tools/aes_xcbc.txt
new file mode 100644
index 0000000..e167ddc
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/aes_xcbc.txt
@@ -0,0 +1 @@
+Cipher: aes-xcbc-mac loopback sucess.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/hmac-sha1_aes-cbc.txt b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha1_aes-cbc.txt
new file mode 100644
index 0000000..c6f2bdf
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha1_aes-cbc.txt
@@ -0,0 +1 @@
+Cipher: aes-cbc, Authentication: hmac-sha1 loopback sucess.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes-ctr.conf b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes-ctr.conf
new file mode 100644
index 0000000..3696745
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes-ctr.conf
@@ -0,0 +1,15 @@
+#!/mnt/host/netbench/setkey -f
+#pc->shannon
+flush;
+spdflush;
+add -4 192.168.1.10 192.168.1.100 esp 0x22222222 -m tunnel -E aes-ctr 0x00112233445566778899aabbccddeeff00112233 -A hmac-sha256 0x000102030405060708090a0b0c0d0e0f101112131415161718191A1B1C1D1E1F;
+
+spdadd 192.168.1.10 192.168.1.100 any -P out ipsec
+        esp/tunnel/192.168.1.10-192.168.1.100/require;
+
+
+add -4 192.168.1.100 192.168.1.10 esp 0x22222222 -m tunnel -E aes-ctr 0x00112233445566778899aabbccddeeff00112233 -A hmac-sha256 0x000102030405060708090a0b0c0d0e0f101112131415161718191A1B1C1D1E1F; 
+                                                                                
+spdadd 192.168.1.100 192.168.1.10 any -P in ipsec
+        esp/tunnel/192.168.1.100-192.168.1.10/require;
+
diff --git a/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes_ctr.txt b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes_ctr.txt
new file mode 100644
index 0000000..27aa0b9
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/hmac-sha256_aes_ctr.txt
@@ -0,0 +1 @@
+Cipher: aes-ctr, Authentication: hmac-sha256 loopback sucess.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/hmac_md5_ah.txt b/ti/runtime/netapi/tools/ipsec_tools/hmac_md5_ah.txt
new file mode 100644
index 0000000..2fb415f
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/hmac_md5_ah.txt
@@ -0,0 +1 @@
+Cipher: NULL, Autentication: hmac_md5 loopback sucess for AH mode.
diff --git a/ti/runtime/netapi/tools/ipsec_tools/sample_evm_ipsec.conf b/ti/runtime/netapi/tools/ipsec_tools/sample_evm_ipsec.conf
new file mode 100755
index 0000000..c7d46e2
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/sample_evm_ipsec.conf
@@ -0,0 +1,83 @@
+# ipsec.conf - strongSwan IPsec configuration file

+#  The following variables will have to be replaced by the automation setup:

+#    %LOCAL_IP_ADDRESS%     = IP address for the side where the ipsec.conf file will reside

+#    %LOCAL_IP_SUBNET%      = IP address or the public side NAT address for the side where the ipsec.conf file will reside

+#    %CERT_FILE_PATH_NAME%  = Certification file and path name. (alpha side = /home/gguser/ipsec/alphaCert.der, beta side = /etc/ipsec.d/certs/betaCert.der)

+#    %LOCAL_CN%             = Local network name (alpha.test.org or beta.test.org)

+#    %REMOTE_CN%            = Remote network name (beta.test.org or alpha.test.org)

+#    %REMOTE_IP_ADDRESS%    = IP address for the remote side

+#    %REMOTE_IP_SUBNET%     = IP address or the public side NAT address for the remote side

+#    %IKE_LIFETIME%         = IKE rekey lifetime (48H for 48 hours)

+#    %LIFETIME%             = Rekey lifetime (48H for 48 hours)"

+#    %LOCAL_IPV6_ADDRESS%   = Local side IPV6 address (2000::1)

+#    %REMOTE_IPV6_ADDRESS%  = Remote side IPV6 address (2000::2)

+#    %CONNECTION_SIDE%      = Connection side indicator. (Alpha  for alpha side, Beta  for beta side)

+#    %CONNECTION_NAME%      = Connection side name. (Udp, Tcp, Sctp, Link, Conn ...)

+#    %PROTOCOL%             = Protocol to be used for link (udp, tcp, sctp ...)

+#    %ESP_ENCRYPTION%       = Esp encryption to be used (aes128, aes192, 3des ...)

+#    %ESP_INTEGRITY%        = Esp integrity to be used (sha1, aesxcbc ...)

+

+# basic configuration

+config setup

+    strictcrlpolicy=no

+    charondebug=all

+

+# Add connections here.

+conn %default

+    left=192.168.1.50

+    leftcert=/etc/ipsec.d/certs/betaCert.der

+    leftid="C=US, O=Test, CN=beta.test.org"

+    right=192.168.1.84

+    rightid="C=US, O=Test, CN=alpha.test.org"

+    keyexchange=ikev2

+    ike=aes128-sha1-modp2048!

+    type=tunnel

+    esp=aes128-sha1-modp2048-noesn!

+    margintime=1h

+    ikelifetime=168h

+    lifetime=168h

+    reauth=no

+

+conn Beta-Conn1

+    leftsubnet=192.168.1.50/32[udp],192.168.1.51/32[udp]

+    rightsubnet=192.168.1.84/32[udp],192.168.1.85/32[udp]

+    auto=add

+

+conn Beta-Conn9

+    leftprotoport=udp

+    leftsubnet=192.168.1.51/32

+    rightprotoport=udp

+    rightsubnet=192.168.1.85/32

+    auto=add

+

+conn Beta-Conn2

+    leftprotoport=udp

+    leftsubnet=2000::3/64

+    rightprotoport=udp

+    rightsubnet=2000::1/64

+    auto=add

+

+conn Beta-Conn3

+    leftprotoport=udp

+    leftsubnet=192.168.1.50/32

+    rightprotoport=udp

+    rightsubnet=192.168.1.84/32

+    type=passthrough

+    authby=never

+    auto=add

+

+conn Beta-Conn4

+    leftprotoport=udp

+    leftsubnet=2000::3/64

+    rightprotoport=udp

+    rightsubnet=2000::1/64

+    type=passthrough

+    authby=never

+    auto=add

+

+conn Beta-Icmp1

+    leftprotoport=icmp

+    leftsubnet=192.168.1.50/32

+    rightprotoport=icmp

+    rightsubnet=192.168.1.84/32

+    auto=add

diff --git a/ti/runtime/netapi/tools/ipsec_tools/sample_pc_ipsec.conf b/ti/runtime/netapi/tools/ipsec_tools/sample_pc_ipsec.conf
new file mode 100755
index 0000000..73ee1ce
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/sample_pc_ipsec.conf
@@ -0,0 +1,84 @@
+# ipsec.conf - strongSwan IPsec configuration file
+#  The following variables will have to be replaced by the automation setup:
+#    %LOCAL_IP_ADDRESS%     = IP address for the side where the ipsec.conf file will reside
+#    %LOCAL_IP_SUBNET%      = IP address or the public side NAT address for the side where the ipsec.conf file will reside
+#    %CERT_FILE_PATH_NAME%  = Certification file and path name. (alpha side = /home/gguser/ipsec/alphaCert.der, beta side = /etc/ipsec.d/certs/betaCert.der)
+#    %LOCAL_CN%             = Local network name (alpha.test.org or beta.test.org)
+#    %REMOTE_CN%            = Remote network name (beta.test.org or alpha.test.org)
+#    %REMOTE_IP_ADDRESS%    = IP address for the remote side
+#    %REMOTE_IP_SUBNET%     = IP address or the public side NAT address for the remote side
+#    %IKE_LIFETIME%         = IKE rekey lifetime (48H for 48 hours)
+#    %LIFETIME%             = Rekey lifetime (48H for 48 hours)"
+#    %LOCAL_IPV6_ADDRESS%   = Local side IPV6 address (2000::1)
+#    %REMOTE_IPV6_ADDRESS%  = Remote side IPV6 address (2000::2)
+#    %CONNECTION_SIDE%      = Connection side indicator. (Alpha  for alpha side, Beta  for beta side)
+#    %CONNECTION_NAME%      = Connection side name. (Udp, Tcp, Sctp, Link, Conn ...)
+#    %PROTOCOL%             = Protocol to be used for link (udp, tcp, sctp ...)
+#    %ESP_ENCRYPTION%       = Esp encryption to be used (aes128, aes192, 3des ...)
+#    %ESP_INTEGRITY%        = Esp integrity to be used (sha1, aesxcbc ...)
+
+# basic configuration
+config setup
+    strictcrlpolicy=no
+    charondebug=all
+
+# Add connections here.
+conn %default
+    left=192.168.1.84
+    leftcert=/etc/ipsec.d/certs/alphaCert.der
+    leftid="C=US, O=Test, CN=alpha.test.org"
+    right=192.168.1.50
+    rightid="C=US, O=Test, CN=beta.test.org"
+    keyexchange=ikev2
+    ike=aes128-sha1-modp2048!
+    type=tunnel
+    esp=aes128-sha1-modp2048-noesn!
+    margintime=1h
+    ikelifetime=168h
+    lifetime=168h
+    reauth=no
+
+conn Alpha-Conn1
+    leftsubnet=192.168.1.84/32[udp],192.168.1.85/32[udp]
+    rightsubnet=192.168.1.50/32[udp],192.168.1.51/32[udp]
+    auto=add
+
+conn Alpha-Conn9
+    leftprotoport=udp
+    leftsubnet=192.168.1.85/32
+    rightprotoport=udp
+    rightsubnet=192.168.1.51/32
+    auto=add
+
+conn Alpha-Conn2
+    leftprotoport=udp
+    leftsubnet=2000::1/64
+    rightprotoport=udp
+    rightsubnet=2000::3/64
+    auto=add
+
+conn Alpha-Conn3
+    leftprotoport=udp
+    leftsubnet=192.168.1.84/32
+    rightprotoport=udp
+    rightsubnet=192.168.1.50/32
+    type=passthrough
+    authby=never
+    auto=add
+    
+conn Alpha-Conn4
+    leftprotoport=udp
+    leftsubnet=2000::1/64
+    rightprotoport=udp
+    rightsubnet=2000::3/64
+    type=passthrough
+    authby=never
+    auto=add
+
+conn Alpha-Icmp1
+    leftprotoport=icmp
+    leftsubnet=192.168.1.84/32
+    rightprotoport=icmp
+    rightsubnet=192.168.1.50/32
+    auto=add
+
diff --git a/ti/runtime/netapi/tools/ipsec_tools/sectest.sh b/ti/runtime/netapi/tools/ipsec_tools/sectest.sh
new file mode 100755
index 0000000..61786e3
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/sectest.sh
@@ -0,0 +1,50 @@
+if [ $# -ne 2 ]; then
+    echo "Usage ./sectest.sh <dest udp port> <dest ip address>"
+    exit
+fi
+sudo setkey -f setkeycleanup.conf
+sudo setkey -f setkey_hmac-sha1_aes-cbc.conf
+echo "Sending packet with hmac-sha1_aes-cbc"
+../udpif S hmac-sha1_aes-cbc.txt $1 $2 
+sleep 1
+#
+echo "Cleaning up SAD entries"
+sudo setkey -f setkeycleanup.conf
+echo "Sending packet with aes_gcm"
+./aes_gcm.sh
+../udpif S aes_gcm.txt $1 $2 
+sleep 1
+#
+echo "Cleaning up SAD entries"
+sudo setkey -f setkeycleanup.conf
+echo "Sending packet with aes_ccm"
+./aes_ccm.sh
+../udpif S aes_ccm.txt $1 $2
+sleep 1
+#
+echo "Cleaning up SAD entries"
+sudo setkey -f setkeycleanup.conf
+echo "Sending packet with aes_xcbc"
+sudo setkey -f setkey_aes_xcbc.conf
+../udpif S aes_xcbc.txt $1 $2
+sleep 1
+#
+echo "Cleaning up SAD entries"
+sudo setkey -f setkeycleanup.conf
+echo "Sending packet with hmac-sha256_aes-ctr"
+sudo setkey -f hmac-sha256_aes-ctr.conf 
+../udpif S hmac-sha256_aes_ctr.txt $1 $2
+sleep 1
+#
+echo "Cleaning up SAD entries"
+sudo setkey -f setkeycleanup.conf
+echo "Sending packet with hmac-md5 AH mode"
+sudo setkey -f setkey_hmac-md5_ah.conf 
+../udpif S hmac_md5_ah.txt $1 $2
+sleep 1
+
+sudo setkey -f setkeycleanup.conf
+
+#sudo setkey -f setkeycleanup.conf
+#sudo setkey -f setkey_3des_cbc.conf 
+#./udpif S 3des_cbc.txt $1   $2
diff --git a/ti/runtime/netapi/tools/ipsec_tools/setkey_aes_xcbc.conf b/ti/runtime/netapi/tools/ipsec_tools/setkey_aes_xcbc.conf
new file mode 100644
index 0000000..915ac4c
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/setkey_aes_xcbc.conf
@@ -0,0 +1,15 @@
+#!/mnt/host/netbench/setkey -f
+#pc->shannon
+flush;
+spdflush;
+add -4 192.168.1.10 192.168.1.100 esp 0x77777777 -m tunnel -E null -A aes-xcbc-mac 0x000102030405060708090a0b0c0d0e0f;
+
+spdadd 192.168.1.10 192.168.1.100 any -P out ipsec
+        esp/tunnel/192.168.1.10-192.168.1.100/require;
+
+
+add -4 192.168.1.100 192.168.1.10 esp 0x77777777 -m tunnel -E null -A aes-xcbc-mac 0x000102030405060708090a0b0c0d0e0f; 
+                                                                                
+spdadd 192.168.1.100 192.168.1.10 any -P in ipsec
+        esp/tunnel/192.168.1.100-192.168.1.10/require;
+
diff --git a/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-md5_ah.conf b/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-md5_ah.conf
new file mode 100644
index 0000000..bd05fa0
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-md5_ah.conf
@@ -0,0 +1,15 @@
+#!/mnt/host/netbench/setkey -f
+#pc->shannon
+flush;
+spdflush;
+add -4 192.168.1.10 192.168.1.100 ah 0x44444444 -m tunnel -E null -A hmac-md5 0x000102030405060708090a0b0c0d0e0f;
+
+spdadd 192.168.1.10 192.168.1.100 any -P out ipsec
+        ah/tunnel/192.168.1.10-192.168.1.100/require;
+
+
+add -4 192.168.1.100 192.168.1.10 ah 0x44444444 -m tunnel -E null -A hmac-md5 0x000102030405060708090a0b0c0d0e0f; 
+                                                                                
+spdadd 192.168.1.100 192.168.1.10 any -P in ipsec
+        ah/tunnel/192.168.1.100-192.168.1.10/require;
+
diff --git a/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-sha1_aes-cbc.conf b/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-sha1_aes-cbc.conf
new file mode 100644
index 0000000..d65b144
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/setkey_hmac-sha1_aes-cbc.conf
@@ -0,0 +1,15 @@
+#!/mnt/host/netbench/setkey -f
+#pc->shannon
+flush;
+spdflush;
+add -4 192.168.1.10 192.168.1.100 esp 0x11111111 -m tunnel -E rijndael-cbc 0x55112233445566778899aabbccddeeff00112233445566778899aabbccddeeff -A hmac-sha1 0x000102030405060708090a0b0c0d0e0f10111213;
+
+spdadd 192.168.1.10 192.168.1.100 any -P out ipsec
+        esp/tunnel/192.168.1.10-192.168.1.100/require;
+
+
+add -4 192.168.1.100 192.168.1.10 esp 0x11111111 -m tunnel -E rijndael-cbc 0x55112233445566778899aabbccddeeff00112233445566778899aabbccddeeff -A hmac-sha1 0x000102030405060708090a0b0c0d0e0f10111213;
+                                                                                
+spdadd 192.168.1.100 192.168.1.10 any  -P in ipsec
+        esp/tunnel/192.168.1.100-192.168.1.10/require;
+
diff --git a/ti/runtime/netapi/tools/ipsec_tools/setkeycleanup.conf b/ti/runtime/netapi/tools/ipsec_tools/setkeycleanup.conf
new file mode 100644
index 0000000..05a0dc4
--- /dev/null
+++ b/ti/runtime/netapi/tools/ipsec_tools/setkeycleanup.conf
@@ -0,0 +1,4 @@
+#!/mnt/host/netbench/setkey -f
+#pc->shannon
+flush;
+spdflush;
diff --git a/ti/runtime/netapi/tools/irqset.sh b/ti/runtime/netapi/tools/irqset.sh
new file mode 100755
index 0000000..d86b85e
--- /dev/null
+++ b/ti/runtime/netapi/tools/irqset.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# set smp_affinity of IRQs to core slow path core 1
+DEFAULT_IRQ_MASK=1
+for I in /proc/irq/*/smp_affinity
+do
+/bin/echo $DEFAULT_IRQ_MASK > $I 2> /dev/null
+done
diff --git a/ti/runtime/netapi/tools/kernel_patches/0001-PA-Firmware-Update-and-dma-config.patch b/ti/runtime/netapi/tools/kernel_patches/0001-PA-Firmware-Update-and-dma-config.patch
new file mode 100644
index 0000000..94b50fe
--- /dev/null
+++ b/ti/runtime/netapi/tools/kernel_patches/0001-PA-Firmware-Update-and-dma-config.patch
@@ -0,0 +1,2453 @@
+From 1f8bbe608022fe8c3733d60fd235bf8ee50d9bbc Mon Sep 17 00:00:00 2001
+From: Raghu Nambiath <a0850439@gtlnx01.gt.design.ti.com>
+Date: Thu, 20 Sep 2012 14:58:28 +0000
+Subject: [PATCH] Update PA Firmware and QMSS Device memory config
+
+---
+ arch/arm/include/asm/pgtable.h              |    2 +-
+ drivers/net/ethernet/ti/keystone_pa.c       |    6 +-
+ firmware/Makefile                           |    6 +-
+ firmware/keystone/pa_pdsp02_1_2_1_2.fw.ihex |  471 -------------------------
+ firmware/keystone/pa_pdsp02_1_3_0_2.fw.ihex |  501 +++++++++++++++++++++++++++
+ firmware/keystone/pa_pdsp3_1_2_1_2.fw.ihex  |  280 ---------------
+ firmware/keystone/pa_pdsp3_1_3_0_2.fw.ihex  |  282 +++++++++++++++
+ firmware/keystone/pa_pdsp45_1_2_1_2.fw.ihex |  357 -------------------
+ firmware/keystone/pa_pdsp45_1_3_0_2.fw.ihex |  445 ++++++++++++++++++++++++
+ 9 files changed, 1235 insertions(+), 1115 deletions(-)
+ mode change 100644 => 100755 arch/arm/include/asm/pgtable.h
+ mode change 100644 => 100755 drivers/net/ethernet/ti/keystone_pa.c
+ delete mode 100644 firmware/keystone/pa_pdsp02_1_2_1_2.fw.ihex
+ create mode 100755 firmware/keystone/pa_pdsp02_1_3_0_2.fw.ihex
+ delete mode 100644 firmware/keystone/pa_pdsp3_1_2_1_2.fw.ihex
+ create mode 100755 firmware/keystone/pa_pdsp3_1_3_0_2.fw.ihex
+ delete mode 100644 firmware/keystone/pa_pdsp45_1_2_1_2.fw.ihex
+ create mode 100755 firmware/keystone/pa_pdsp45_1_3_0_2.fw.ihex
+
+diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
+old mode 100644
+new mode 100755
+index f66626d..95bd431
+--- a/arch/arm/include/asm/pgtable.h
++++ b/arch/arm/include/asm/pgtable.h
+@@ -105,7 +105,7 @@ extern pgprot_t             pgprot_kernel;
+ 
+ #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
+ #define pgprot_dmacoherent(prot) \
+-       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_BUFFERABLE | L_PTE_XN)
++       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_WRITEBACK| L_PTE_XN)
+ #define __HAVE_PHYS_MEM_ACCESS_PROT
+ struct file;
+ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
+diff --git a/drivers/net/ethernet/ti/keystone_pa.c b/drivers/net/ethernet/ti/keystone_pa.c
+old mode 100644
+new mode 100755
+index 76426b4..1a44b6a
+--- a/drivers/net/ethernet/ti/keystone_pa.c
++++ b/drivers/net/ethernet/ti/keystone_pa.c
+@@ -1158,11 +1158,11 @@ int pa_open(struct netcp_module_data *data, const u8 *mac_addr)
+ 
+        for (i = 0; i <= 5; i++) {
+                if (i <= 2)
+-                       ret = request_firmware(&fw, "keystone/pa_pdsp02_1_2_1_2.fw", pa_dev->dev);
++                       ret = request_firmware(&fw, "keystone/pa_pdsp02_1_3_0_2.fw", pa_dev->dev);
+                else if (i == 3)
+-                       ret = request_firmware(&fw, "keystone/pa_pdsp3_1_2_1_2.fw", pa_dev->dev);
++                       ret = request_firmware(&fw, "keystone/pa_pdsp3_1_3_0_2.fw", pa_dev->dev);
+                else if (i > 3)
+-                       ret = request_firmware(&fw, "keystone/pa_pdsp45_1_2_1_2.fw", pa_dev->dev);
++                       ret = request_firmware(&fw, "keystone/pa_pdsp45_1_3_0_2.fw", pa_dev->dev);
+                if (ret != 0) {
+                        dev_err(pa_dev->dev, "cannot find firmware for pdsp %d\n", i);
+                        ret = -ENODEV;
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 0b37f5b..2dc4b54 100644
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -104,9 +104,9 @@ fw-shipped-$(CONFIG_TI_KEYSTONE) += keystone/sa_pdsp0_1_0_2_1.fw \
+                                    keystone/sa_pdsp1_1_0_2_1.fw \
+                                    keystone/qmss_pdsp_acc48_le_1_0_2_0.fw \
+                                    keystone/qmss_pdsp_acc48_be_1_0_2_0.fw \
+-                                   keystone/pa_pdsp02_1_2_1_2.fw \
+-                                   keystone/pa_pdsp3_1_2_1_2.fw \
+-                                   keystone/pa_pdsp45_1_2_1_2.fw
++                                   keystone/pa_pdsp02_1_3_0_2.fw \
++                                   keystone/pa_pdsp3_1_3_0_2.fw \
++                                   keystone/pa_pdsp45_1_3_0_2.fw
+ fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
+ fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
+ fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
+diff --git a/firmware/keystone/pa_pdsp02_1_2_1_2.fw.ihex b/firmware/keystone/pa_pdsp02_1_2_1_2.fw.ihex
+deleted file mode 100644
+index 83e12c3..0000000
+--- a/firmware/keystone/pa_pdsp02_1_2_1_2.fw.ihex
++++ /dev/null
+@@ -1,471 +0,0 @@
+-:100000000079002184505024C4848410E5E4E41075
+-:10001000E6E4E410E7E4E410E8E4E410E9E4E410E2
+-:10002000EAE4E410EBE4E41084E3008384E3208357
+-:1000300084E3408384E3608384E3808384E3A08358
+-:1000400084E3C08384E3E0830443002464030481E5
+-:100050000444002464032981040A002464033281D7
+-:10006000040C0024640333810409002464032F81F9
+-:100070000453002464030681040500246403008102
+-:100080000406002464032B810407002464032C81EC
+-:100090000408002464033C8104510024640311819A
+-:1000A0000452002464038881040F002464038481C3
+-:1000B00080A7FF2E80F3008980F3508980FA0087A3
+-:1000C00080FA408780FA808780FAC087E5000024A4
+-:1000D000E1E001248887FF2E6805002488F4E5808C
+-:1000E000E5E51001FEE5E16EC800812488A88824BA
+-:1000F000C900082489DD8624CA4788248A488824C0
+-:10010000CB6488248B63882488F54081E500002433
+-:1001100085356081899FFF2E85000024C500082455
+-:1001200089F6858685854001FE85C56E040000241C
+-:100130006418008104010024641820810402002452
+-:1001400064184081040300246418608104040024BE
+-:1001500064188081040500246418A081E001002453
+-:10016000E1640024806A0481828DFF2E82B3A08323
+-:100170006202002442020024220200248233A08171
+-:1001800065400024454000248533AC81F4000424FC
+-:10019000F50008248000A024C000A0248020F48062
+-:1001A000F4F40401FEF4F56EF4000824F5001024C4
+-:1001B000809FFF2E80E0F486F4F44001FEF4F56E9B
+-:1001C000F480002480E0F480F480012480E0F48056
+-:1001D000F480022480E0F480F480032480E0F48042
+-:1001E00000009E209E0F02238285FF2E82A40481A0
+-:1001F000E20100248224008100FF00C900FF00D139
+-:1002000004FF01C99E010023E2000024822404812E
+-:100210009D81FF2E9B81FF2E1D17009105FF09C9AF
+-:10022000FFFF091F81356091E1E1010181356081A6
+-:1002300013FF01C9017D03110301025181A40024B0
+-:100240000092002181A800248E3381908FBB009101
+-:10025000046E00697D7D031D8F85FF2E009C0021AB
+-:100260007D7D031F6F6E6E10D08E8E10304E4E103F
+-:100270008FBB0081E10000248124048108FF03C9B1
+-:1002800081240C91030100515D5D071F00A5002131
+-:100290005D5D071DE100002481240C811DFF05C95F
+-:1002A000177D07C9027D06C900FF0AD119FF0AD1CF
+-:1002B0008501812E030503C99ECE002300B10021D4
+-:1002C0009E6A01230C7D06C97D7D061D047D04D137
+-:1002D000050400248501012F00C400217D7D041D3B
+-:1002E00003DE03519E91012300BD0021E42300247D
+-:1002F0008401002F7D7D071D00C4002104FC11C96D
+-:100300008181FF2EE1E1111F812D0081FBFB131F75
+-:10031000027D05D1D1FF04D1027D05C905FF0AC9BF
+-:10032000BFFB00579B2C08819B81FF2E008700217B
+-:1003300000EC042100C80021FBFB061F81250609F3
+-:1003400088318192817D031181E106098181251225
+-:1003500081810A1FC1082681D00824911C69026985
+-:100360007A1903D106680051C808228161082D91CD
+-:100370000101E0110101481261082D810E4A00516E
+-:100380006108269101010711212A030901012112A7
+-:100390006108268161082D910101E011034A015194
+-:1003A0002116002400EB0021210D0024010121125F
+-:1003B00061082D81E4235024446A6A1064180024E3
+-:1003C0008403002F686C035100009E20216900699E
+-:1003D0008A281881050B00516208099102020F1149
+-:1003E00002020B126208098196682091021C002407
+-:1003F0004C5605D1486C0151476C0451096B00699A
+-:10040000E423F0244406002464180024C5898910DC
+-:10041000054949108403002F536C035100009E20AE
+-:100420007676A0135656071F37370711034B03097B
+-:100430003737031296682081E4235024641800247F
+-:10044000442B2B108403002F476C035100009E2087
+-:100450000D6901693D1903D18A6818812E6C01511B
+-:100460002D6C0451E423F024641800244406002475
+-:10047000C5898910054949108403002F3A6C03513E
+-:1004800000009E200E6904698A6820816208089134
+-:1004900002020711226C030902022212620808817B
+-:1004A000E423F0246408002444060024C58989104C
+-:1004B000054949108403002F00009E200B69036941
+-:1004C0006208099102020F1102026A126208098190
+-:1004D000E423502464000024440700248403002FF4
+-:1004E000216C035100009E2006690551FBFB141F7F
+-:1004F00004FC14C98281FF2EE2E2141F822D0081C8
+-:10050000FBFB111F042400248403002F166C0351ED
+-:1005100000009E205656061F2C0830810218002429
+-:100520007676A0139668208129080B81C90812816C
+-:10053000E423502444040024640202108403002FA6
+-:10054000096C045100009E201919031D373707114B
+-:1005500037373813570826818170002489F4819039
+-:1005600000D60021D08C8C108F198091014F04018E
+-:1005700001011F11036F0168FBFB141F00009E2087
+-:10058000C14F90019039C1806119818100009E2086
+-:10059000DEDE040986F4DE908381FF2EE3E3111F83
+-:1005A0009EC6002400F70321FBFB071F96682091DD
+-:1005B00001560F110E010051035603C981F00024AA
+-:1005C00000780121035602C981E00024007801214E
+-:1005D000035600C981C000240078012181D0002485
+-:1005E00089F481900269055100D6002106970AD14D
+-:1005F0003737F81137370013D708268189F400916F
+-:1006000000D6002181973F118181060981810C1F4D
+-:1006100081811401C197060BC1C1071103C1006993
+-:1006200089E0819000D6002103C1016989E18190B0
+-:1006300000D6002103C1026989E2819000D6002121
+-:10064000003B012196682091DE37030BDEDE0409B2
+-:1006500086F4DE9000D60021FBFB001F8124009170
+-:10066000E1E1010181240081868F802E09CA0ED12B
+-:10067000CA810E1F8A80002FE1003024802108F1FA
+-:10068000C0FFFF248BC080048B1562918B81002FEB
+-:10069000040800248403002F0431002424200024B3
+-:1006A0008403002F13C9005104C908690168030BB2
+-:1006B00017011E5116011F519689802E0176050BD8
+-:1006C0001C0100515C010551A8010451FBFB121FE4
+-:1006D00004FC13C98081FF2EE0E0131F802D0081F0
+-:1006E0008483FF2E042100248403002F008700212F
+-:1006F0009689FF2ED789891010FC00C98081FF2EB2
+-:10070000E0E0001F802D008100CE01219689FF2EA0
+-:10071000D789891004FC00C98081FF2EE0E0001F0A
+-:10072000802D0081591000249EE701240028072114
+-:10073000040D00248403002F04000024C4969610A6
+-:100740008403002F03591F11DE0000241D00002424
+-:100750000B030D5137370711090310613737281381
+-:10076000FBFB0D1FDE0200240DFC07C98081FF2E5C
+-:10077000E0E0071F802D008100E701218E8FFF2E12
+-:100780008E87012F8E0F022F8E87022F0003010903
+-:10079000801500909E00C022FDDE00575959E011DF
+-:1007A0005959031200FF07C97618002496272083A1
+-:1007B0000EDE016904200024240800248403002F95
+-:1007C000091D1D106980022F067D07D17D7D071F41
+-:1007D0000504002400FF0AD18501012F00C6002175
+-:1007E0007D7D061F00C6002111DE0451087D07C96A
+-:1007F0007D7D041F04200024245800246418002454
+-:10080000440600248403002F00F8012103DE035175
+-:10081000DE37030B00640121842050246418002477
+-:10082000440600248403002F00C600210421002474
+-:10083000000902219E87002400D50321E300002443
+-:1008400007E3405900FF0AD125E3E3100502002425
+-:100850008501012FE3E30101001002218391FF2EA6
+-:10086000630000246405002468050024820000243D
+-:10087000C20010248331828482824001FE82C26ED3
+-:100880008883FF2E887900818A81FF2E8A3908812A
+-:10089000C8F80424884B0524C9FB0524895F052476
+-:1008A000CA2606248A5A0624CB7706248B8206247D
+-:1008B000CC9206248C9D0624CDC406248DCE06241D
+-:1008C000CED806248E070724CF0E06248FE60624F2
+-:1008D000D0FF0624002000240000020108D5008F6C
+-:1008E0009C81FF2E60170091030000518E85FF2E22
+-:1008F0008EBB008100009E208A81802E046A407198
+-:10090000E60400248681002F00790221817900917C
+-:10091000036A2059E2E26A1C004902214A6A200562
+-:10092000E1E14A1C817900818D91FF2E6E05002442
+-:100930007205002407FF0AD1256A6A100502002407
+-:100940008501012F806A06098D318084007902219A
+-:100950006B0000244B6A6A108B3908818D390C8535
+-:100960007D7D051F00790221DA000024808989102D
+-:10097000040D00248403002F8687802E00FF07C902
+-:10098000882718810447CE51E60100248681002F74
+-:10099000007902215A0000240F6701510F670251AC
+-:1009A0000F6703510F670451A667065157670C5133
+-:1009B0004B670A53D267085105670B5324670953E5
+-:1009C00024670551C5670751E60200248681002F80
+-:1009D0000079022100870421003E022100840421C5
+-:1009E000008404211529066981240891E1E10101AF
+-:1009F00081240881067A00C904430024C45A5A108D
+-:100A000024040024E5E6E6108403002F640000249B
+-:100A100044292910C5C9C91005090910042000245A
+-:100A200024F0002461170091020003599EE404237E
+-:100A30008403002F00C80021E42100248401002F3A
+-:100A400081240C91E1E1010181240C8100C8002185
+-:100A500004803459E60F00248681002F007902219A
+-:100A6000E60000248681002F8A87802E040000245F
+-:100A7000C42000248403002F8E87802E026A00C9C0
+-:100A80008B33A081056A01C98C33A48161010024E4
+-:100A9000E2100024812204E1056A02C98D33A88195
+-:100AA00061010024E2200024812204E1026A03C9DA
+-:100AB0008E33AC81026A04C98F33B081026A05C9E2
+-:100AC0009033B4810E6A06C9C1000124810000245C
+-:100AD000027100C981010024E200002481220CE19E
+-:100AE00081000024027101C981010024E210002468
+-:100AF00081220CE1E220002481220CE1BA6A07CFB6
+-:100B0000FCF2F21000790221E60000248681002F19
+-:100B10008A83802E04000024096A0069C0F8012439
+-:100B20000480C058E60F00248681002F007902213E
+-:100B3000C41800248403002F00060321C4140024D9
+-:100B40008403002F176A016904803C59E60F0024D2
+-:100B50007A7A001F007902218E83802E046E047140
+-:100B6000E61000247A7A001F00790221816E0509BF
+-:100B7000C16E03098181C100818100018E73818072
+-:100B8000C40800248403002F8E8F802E81810801E9
+-:100B90008EF38182C42000248403002F0079022177
+-:100BA0000E6A026904802459E60F00247A7A001F35
+-:100BB000007902218E87802E046E1071E6110024C8
+-:100BC0007A7A001F00790221816E04098181000177
+-:100BD0008EFA8180007902210D6A03690480185918
+-:100BE000E60F00247A7A001F007902218E81802E80
+-:100BF0005D5D061D056E00C95D5D061F5D5D051D21
+-:100C0000026E01C95D5D051F00790221E602002424
+-:100C10007A7A001F00790221E1000024C410002428
+-:100C20008E87802E8403002F02EB01C88EF4C180D2
+-:100C300001010101C1C11001FA011E670079022101
+-:100C40008A83802E04000024C41800248403002F0B
+-:100C5000194A0151E1000024026A00518101FF2E6E
+-:100C6000812C0C8183000F2486E28380C20400243F
+-:100C700082804F24E120602486E100F786E200E7CD
+-:100C80008483FF2E2440002404370024E5E2E21090
+-:100C90008403002FE1E14001E2E2400186E100F738
+-:100CA00086E200E7E5E2E2108403002F86E283900B
+-:100CB00000790221086A00518E8FFF2EE20008247D
+-:100CC000E1000824E1E1E2008EE0E282E2E22001BC
+-:100CD000FEE2E16E0079022104000024C410002429
+-:100CE0008403002F240C0024043300248403002FE9
+-:100CF0008EB700918E85002F00790221C054002408
+-:100D00000480C058E60F00248681002F007902215C
+-:100D10008A81802E046A2071E60E00248681002FCD
+-:100D2000007902218E8FFF2EC26A0609144A0069DB
+-:100D300004000024C41400248403002F6020002435
+-:100D4000022A0459602A03098EBF802E8EF6C282C1
+-:100D50008E8FFF2EC2C22001072A047104000024D6
+-:100D6000C42000248403002F602A04056060030966
+-:100D70008EBF802E8EF6C28200790221054A01695B
+-:100D80008EF6C282C2C220018EF6C2820079022192
+-:100D90000C4A026904000024C41400248403002FB8
+-:100DA0008483FF2E2440002404470024C50400242B
+-:100DB00085006624E5E5C2008403002F0079022146
+-:100DC000E60F00248681002F00790221C014002440
+-:100DD0000480C058E60F00248681002F007902218C
+-:100DE0008A81802E8B33B091048ACB70E613002465
+-:100DF0008681002F00790221086A00C9820004243C
+-:100E0000C20008248100A024C100A0248120828087
+-:100E100082820401FE82C26E04000024C4140024F5
+-:100E20008403002FC404002482000424EE8A0055A9
+-:100E30008E81802EC2CE0109C2C28200CE00C28045
+-:100E40008A8A01058403002F008B0321C0580024E7
+-:100E50000480C058E60F00248681002F007902210B
+-:100E60007D7D021F8A83802E246A6A10E5EBEB10D9
+-:100E7000046300248403002F04000024C418002409
+-:100E80008403002F8E8F802E24000024046200240F
+-:100E900001380024E501222C8403002F0101040104
+-:100EA00024240101FC24086704000024C420002439
+-:100EB0008403002F8E8F802E2408002404620024D7
+-:100EC00001380024E501222C8403002F01010401D4
+-:100ED00024240101FC24106700790221C090002421
+-:100EE0000480C058E60F00248681002F007902217B
+-:100EF0008A81802E8B33AC91046A6B60E6120024E9
+-:100F00008681002F00790221816A0609024B8069DF
+-:100F1000818101098A2181808181040104000024EA
+-:100F2000C41400248403002FC4200024404B040573
+-:100F30008E8F802E8EE181828403002F4040200519
+-:100F400081812001FB40204F0EBF802E0EE1818E5B
+-:100F5000007902210037030B3737071176761F110E
+-:100F600056560F111683002FC000060900000024FA
+-:100F70008E76C090046E07D1042100248403002FD4
+-:100F800000009E20056E00C9040C00248403002F7D
+-:100F9000041100248403002F036E01C900FF06D151
+-:100FA0008F2718818483FF2E24F00024042200243C
+-:100FB00044060024C58E8E10054E4E108403002F6B
+-:100FC000C0C008010000010100FF04C9040800249A
+-:100FD0008403002FE900085700DC032190D7D710C5
+-:100FE000156602690E47005161072691010107113C
+-:100FF000212703090101211261072681C1072C91D4
+-:101000008181E01103470151C1160024000504212C
+-:10101000C10D00248181C112C1072C81E42050241C
+-:1010200064180024446767108403002F6E6903511D
+-:1010300000009E2027660069872718810508005157
+-:101040006207099102020F11020208126207098168
+-:1010500058690151576904510869026924494910C6
+-:1010600004300024C58989108403002F9707249138
+-:10107000D7D749009707248109680069E420F02444
+-:101080006418002444060024C586861005464610D0
+-:101090008403002F5469035100009E20966720911D
+-:1010A0007676A0135656071F3737071102480309F3
+-:1010B0003737021296672081E420502464180024F8
+-:1010C000442828108403002F4769035100009E2004
+-:1010D00014660169876718813669015135690451C1
+-:1010E000086902692449491004300024C58989101F
+-:1010F0008403002F97072491D7D7490097072481AD
+-:10110000E420F0246418002444060024C5868610D8
+-:10111000054646108403002F3369035100009E20CA
+-:101120000E66046987672081620708910202071131
+-:10113000226903090202221262070881E420F024D6
+-:101140006408002444060024C5868610054646101F
+-:101150008403002F00009E200B660369620709913B
+-:1011600002020F110202671262070981E420502473
+-:1011700064000024440700248403002F1A690351EB
+-:1011800000009E2006660551FBFB141F04FC14C9D9
+-:101190008281FF2EE2E2141F822D0081FBFBE3120D
+-:1011A000042100248403002F0F69035100009E20B6
+-:1011B000966720917676A0135656061F2907308130
+-:1011C0009607208126070B81C6071281E420502450
+-:1011D00064180024440400248403002F026904518D
+-:1011E00000009E20D08989108F198091014F040141
+-:1011F00001011F11036F0168FBFB141F00009E20FB
+-:10120000C14F90019039C1806119818100009E20F9
+-:10121000E60C00248681002F007902218A81802E2D
+-:101220008D81FF2EC0340024C0C04001C0C0040125
+-:101230000480C058E60F00248681002F0079022127
+-:10124000817900910B6A406960E10027066020699E
+-:1012500060E2002705602069E60400248681002FF3
+-:1012600000790221606020016A6060100A80002F0E
+-:10127000046A4061E60400248681002F007902217F
+-:101280006B0100244B6A6A1004000024C41400247B
+-:101290008403002F194A0051184A01512C4A025167
+-:1012A000E60300247A7A001F00790221046A206193
+-:1012B000606A2005E1E1601E00B00421E2E26A1EDE
+-:1012C000817900818E8F802E08FF0AD1804B06091C
+-:1012D0008D318084C58B8B10254B4B10050100246C
+-:1012E0008501012F007902218B3908818D390C8508
+-:1012F0007D7D051F007902218E87802E8E87012F2C
+-:10130000C41000248403002F8E8F802E8E0F022F96
+-:10131000C42000248403002F8E87802E8E87022F06
+-:10132000044A01696D0100244D3030108DD0D01079
+-:10133000C41000248403002F8E81802E8BCECE100B
+-:10134000C40400248403002F00AB04218E87802E68
+-:101350008E87012FC41000248403002F8E8F802ECF
+-:101360008E0F022FC42000248403002F8E87802E2E
+-:101370008E87022FC41000248403002F8E81802EBC
+-:101380008BCECE10C40400248403002F00AB0421B4
+-:10139000077D07C9242408137D7D041F7D7D061F5A
+-:1013A000DE0300248403002F00C8002100009E20DB
+-:1013B0007D7D051D8B3908918D390C95804B060973
+-:1013C0008D318084C58B8B10254B4B10050100247B
+-:1013D000026B0169050200248501012F00C800216C
+-:1013E000D9D9051F28280711191928001D1D001F0C
+-:1013F000292828104980022F8685802E8900802484
+-:101400008687012F96960C01C40C00248403002FBC
+-:1014100008C608C95656011FE0FFFF2405C6E0684C
+-:101420000486E06803C7E0685656011D5656001F43
+-:1014300092F54091C40200248E85802EE3DC0524C1
+-:1014400007CEE348362EAA69350EAA69346F0369C0
+-:101450001919071FCED0D010C4C40801C9CECE10B0
+-:101460008980012F8403002F9696C400DE0100249A
+-:1014700003CED3680303002400009E2003CE9368AC
+-:101480000304002400009E2004CED268DE00002465
+-:101490000301002400009E2004CE9268DE00002498
+-:1014A0000301002400009E2004CED468DE00002446
+-:1014B0000302002400009E2004CE9468DE00002475
+-:1014C0000302002400009E2004CED568DE00002424
+-:1014D000030E002400009E2002CE95681919061FF5
+-:1014E000031000240D5D06C9800289240BCE80689C
+-:1014F0000A660169094680690826C269055D05C951
+-:1015000006060069056700690047F01103003069AD
+-:1015100037C00024DE02002400009E20FBFB051FD4
+-:1015200037280024DE02002400009E20D9D9061F9F
+-:101530008039060B8213A091088062603737081348
+-:1015400004FC0CC98181FF2EE1E10C1F812D00817B
+-:10155000DE02002400009E20393940018E80802E5A
+-:1015600089CECE1029290F11C980012F969602012C
+-:10157000C40200248403002F000D0521617D03D1E6
+-:101580008013A1918039071105C0804837100024CD
+-:10159000FBFB091FDE02002400009E2039390101F7
+-:1015A000D9D9081FFBFB011F0278006978969610B5
+-:1015B000C997060BC9C9071189173F118981012FE6
+-:1015C0008689802EE066F0114BE04069085D07C90E
+-:1015D0004986147100660F114700056146EA005103
+-:1015E00045680051E0E9002743E0205183FF3F2494
+-:1015F00083878310078300511919031FFBFB081F02
+-:1016000004FC09C98181FF2EE1E1091F812D0081C0
+-:10161000EDEAEA108685FF2E8A85FF2E860F022FBF
+-:101620008689802E8483FF2E82660F11C482020970
+-:10163000045000248403002FD79686009696C40099
+-:10164000E1E9EA00E181C102DA81C10001EA002793
+-:10165000030120695656021F009A0521036AE061C2
+-:10166000026AEF495656031F6003489003003F117A
+-:10167000DE00060B82C4C4108483FF2E0400002405
+-:10168000C41400248403002F8282C40413820071D6
+-:101690008681802E66661F110666036903462658FA
+-:1016A000C446461000A10521C482821000A1052174
+-:1016B0000266096900A7052103660169C4010024C7
+-:1016C00000A1052103660069C482821000A10521E2
+-:1016D000C446461000A105216948481049464610F5
+-:1016E0008980022F1D1D031F00009E203728002423
+-:1016F00000BE052137C80024DE02002400009E2021
+-:101700002A5604D18689802EE066F011FAE0406FF7
+-:101710008EBB0091F1F0F0100BF100517AF101272E
+-:10172000F1F17A1C8E7A04098BBA8E90FBECE96E8B
+-:10173000FAEDEA6EF94B486E6B6B01010B1A8E8065
+-:1017400000E2052181FF3F24818781108D810057B0
+-:101750000D4E6E587AF000270B7A2051F0F07A1E69
+-:101760004E4E01018EBB0081ECE9E910EDEAEA1072
+-:101770004B4848106B0100248E7A04098BBA8E8086
+-:1017800000E205217AFF00245A0100245656041F66
+-:1017900000FF07C98F0712814F070B81DE0300246A
+-:1017A0000303002400009E205656041D0D7AFF51AD
+-:1017B000CF7A205F817A04098B3A8190046B5A704A
+-:1017C0006B6B5A048B3A818000F805218EBB009127
+-:1017D000F0F07A1C024E00514E4E01058EBB008186
+-:1017E000685605CFDE04002400009E20D9D9071FCB
+-:1017F000FBFB0C1F8E83802EF0EE0C0B9081022FD2
+-:1018000096960401C40400248403002FDE01002402
+-:1018100008EE08C9006F040B0300046903030024E9
+-:1018200000009E20030006690304002400009E209F
+-:101830000310002400009E208E83802E035D07C9C4
+-:10184000126E1169114E00691919061F969606014C
+-:10185000D796CF00DE01002480210024048F806809
+-:10186000969602010303002400009E208057002466
+-:10187000048F8068969602010304002400009E20D5
+-:1018800037B800240023062137B00024DE020024EC
+-:101890000310002400009E208013A19180390711BD
+-:1018A00005C0804837100024FBFB091FDE0200241E
+-:1018B00000009E2039390101FBFB021FD9D9081F06
+-:1018C0001D1D041F0278006978969610C997060BB3
+-:1018D000C9C9071189173F118981012F8683802E7D
+-:1018E0000066F0118400606F8483FF2E04000024E2
+-:1018F000C40800248403002F8E8F802E8E0F022FA9
+-:10190000E0EEEF00E0E0F002E0E0F102E0E0F20201
+-:10191000E0E0F302E0E0F402E0E0F502E080C00283
+-:10192000DA80C0000372FF69025200695656031F35
+-:10193000EFE6E610CFCF0F118F81022F712727100E
+-:1019400051C6040B9180022F96962801D796C700A6
+-:101950006003279003003F11DE00060BC420002423
+-:101960008403002F00009E208680802E804603097D
+-:1019700080800801C40200248403002FC0020024D8
+-:1019800011C080580E80802EC40100248403002FD3
+-:1019900080800101FB6E006F056EC269FBFB0E1FAC
+-:1019A00037374013DE02002400009E200E80802E78
+-:1019B000C46E01018403002FC0C0C400C0C0010177
+-:1019C00000600621716666100680022F6103669032
+-:1019D00003013F11DE01060B00009E208681802E50
+-:1019E000716666100680022F6103669003013F1145
+-:1019F000DE01060B80460309C48008018403002F22
+-:101A00009696C40000009E208683802EC408002481
+-:101A10008403002F716666100680022F04FC09C93A
+-:101A20008181FF2EE1E1091F812D00811919031F1A
+-:101A300096960801FBFB081F6103669003013F11A6
+-:101A4000DE01060B00009E208680802E71666610E7
+-:101A50000680022F6103669003013F11DE01060B31
+-:101A600080460309C48008018403002F9696C400B1
+-:101A700000009E208013A2918039030B8080071103
+-:101A80008DC0804E37200024FBFB0B1FDE0200249C
+-:101A900000009E2039390801389696108681802EE4
+-:101AA000C40400248403002F06C60FC98483FF2EBC
+-:101AB000C4D79604045200248403002F0400002499
+-:101AC000EE8686108E81022F310200245180022F73
+-:101AD000C400002402C60DC9C480040102C60CC99A
+-:101AE000C48004018403002F8000082403868068DA
+-:101AF0000303002400009E2080DD86240386806886
+-:101B00000304002400009E200310002400009E20F7
+-:101B10008681802E8681022F310100245180022F80
+-:101B200003100024DE010024D9D9091F189696104D
+-:101B30009696080100009E20C0D73801C0C002055B
+-:101B400000FF06D1C006C090D7D72004D7D7020522
+-:101B50006103009003013F11DE00002400009E207D
+-:101B600018969610D9D90A1F8685802EEEE7E710C1
+-:101B70008E81022F310100245180022F8046020104
+-:101B800080800209969680006103669003013F11F0
+-:101B9000DE01002400009E208E85802EE68E8E10B1
+-:101BA0008681022F290400244980022F031000247B
+-:101BB000DE0100241919041F0E7D02C9F2F0F01095
+-:101BC000D39608019081FF2E9081002F8483FF2EF1
+-:101BD000C4D79604850800242424001F046100242F
+-:101BE0008403002F040000245656051F9267348199
+-:101BF0005896961096960C0100009E20FBFB0D1F38
+-:101C00003737281304FC07C98181FF2EE1E1071F44
+-:101C1000812D0081DE02002400009E20D9D90F1FF3
+-:101C200078969610C997060BC9C9071189173F11F5
+-:101C30008981012F0137F8110101030B1D010110EA
+-:101C4000C1010509810103098181C1008181000170
+-:101C50008E738190C48E8E10034E4E108403002F1D
+-:101C60009696CF00818108018EF38192868F802E17
+-:101C7000E6E6EE10E7E7EF10E8E8F010E9E9F1102A
+-:101C8000EAEAF210EBEBF310ECECF410EDEDF510EA
+-:101C9000860F022FDE0100241D1D071F00009E205D
+-:101CA0008E83802E040D00248403002FDE01002487
+-:101CB0001D0000241D1D071F868FFF2E860F022F7B
+-:101CC00015011E51052F01C91D1D031FC7CECE10C2
+-:101CD000878E8E10003907211D1D021FC7CEFF11F0
+-:101CE000878EFF118687012F8D0F3F11CD00022FA8
+-:101CF0008687FF2E012F78116901030BC1C00124D3
+-:101D0000818FC1104981060B2929011F8687022F67
+-:101D100000009E20052F02C91D1D031FC7CECE1037
+-:101D2000878E8E10004D07211D1D021FC7CEFF118B
+-:101D3000878EFF118687012F8DCFCF10CD00022F08
+-:101D40008687FF2E012F78116901030B490F0F10B1
+-:0C1D50002929001F8687022F00009E201A
+-:00000001FF
+diff --git a/firmware/keystone/pa_pdsp02_1_3_0_2.fw.ihex b/firmware/keystone/pa_pdsp02_1_3_0_2.fw.ihex
+new file mode 100755
+index 0000000..cbc4e86
+--- /dev/null
++++ b/firmware/keystone/pa_pdsp02_1_3_0_2.fw.ihex
+@@ -0,0 +1,501 @@
++:10000000007B00210100BEBA02000301845050248D
++:10001000C4848410E5E4E410E6E4E410E7E4E410CA
++:10002000E8E4E410E9E4E410EAE4E410EBE4E410CA
++:1000300084E3008384E3208384E3408384E3608358
++:1000400084E3808384E3A08384E3C08384E3E08348
++:1000500004430024640304810444002464032981CC
++:10006000040A002464033281040C002464033381F5
++:100070000409002464032F810453002464030681CF
++:1000800004050024640300810406002464032B811A
++:100090000407002464032C810408002464033C81C9
++:1000A00004510024640311810452002464038881F4
++:1000B000040F00246403848180A7FF2E80F300894D
++:1000C00080F3508980FA008780FA408780FA808721
++:1000D00080FAC087E5000024E1E001248887FF2E34
++:1000E0006805002488F4E580E5E51001FEE5E16E91
++:1000F000C800812488A88824C900082489DD8624B2
++:10010000CA4788248A488824CB6488248B6388243F
++:1001100088F54081E500002485356081899FFF2EA8
++:1001200085000024C500082489F685868585400160
++:10013000FE85C56E040000246418008104010024BB
++:100140006418208104020024641840810403002400
++:10015000641860810404002464188081040500246C
++:100160006418A081E0010024E1640024806A048115
++:10017000828FFF2E82F3A0836202002442020024B9
++:10018000220200248233A0816540002445400024DF
++:100190008533AC81F4000424F50008248000A024F9
++:1001A000C000A0248020F480F4F40401FEF4F56E75
++:1001B000F4000824F5001024809FFF2E80E0F486D0
++:1001C000F4F44001FEF4F56EF480002480E0F48045
++:1001D000F480012480E0F480F480022480E0F48044
++:1001E000F480032480E0F48000009E209E210223FE
++:1001F0008285FF2E82A40481E201002482240081F2
++:1002000000FF00C900FF00D104FF01C99E030023C5
++:10021000E2000024822404819D81FF2E9B81FF2E19
++:100220001D17009182020024C20301248237048139
++:1002300005FF09C9FFFF091F81356091E1E1010157
++:100240008135608113FF01C9017D03110301025152
++:1002500081A400240097002181A800248E3381907E
++:100260008FBB0091046E00697D7D031D8F85FF2E7D
++:1002700000A100217D7D031F6F6E6E10D08E8E1049
++:10028000304E4E108FBB0081E10000248124048198
++:1002900006FF03C981240C915D5D3F115D5D011274
++:1002A000E100002481240C8122FF05C91B7D07C9C0
++:1002B000027D06C900FF0AD11EFF0AD18501812EE9
++:1002C000030503C99ED6002300B400219E750123B7
++:1002D000107D06C97D7D061D047D04D10504002422
++:1002E0008501012F00CC00217D7D041D075D00D11B
++:1002F00003DE03519E9C012300C40021E42300245B
++:100300008401002F00C400215D5D001D9E75012346
++:100310007D7D071D00CC0021F45D00D704FC11C9D0
++:100320008181FF2EE1E1111F812D0081FBFB141F54
++:10033000027D05D1D4FF04D1027D05C905FF0AC99C
++:10034000BCFB00579B2C08819B81FF2E008C002159
++:100350000006052100D00021FBFB081F81250609AE
++:1003600088318192817D031181E106098181251205
++:1003700081810A1FC1082681D008249179082F9114
++:100380001C6902697C1903D106680051C8082281E2
++:1003900061082D910101E0110101481261082D81D0
++:1003A0000E4A00516108269101010711212A030913
++:1003B000010121126108268161082D910101E011DE
++:1003C000034A01512116002400F40021210D0024CC
++:1003D0000101211261082D81E4235024446A6A102E
++:1003E000641800248403002F6A6C035100009E20CF
++:1003F00023690069025D06C95F1903D18A28188143
++:10040000050B00516208099102020F1102020B1242
++:100410006208098196682091021C00244C5605D17F
++:10042000486C0151476C0451096B0069E423F024C6
++:100430004406002464180024C58989100549491020
++:100440008403002F536C035100009E207676A01386
++:100450005656071F37370711034B03093737031267
++:1004600096682081E423502464180024442B2B1028
++:100470008403002F476C035100009E200D69016921
++:100480003D1903D18A6818812E6C01512D6C0451DD
++:10049000E423F0246418002444060024C58989104C
++:1004A000054949108403002F3A6C035100009E2037
++:1004B0000E6904698A6820816208089102020711A6
++:1004C000226C03090202221262080881E423F0244C
++:1004D0006408002444060024C58989100549491090
++:1004E0008403002F00009E200B69036962080991B4
++:1004F00002020F1102026A1262080981E4235024E9
++:1005000064000024440700248403002F216C03515D
++:1005100000009E2006690551FBFB151F04FC14C951
++:100520008281FF2EE2E2141F822D0081FBFB121F4D
++:10053000042400248403002F166C035100009E2025
++:100540005656061F2C083081021800247676A01318
++:100550009668208129080B81C9081281E423502460
++:1005600044040024640202108403002F096C045127
++:1005700000009E201919031D37370711373738132C
++:10058000570826818170002489F4819000E00021C1
++:10059000D08C8C108F198091014F040101011F1123
++:1005A000036F0168FBFB151F00009E20C14F9001E7
++:1005B0009039C1806119818100009E20DEDE04092E
++:1005C00086F4DE908381FF2EE3E3121F9ECE00248B
++:1005D00000100421FBFB091F9668209101560F11A2
++:1005E0000E010051035603C981F00024008301214C
++:1005F000035602C981E0002400830121035600C98B
++:1006000081C000240083012181D0002489F48190DD
++:100610000269055100DE002106970AD13737F8112B
++:1006200037370013D708268189F4009100DE0021B6
++:1006300081973F118181060981810C1F81811401FD
++:10064000C197060BC1C1071103C1006989E0819000
++:1006500000DE002103C1016989E1819000DE0021F3
++:1006600003C1026989E2819000DE00210046012178
++:1006700096682091DE37030BDEDE040989F4DE90F4
++:1006800000DE0021FBFB001F81240091E1E101015C
++:1006900081240081868F802E12CA0ED1CA810E1F3E
++:1006A0008A80002F017D03110E010069E1003024D2
++:1006B000802108F1C0FFFF248BC080048035609149
++:1006C000058B644904FF09C9FFFF091FE0E0010130
++:1006D00080356081CB8080109AC0C0108B81002F44
++:1006E000040800248403002F043100242420002463
++:1006F0008403002F13C9005104C908690168030B62
++:1007000013011E5112011F519689802E0176050B8F
++:10071000180100515A010551A8010451FBFB131F98
++:1007200004FC13C98081FF2EE0E0131F802D00819F
++:100730008483FF2E042100248403002F008C0021D9
++:100740009688FF2ED789891000DE01219688FF2E1A
++:10075000D789891004FC00C98081FF2EE0E0001FCA
++:10076000802D0081591000249EF2012400A0072151
++:10077000040D00248403002F04000024C496961066
++:100780008403002F03591F11DE0000241D000024E4
++:1007900006030D5137370711040310615D5D001F1B
++:1007A000DE02002400F401218E8FFF2E8E87012FA0
++:1007B0008E0F022F8E87022F0003010980150090F3
++:1007C0009E00C022FDDE00575959E011595903120D
++:1007D00000FF07C976180024962720830EDE0169E2
++:1007E00004200024240800248403002F091D1D1068
++:1007F0006980022F067D07D17D7D071F0504002437
++:1008000000FF0AD18501012F00CE00217D7D061F4A
++:1008100000CE002112DE0451135D00D1087D07C90E
++:100820007D7D041F04200024245800246418002423
++:10083000440600248403002F0003022103DE035139
++:10084000DE37030B006F012184205024641800243C
++:10085000440600248403002F00CE0021042100243C
++:10086000001502217D7D041F04200024240800249B
++:100870008403002FE67D07D700CE00219E8C002444
++:1008800000EE0321E300002407E3405900FF0AD1F2
++:1008900025E3E310050200248501012FE3E30101B4
++:1008A000002202218391FF2E6300002464050024AE
++:1008B0006805002482000024C20010248331828451
++:1008C00082824001FE82C26E8883FF2E8879008179
++:1008D0008A81FF2E8A390881C81F05248883052450
++:1008E000C920062489970524CA4B06248ACE0624EB
++:1008F000CBEE06248BF90624CC0907248C1407249C
++:10090000CD3B07248D450724CE4F07248E7E072438
++:10091000CF3306248F5D0724D076072400200024DF
++:100920000000020108D5008F9C81FF2E6017009106
++:10093000030000518E85FF2E8EBB008100009E209B
++:100940008A81802E046A4071E60400248681002F8B
++:10095000008D022181790091036A2059E2E26A1C2C
++:10096000005B02214A6A2005E1E14A1C8D91FF2EBD
++:100970006E050024720500244EDE0024097D07D197
++:100980008179008100FF0AD1256A6A1005020024DE
++:100990008501012F806A06098D318084008D022136
++:1009A0006B0000244B6A6A108B3908818D390C85E5
++:1009B0007D7D051F008D0221DA00002480898910C9
++:1009C000040D00248403002F8687802E00FF07C9B2
++:1009D000882718810447CE51E60100248681002F24
++:1009E000008D02215A0000240F6701510F67025148
++:1009F0000F6703510F670451AB6706515C670C51D9
++:100A000050670A53D76708510A670B532967095380
++:100A100024670551CA670751E60200248681002F2A
++:100A2000008D022100A0042100500221009D04211C
++:100A3000009D04211529066981240891E1E1010145
++:100A400081240881067A00C904430024C45A5A103C
++:100A500024040024E5E6E6108403002F640000244B
++:100A600044292910C5C9C91005090910042000240A
++:100A700024F0002461170091020003599EFE042314
++:100A80008403002F00D00021E42100248401002FE2
++:100A900081240C91E1E1010181240C8100D000212D
++:100AA00004803859E60F00248681002F008D022132
++:100AB000E60000248681002F8A87802E040000240F
++:100AC000C42000248403002F8E8B802E026A00C96C
++:100AD0008B33A081056A01C98C33A4816101002494
++:100AE000E2100024812204E1056A02C98D33A88145
++:100AF00061010024E2200024812204E1026A03C98A
++:100B00008E33AC81026A04C98F33B081026A05C991
++:100B10009033B481136A06C99233BC81C1000124A9
++:100B200081000024027100C90101071F027102C97E
++:100B30000101061FE200002481220CE18100002453
++:100B4000027101C90101071F027103C90101061FDA
++:100B5000E210002481220CE1E220002481220CE139
++:100B6000B56A07CFFCF3F310008D0221E6000024E4
++:100B70008681002F8A83802E04000024096A006980
++:100B8000C0F801240480C058E60F00248681002F9D
++:100B9000008D0221C41800248403002F001F0321AC
++:100BA000C41400248403002F176A016904803C598F
++:100BB000E60F00247A7A001F008D02218E83802E9A
++:100BC000046E0471E61000247A7A001F008D022161
++:100BD000816E0509C16E03098181C1008181000117
++:100BE0008E738180C40800248403002F8E8F802E92
++:100BF000818108018EF38182C42000248403002FA8
++:100C0000008D02210E6A026904802459E60F002437
++:100C10007A7A001F008D02218E87802E046E10715B
++:100C2000E61100247A7A001F008D0221816E0409EA
++:100C3000818100018EFA8180008D02210D6A036995
++:100C400004801859E60F00247A7A001F008D0221D3
++:100C50008E81802E5D5D041D056E00C95D5D041FE3
++:100C60005D5D051D026E01C95D5D051F008D0221E0
++:100C7000E60200247A7A001F008D0221E1000024A0
++:100C8000C41000248E87802E8403002F02EB01C83D
++:100C90008EF4C18001010101C1C11001FA011E677A
++:100CA000008D02218A83802E04000024C4180024B1
++:100CB0008403002F194A0151E1000024026A005107
++:100CC0008101FF2E812C0C8183000F2486E283801A
++:100CD000C204002482804F24E120602486E100F7D2
++:100CE00086E200E78483FF2E24400024043700249A
++:100CF000E5E2E2108403002FE1E14001E2E240017D
++:100D000086E100F786E200E7E5E2E2108403002FC7
++:100D100086E28390008D0221086A00518E8FFF2E9B
++:100D2000E2000824E1000824E1E1E2008EE0E28232
++:100D3000E2E22001FEE2E16E008D022104000024C7
++:100D4000C41000248403002F240C00240433002446
++:100D50008403002F8EB700918E85002F008D022115
++:100D6000C05400240480C058E60F00248681002F60
++:100D7000008D02218A81802E046A2071E60E0024F3
++:100D80008681002F008D02218E8FFF2EC26A0609F8
++:100D9000144A006904000024C41400248403002FB2
++:100DA00060200024022A0459602A03098EBF802E85
++:100DB0008EF6C2828E8FFF2EC2C22001072A0471D6
++:100DC00004000024C42000248403002F602A0405AA
++:100DD000606003098EBF802E8EF6C282008D0221D4
++:100DE000054A01698EF6C282C2C220018EF6C28215
++:100DF000008D02210C4A026904000024C41400245E
++:100E00008403002F8483FF2E244000240447002401
++:100E1000C504002485006624E5E5C2008403002F94
++:100E2000008D0221E60F00248681002F008D022113
++:100E3000C01400240480C058E60F00248681002FCF
++:100E4000008D02218A81802E8B33B091048ACB7071
++:100E5000E61300248681002F008D0221086A00C954
++:100E600082000424C20008248100A024C100A02420
++:100E70008120828082820401FE82C26E04000024EE
++:100E8000C41400248403002FC4040024820004241A
++:100E9000E98A00558E81802EC2CE0109C2C282002D
++:100EA000CE00C2808A8A01058403002F00A403219A
++:100EB000C05800240480C058E60F00248681002F0B
++:100EC000008D02217D7D021F8A83802E246A6A1094
++:100ED000E5EBEB10046300248403002F04000024DE
++:100EE000C41800248403002F8E8F802E2400002439
++:100EF0000462002401380024E501222C8403002F21
++:100F00000101040124240101FC24086704000024D9
++:100F1000C42000248403002F8E8F802E24080024F8
++:100F20000462002401380024E501222C8403002FF0
++:100F30000101040124240101FC241067008D022119
++:100F4000C09000240480C058E60F00248681002F42
++:100F5000008D02218A81802E8B33AC91046A6B60F4
++:100F6000E61200248681002F008D0221816A060985
++:100F7000024B8069818101098A218180818104017C
++:100F800004000024C41400248403002FC42000247F
++:100F9000404B04058E8F802E8EE181828403002FCA
++:100FA0004040200581812001FB40204F0EBF802E54
++:100FB0000EE1818E008D02210037030B37370711B8
++:100FC00076761F1156560F111683002FC0000609A2
++:100FD000000000248E76C090046E07D10421002406
++:100FE0008403002F00009E20056E00C9040C00241D
++:100FF0008403002F041100248403002F036E01C911
++:1010000000FF06D18F2718818483FF2E24F000244F
++:101010000422002444060024C58E8E10054E4E1076
++:101020008403002FC0C008010000010100FF04C9B3
++:10103000040800248403002FE900085700F5032169
++:1010400090D7D710156602690E47005161072691A7
++:1010500001010711212703090101211261072681DE
++:10106000C1072C918181E01103470151C116002471
++:10107000001E0421C10D00248181C112C1072C81F1
++:10108000E420502464180024446767108403002F70
++:101090006E69035100009E2027660069872718812A
++:1010A000050800516207099102020F11020208129D
++:1010B0006207098158690151576904510869026939
++:1010C0002449491004300024C58989108403002F65
++:1010D00097072491D7D749009707248109680069A9
++:1010E000E420F0246418002444060024C5868610F9
++:1010F000054646108403002F5469035100009E20CA
++:10110000966720917676A0135656071F373707113A
++:10111000024803093737021296672081E4205024E1
++:1011200064180024442828108403002F47690351C1
++:1011300000009E2014660169876718813669015195
++:1011400035690451086902692449491004300024B2
++:10115000C58989108403002F97072491D7D74900A8
++:1011600097072481E420F024641800244406002416
++:10117000C5868610054646108403002F3369035147
++:1011800000009E200E66046987672081620708912F
++:101190000202071122690309020222126207088172
++:1011A000E420F0246408002444060024C586861048
++:1011B000054646108403002F00009E200B6603693D
++:1011C0006207099102020F11020267126207098188
++:1011D000E420502464000024440700248403002FEA
++:1011E0001A69035100009E2006660551FBFB151F7E
++:1011F00004FC14C98281FF2EE2E2141F822D0081BB
++:10120000FBFBE312042100248403002F0F69035128
++:1012100000009E20966720917676A0135656061FF2
++:10122000290730819607208126070B81C607128186
++:10123000E420502464180024440400248403002F74
++:101240000269045100009E20D08989108F19809175
++:10125000014F040101011F11036F0168FBFB151F02
++:1012600000009E20C14F90019039C1806119818199
++:1012700000009E20E60C00248681002F008D0221B4
++:101280008A81802E8D81FF2EC0340024C0C0400191
++:10129000C0C004010480C058E60F00248681002FDE
++:1012A000008D0221817900910B6A406960E100277D
++:1012B0000660206960E2002705602069E6040024DA
++:1012C0008681002F008D0221606020016A6060101D
++:1012D0000A80002F046A4061E60400248681002F02
++:1012E000008D02216B0100244B6A6A100400002467
++:1012F000C41400248403002F1A4A0051194A0151D2
++:101300002D4A0251E60300247A7A001F008D022143
++:10131000046A2061606A2005E1E1601E00C90421C1
++:10132000E2E26A1E8E8F802E0A7D07D181790081CC
++:1013300000FF0AD1804B06098D318084C58B8B104C
++:10134000254B4B10050100248501012F008D022142
++:101350008B3908818D390C857D7D051F008D02211B
++:101360008E87802E8E87012FC41000248403002FC7
++:101370008E8F802E8E0F022FC42000248403002F16
++:101380008E87802E8E87022F044A01696D0100240A
++:101390004D3030108DD0D010C41000248403002FA5
++:1013A0008E81802E8BCECE10C40400248403002FA7
++:1013B00000C404218E87802E8E87012FC410002444
++:1013C0008403002F8E8F802E8E0F022FC4200024C6
++:1013D0008403002F8E87802E8E87022FC410002456
++:1013E0008403002F8E81802E8BCECE10C404002467
++:1013F0008403002F00C40421077D07C92424081397
++:101400007D7D041F7D7D061FDE0300248403002FE5
++:1014100000D0002100009E207D7D051D8B390891A4
++:101420008D390C95804B06098D318084C58B8B10CE
++:10143000254B4B1005010024026B015105020024CD
++:101440008501012F81790091064B2059036B0151D1
++:10145000E2E24B1C001D0521E2E24B1E001D0521AE
++:101460004B4B2005036B0151E1E14B1C001D052195
++:10147000E1E14B1E8179008100D00021D9D9051FFF
++:10148000282807111919280002280051D7D7040568
++:101490001D1D001F292828104980022F8685802EB7
++:1014A000890080248687012F96960C01C40C0024A5
++:1014B0008403002F08C608C95656011FE0FFFF2409
++:1014C00005C6E0680486E06803C7E0685656011D5B
++:1014D0005656001F92F54091C40200248E85802E3E
++:1014E000E3DC052416CEE348452EAA69440EAA691A
++:1014F000436F03690F5D06C90ECE2E590DD74051BB
++:1015000091D7D7109113BC91D0198091011004018B
++:1015100001011F1103300168FBFB151F008005212D
++:10152000C11090019139C18061198181008005212C
++:101530001919071FCED0D010C4C40801C9CECE10CF
++:101540008980012F8403002F9696C400DE010024B9
++:1015500003CED3680303002400009E2003CE9368CB
++:101560000304002400009E2004CED268DE00002484
++:101570000301002400009E2004CE9268DE000024B7
++:101580000301002400009E2004CED468DE00002465
++:101590000302002400009E2004CE9468DE00002494
++:1015A0000302002400009E2004CED568DE00002443
++:1015B000030E002400009E2002CE95681919061F14
++:1015C000031000240D5D04C9800289240BCE8068BD
++:1015D0000A660169094680690826C269055D05C970
++:1015E00006060069056700690047F01103003069CD
++:1015F00037C00024DE02002400009E20FBFB071FF2
++:1016000037280024DE02002400009E20D9D9061FBE
++:101610008039060B8213A091088062603737081367
++:1016200004FC0CC98181FF2EE1E10C1F812D00819A
++:10163000DE02002400009E20393940018E80802E79
++:1016400089CECE1029290F11C980012F969602014B
++:10165000C40200248403002F003605214C7D03D1F1
++:101660008013A1918039071105C0804837100024EC
++:10167000FBFB0B1FDE02002400009E203939010114
++:10168000D9D9081FFBFB011F027D00D1FBFB021F04
++:101690000278006978969610C997060BC9C9071198
++:1016A00089173F118981012F8689802EE066F0110C
++:1016B00034E04069085D07C93286147100660F1175
++:1016C000300005612FEA00512E680051E0E9002743
++:1016D0002CE0205183FF3F24838783100783005130
++:1016E0001919031FFBFB0A1F04FC09C98181FF2E86
++:1016F000E1E1091F812D0081EDEAEA108685FF2EC8
++:101700008A85FF2E860F022F8689802E8483FF2EE6
++:1017100082660F11C4820209045000248403002F42
++:10172000D79686009696C400E1E9EA00E181C102FD
++:10173000DA81C10001EA0027030120695656021F21
++:1017400000D40521036AE061026AEF495656031F7F
++:101750006003489003003F11DE00060B04000024E4
++:101760008403002F69484810494646108980022F9B
++:101770001D1D031F00009E203728002400E10521C5
++:1017800037C80024DE02002400009E202C5604D11D
++:101790008689802EE066F011FAE0406F81FF3F24D9
++:1017A0008187811002810051FBFB0A1F8EBB0091D3
++:1017B000F1F0F0100BF100517AF10127F1F17A1CF0
++:1017C0008E7A04098BBA8E90FBECE96EFAEDEA6E24
++:1017D000F94B486E6B6B01010B1A8E8000070621D6
++:1017E000A0FB0ACF0D4E6E587AF000270B7A2051DD
++:1017F000F0F07A1E4E4E01018EBB0081ECE9E9103B
++:10180000EDEAEA104B4848106B0100248E7A040977
++:101810008BBA8E80000706217AFF00245A0100242B
++:101820005656041F00FF07C98F0712814F070B810F
++:10183000DE0300240303002400009E205656041DEE
++:101840000D7AFF51CD7A205F817A04098B3A81901D
++:10185000046B5A706B6B5A048B3A8180001D062111
++:101860008EBB0091F0F07A1C024E00514E4E0105E5
++:101870008EBB00817B5605CFDE04002400009E2035
++:10188000D9D9071FFBFB0E1F8E83802EF0EE0C0BA9
++:101890009081022F96960401C40400248403002F33
++:1018A000DE01002408EE08C9006F040B0300046980
++:1018B0000303002400009E200300066903040024A3
++:1018C00000009E200310002400009E208E83802EA6
++:1018D000035D07C9126E1169114E00691919061FBF
++:1018E00096960601D796CF00DE01002480210024C1
++:1018F000048F8068969602010303002400009E2056
++:1019000080570024048F8068969602010304002407
++:1019100000009E2037B800240048062137B000247C
++:10192000DE0200240310002400009E20445605D14E
++:101930008683802E0066F0119200606F8483FF2EF4
++:1019400004000024C40800248403002F8E8F802EFE
++:101950008E0F022F4B7D03C9395604D10827005141
++:1019600007272B5106273B5105273C5103272C51B4
++:10197000DE020024005F0621FBFB0A1F8096600147
++:101980000CDE0251800680900820005107202B5168
++:1019900006203B5105203C5103202C51DE0200243F
++:1019A000006A0621FBFB0A1F808000000060062100
++:1019B000E1F1F1108EBB0091F1F0F0100AF100514D
++:1019C0007AF10127F1F17A1C8E7A04098BBA8E9094
++:1019D000FBECE16EFAEDF56E6B6B01010B1A8E807C
++:1019E0000087062127FB0AC90C4E6E587AF00027A3
++:1019F0000A7A2051F0F07A1E4E4E01018EBB008112
++:101A0000ECE1E110EDF5F5106B0100248E7A04098C
++:101A10008BBA8E80008706217AFF00245A010024A9
++:101A20005656041F00FF07C98F0712814F070B810D
++:101A3000DE0300240304002400009E205656041DEB
++:101A40000D7AFF514D7A205F817A04098B3A81909B
++:101A5000046B5A706B6B5A048B3A8180009D06218F
++:101A60008EBB0091F0F07A1C024E00514E4E0105E3
++:101A70008EBB0081035605C9DE04002400009E20B1
++:101A80008E8F802E8013A1918039071105C0804868
++:101A900037100024FBFB0B1FDE02002400009E20F9
++:101AA00039390101FBFB031F027D00D1FBFB041F41
++:101AB000D9D9081F1D1D041F027800697896961059
++:101AC000C997060BC9C9071189173F118981012FD1
++:101AD000E0EEEF00E0E0F002E0E0F102E0E0F20230
++:101AE000E0E0F302E0E0F402E0E0F502E080C002B2
++:101AF000DA80C0000372FF69025200695656031F64
++:101B0000EFE6E610CFCF0F118F81022F712727103C
++:101B100051C6040B9180022F96962801D796C700D4
++:101B20006003279003003F11DE00060BC420002451
++:101B30008403002F00009E208680802E80460309AB
++:101B40008080080196968000C40200248403002F40
++:101B5000C00200240866005107662B5106663B51FF
++:101B600005663C5103662C51DE02002400DD06218F
++:101B7000FBFB0A1F0BC080580E80802EC40100247E
++:101B80008403002FC0C00101FB6E006F0E80802E09
++:101B9000C46E01018403002FC0C0C40000DD062113
++:101BA000716666100680022F6103669003013F1183
++:101BB000DE01060B00009E208681802E7166661075
++:101BC0000680022F6103669003013F11DE01060BC0
++:101BD00080460309C48008018403002F9696C40040
++:101BE00000009E208683802EC40800248403002FDA
++:101BF000716666100680022F04FC09C98181FF2EE0
++:101C0000E1E1091F812D00811919031F9696080132
++:101C1000FBFB0A1F6103669003013F11DE01060B07
++:101C200000009E208680802E716666100680022F3E
++:101C30006103669003013F11DE01060B8046030934
++:101C4000C48008018403002F9696C40000009E20E3
++:101C50008013A2918039030B8080071191C0804EC0
++:101C600037200024FBFB0D1FDE02002400009E2015
++:101C700039390801389696108681802EC4040024D4
++:101C80008403002F06C60FC98483FF2EC4D7960491
++:101C9000045200248403002F04000024EE868610E2
++:101CA0008E81022F310200245180022FC4000024B3
++:101CB00002C60DC9C480040102C60CC9C480040157
++:101CC0008403002F80000824038680680303002417
++:101CD00000009E2080DD86240386806803040024A3
++:101CE00000009E200310002400009E208681802E8C
++:101CF0008681022F310100245180022F031000241D
++:101D0000DE010024D9D9091F18969610969608016D
++:101D100000009E20C0D73801C0C0020500FF06D1D8
++:101D2000C006C090D7D72004D7D702056103009022
++:101D300003013F11DE00002400009E20189696103B
++:101D4000D9D90A1F8685802EEEE7E7108E81022FF3
++:101D5000310100245180022F804602018080020957
++:101D6000969680006103669003013F11DE01002416
++:101D700000009E208E85802EE68E8E108681022F9A
++:101D8000290400244980022F03100024DE010024CE
++:101D90001919041F0E7D02C9F2F0F010D396080144
++:101DA0009081FF2E9081002F8483FF2EC4D796044C
++:101DB000850800242424001F046100248403002FCC
++:101DC000040000245656051F9267348158969610D9
++:101DD00096960C0100009E20FBFB0F1F373728133F
++:101DE00004FC07C98181FF2EE1E1071F812D0081DD
++:101DF000DE02002400009E20D9D90F1F789696108D
++:101E0000FBFB051FC997060BC9C9071189173F11AD
++:101E10008981012F0137F8110101030B1D01011008
++:101E2000C1010509810103098181C100818100018E
++:101E30008E738190C48E8E10034E4E108403002F3B
++:101E40009696CF00818108018EF38192868F802E35
++:101E5000E6E6EE10E7E7EF10E8E8F010E9E9F11048
++:101E6000EAEAF210EBEBF310ECECF410EDEDF51008
++:101E7000860F022FDE0100241D1D071F00009E207B
++:101E8000FBFB061F8E83802E040D00248403002F8D
++:101E9000DE0100241D0000241D1D071F868FFF2E5C
++:101EA000860F022F15011E51052F01C91D1D031F8D
++:101EB000C7CECE10878E8E1000B207211D1D021FC7
++:101EC000C7CEFF11878EFF118687012F8D0F3F111F
++:101ED000CD00022F8687FF2E012F78116901030B99
++:101EE000C1C00124818FC1104981060B2929011F1E
++:101EF0008687022F00009E20052F02C91D1D031F8B
++:101F0000C7CECE10878E8E1000C607211D1D021F62
++:101F1000C7CEFF11878EFF118687012F8DCFCF107F
++:101F2000CD00022F8687FF2E012F78116901030B48
++:101F3000490F0F102929001F8687022F00009E20BD
++:00000001FF
+diff --git a/firmware/keystone/pa_pdsp3_1_2_1_2.fw.ihex b/firmware/keystone/pa_pdsp3_1_2_1_2.fw.ihex
+deleted file mode 100644
+index e6caf4f..0000000
+--- a/firmware/keystone/pa_pdsp3_1_2_1_2.fw.ihex
++++ /dev/null
+@@ -1,280 +0,0 @@
+-:100000000079002184505024C4848410E5E4E41075
+-:10001000E6E4E410E7E4E410E8E4E410E9E4E410E2
+-:10002000EAE4E410EBE4E41084E3008384E3208357
+-:1000300084E3408384E3608384E3808384E3A08358
+-:1000400084E3C08384E3E0830443002464030481E5
+-:100050000444002464032981040A002464033281D7
+-:10006000040C0024640333810409002464032F81F9
+-:100070000453002464030681040500246403008102
+-:100080000406002464032B810407002464032C81EC
+-:100090000408002464033C8104510024640311819A
+-:1000A0000452002464038881040F002464038481C3
+-:1000B00080A7FF2E80F3008980F3508980FA0087A3
+-:1000C00080FA408780FA808780FAC087E5000024A4
+-:1000D000E1E001248887FF2E6805002488F4E5808C
+-:1000E000E5E51001FEE5E16EC800812488A88824BA
+-:1000F000C900082489DD8624CA4788248A488824C0
+-:10010000CB6488248B63882488F54081E500002433
+-:1001100085356081899FFF2E85000024C500082455
+-:1001200089F6858685854001FE85C56E040000241C
+-:100130006418008104010024641820810402002452
+-:1001400064184081040300246418608104040024BE
+-:1001500064188081040500246418A081E001002453
+-:10016000E1640024806A0481828DFF2E82B3A08323
+-:100170006202002442020024220200248233A08171
+-:1001800065400024454000248533AC81F4000424FC
+-:10019000F50008248000A024C000A0248020F48062
+-:1001A000F4F40401FEF4F56EF4000824F5001024C4
+-:1001B000809FFF2E80E0F486F4F44001FEF4F56E9B
+-:1001C000F480002480E0F480F480012480E0F48056
+-:1001D000F480022480E0F480F480032480E0F48042
+-:1001E00000009E209E5B01238285FF2E82A4048155
+-:1001F000E20100248224008100FF00C900FF00D139
+-:1002000004FF01C99E010023E2000024822404812E
+-:100210009D81FF2E9B81FF2E5D17009103FB0051F6
+-:100220009B2C08819B81FF2EFDFF04CF8124009130
+-:10023000E1E1010181240081868F802E03CA0ED165
+-:10024000CAE10E1F868F002F09C9006904FC13C97B
+-:100250008081FF2EE0E0131F802D008137370711CA
+-:1002600037375813FBFB1D1F00FA00210408002438
+-:100270008403002F04310024242000248403002F51
+-:100280009689802E0176050B0B0100513301055133
+-:100290009101045304FC0BC98081FF2EE0E00B1F89
+-:1002A000802D0081FBFB1C1F042100248403002FF0
+-:1002B0000087002103591F11020316513737071118
+-:1002C000040D00248403002F04000024C49696101B
+-:1002D0008403002FDE00002402030B6903150024B1
+-:1002E00002031071090316713737071137372813C6
+-:1002F000DE02002409FC08C98081FF2EE0E0081F0F
+-:10030000802D008100C600210003010980150090A6
+-:100310009E00C022FDDE00575959E01159590312C1
+-:1003200000FF07C99627208305DE016900FF0BD176
+-:100330009E8700240BFF0CD100DD0021DE37030B6C
+-:10034000DEDE040986F4DE908381FF2EE3E31C1FCA
+-:100350009E87002400CF03219E87002400AD032147
+-:100360008687812E8381FF2EE3E31C1F9E87002456
+-:1003700000CF03218687812E04970AD137370711D2
+-:100380003737301300FA002181173F1181810609A8
+-:1003900081810C1F81811401C197060BC1C1071116
+-:1003A0008381FF2EE3E31C1F03C1006986E0819077
+-:1003B00000CF032103C1016986E1819000CF0321B1
+-:1003C00003C1026986E2819000CF0321373707110C
+-:1003D0003737581305FC14C98281FF2EE2E2141F3F
+-:1003E000822D008100FA00218137030B81810409ED
+-:1003F00086F481908381FF2EE3E31C1F9E870024F7
+-:1004000000CF0321E60C00248681002F0054022136
+-:1004100004FF0AC9E60A00248681002F0054022145
+-:1004200004801859E60F00248681002F0054022111
+-:100430008A83802E062A00D1DDDD0101810020247F
+-:1004400003DD8170E608002400140121E600002489
+-:100450008681002F04000024C41800248403002F88
+-:100460008E89802EE3F2F210F2EBEB10096A005154
+-:10047000044A1061E61100247A7A001F0054022118
+-:10048000814A040981810101011A8190727261120D
+-:10049000022A01C91D1D001F9381FF2E73C0002475
+-:1004A0008E6B2083142A02C98C33B4918327148164
+-:1004B0000180002461072081640400244406002494
+-:1004C000C5CCCC10052C2C100420002424F00024D2
+-:1004D0008403002F81240891E1E101018124088136
+-:1004E000E10100248124048100FF0AD100FF01D131
+-:1004F000008700210054022104FF0AC9E60A0024F3
+-:100500008681002F0054022104DD0069E6090024E1
+-:100510008681002F00490121E60000248681002FFA
+-:10052000DDDD01058A83802EF2EBEB109381FF2E37
+-:10053000738000240A6A0051044A1071E6110024F5
+-:100540008681002F00540221814A04098181010122
+-:10055000011A81907272611200590121022A01C9A7
+-:100560001D1D001D926B308100540221E301002407
+-:10057000832B04819D81FF2E5D170091906B0124D8
+-:10058000D19E012491C20124D2D70124922B0224AE
+-:10059000D3080224002C00240000020100002205E0
+-:1005A00050D5228F9C81FF2E00009E20D9D90B1F91
+-:1005B000589696108685802E08870051DADAC70093
+-:1005C000DADA1103C5DA0003C4C7C7102400002417
+-:1005D000045200248403002FD796C7009696080182
+-:1005E00038969610FBFB171F091D00D18068082460
+-:1005F00007868068D9D90E1F031400240400002444
+-:10060000C40800248403002F00009E20151D01C98A
+-:10061000C013BA910286805012C680681919051F4E
+-:100620000310002437370711DE02002407C70C71BE
+-:1006300004E800513737E013030A002400009E202D
+-:100640003737D81300009E2004C709690368FF6983
+-:100650003737D01300009E203737E81300009E2064
+-:100660008581FF2E05171710A58686108501012F9D
+-:10067000DE01002400009E20D9D90B1F5896961049
+-:100680008683802E8296D704C4C7C71002C700692C
+-:10069000C482821019C4824818C40861DADA820060
+-:1006A000DADA8803C5DA00032400002404520024A7
+-:1006B0008403002F9696080138969610FBFB171FAF
+-:1006C000081D00D180680824068680680314002471
+-:1006D00004000024C40800248403002F00009E208E
+-:1006E0008581FF2E05171710A58686108501012F1D
+-:1006F000DE01002400009E203737071137374813EA
+-:10070000DE02002400009E20D9D90D1F58969610B5
+-:100710008689802E8581FF2E05171710A5868610E5
+-:100720008501012FC4D79604DADAC400DADA0603A9
+-:10073000C5DA000324000024045200248403002F9F
+-:1007400081C90C0B8181020996968100389696101A
+-:10075000DE010024FBFB181F00009E203737071125
+-:10076000DE020024031000248687802E0166E0113B
+-:10077000030120513737A81300009E20036604D1DF
+-:100780003737A81300009E201546FF692108002472
+-:10079000016607110901005121210401076602C900
+-:1007A000060800511D08C0691C09006921210401C7
+-:1007B0005656041FA9073481969621000400002490
+-:1007C000C42121108403002F8581FF2EE5E7E71067
+-:1007D0008501012FDE01002400009E2003460169EF
+-:1007E0003737801300009E2003460269373788138D
+-:1007F00000009E2003461A693737901300009E20A0
+-:1008000003461F693737981300009E200346FE6990
+-:100810003737A01300009E203737A81300009E2012
+-:10082000D9D90F1F0137F8110101030B8101040908
+-:10083000818100018EFA819081000024040000244F
+-:10084000C4CF81048181C4008403002F0680802EE0
+-:100850006566711065654E12C48F81048181C40084
+-:100860008403002F0680802E45665110C4D0810479
+-:100870008181C4008403002F0680802E25663110FC
+-:1008800005171710062E00D1C49081048181C40081
+-:100890008403002F0680802E056611108501012F2C
+-:1008A000DE010024FBFB191F00009E20C0D7380189
+-:1008B000C0C00205C006C090D7D72004D7D7020514
+-:1008C0006103009003013F11DE00002400009E2020
+-:1008D00000009E20DA00002480898910040D002485
+-:1008E0008403002F8687802E00FF07C98827188180
+-:1008F0000447CE51E60100248681002F00540221D6
+-:100900005A0000240F6701510F6702510F6703510E
+-:100910000F670451A467065157670C5148670A5383
+-:10092000D067085103670B532267095324670551A9
+-:10093000C3670751E60200248681002F005402217C
+-:10094000000101210001012100040121003E0121DB
+-:100950001529066981240891E1E1010181240881BA
+-:10096000067A00C904430024C45A5A1024040024FF
+-:10097000E5E6E6108403002F6400002444292910D2
+-:10098000C5C9C910050909100420002424F0002459
+-:1009900061170091020003599E3402238403002F43
+-:1009A00000870021E42100248401002F81240C9180
+-:1009B000E1E1010181240C81008700210480345988
+-:1009C000E60F00248681002F00540221E600002457
+-:1009D0008681002F8A87802E04000024C4200024F2
+-:1009E0008403002F8E87802E026A00C98B33A0817A
+-:1009F000056A01C98C33A48161010024E21000243E
+-:100A0000812204E1056A02C98D33A88161010024B5
+-:100A1000E2200024812204E1026A03C98E33AC8102
+-:100A2000026A04C98F33B081026A05C99033B48168
+-:100A30000E6A06C9C100012481000024027100C9A8
+-:100A400081010024E200002481220CE181000024C5
+-:100A5000027101C981010024E210002481220CE10D
+-:100A6000E220002481220CE1BA6A07CFFCF2F210E6
+-:100A700000540221E60000248681002F8A83802E04
+-:100A800004000024096A0069C0F801240480C058E9
+-:100A9000E60F00248681002F00540221C418002490
+-:100AA0008403002F00DF0221C41400248403002FDC
+-:100AB000176A016904803C59E60F00247A7A001F06
+-:100AC000005402218E83802E046E0471E6100024EF
+-:100AD0007A7A001F00540221816E0509C16E030954
+-:100AE0008181C100818100018E738180C40800244E
+-:100AF0008403002F8E8F802E818108018EF38182E6
+-:100B0000C42000248403002F005402210E6A0269CD
+-:100B100004802459E60F00247A7A001F0054022131
+-:100B20008E87802E046E1071E61100247A7A001FE1
+-:100B300000540221816E0409818100018EFA8180B6
+-:100B4000005402210B6A046904801859E60F00243E
+-:100B50007A7A001F005402218E81802E1D1D011DF6
+-:100B6000026E00C91D1D011F8E33B8810054022181
+-:100B7000E60200247A7A001F00540221E1000024DA
+-:100B8000C41000248E87802E8403002F02EB01C83E
+-:100B90008EF4C18001010101C1C11001FA011E677B
+-:100BA000005402218A83802E04000024C4180024EB
+-:100BB0008403002F194A0151E1000024026A005108
+-:100BC0008101FF2E812C0C8183000F2486E283801B
+-:100BD000C204002482804F24E120602486E100F7D3
+-:100BE00086E200E78483FF2E24400024043700249B
+-:100BF000E5E2E2108403002FE1E14001E2E240017E
+-:100C000086E100F786E200E7E5E2E2108403002FC8
+-:100C100086E2839000540221086A00518E8FFF2ED5
+-:100C2000E2000824E1000824E1E1E2008EE0E28233
+-:100C3000E2E22001FEE2E16E005402210400002401
+-:100C4000C41000248403002F240C00240433002447
+-:100C50008403002F8EB700918E85002F005402214F
+-:100C6000C05400240480C058E60F00248681002F61
+-:100C7000005402218A81802E046A2071E60E00242D
+-:100C80008681002F005402218E8FFF2EC26A060932
+-:100C9000144A006904000024C41400248403002FB3
+-:100CA00060200024022A0459602A03098EBF802E86
+-:100CB0008EF6C2828E8FFF2EC2C22001072A0471D7
+-:100CC00004000024C42000248403002F602A0405AB
+-:100CD000606003098EBF802E8EF6C282005402210E
+-:100CE000054A01698EF6C282C2C220018EF6C28216
+-:100CF000005402210C4A026904000024C414002498
+-:100D00008403002F8483FF2E244000240447002402
+-:100D1000C504002485006624E5E5C2008403002F95
+-:100D200000540221E60F00248681002F0054022186
+-:100D3000C01400240480C058E60F00248681002FD0
+-:100D4000005402218A81802E8B33B091048ACB70AB
+-:100D5000E61300248681002F00540221086A00C98E
+-:100D600082000424C20008248100A024C100A02421
+-:100D70008120828082820401FE82C26E04000024EF
+-:100D8000C41400248403002FC4040024820004241B
+-:100D9000F08A00558E81802EC2CE0109C2C2820027
+-:100DA000CE00C2808A8A01058403002F00640321DB
+-:100DB000C05800240480C058E60F00248681002F0C
+-:100DC000005402218A83802E246A6A10E5EBEB101E
+-:100DD000046300248403002F04000024C4180024AA
+-:100DE0008403002F8E8F802E2400002404620024B0
+-:100DF00001380024E501222C8403002F01010401A5
+-:100E000024240101FC24086704000024C4200024D9
+-:100E10008403002F8E8F802E240800240462002477
+-:100E200001380024E501222C8403002F0101040174
+-:100E300024240101FC24106700540221C0900024E6
+-:100E40000480C058E60F00248681002F0054022140
+-:100E50008A81802E8B33AC91046A6B60E612002489
+-:100E60008681002F00540221816A0609024B8069A5
+-:100E7000818101098A21818081810401040000248B
+-:100E8000C41400248403002FC4200024404B040514
+-:100E90008E8F802E8EE181828403002F40402005BA
+-:100EA00081812001FB40204F0EBF802E0EE1818EFC
+-:100EB000005402210037030B3737071176761F11D4
+-:100EC00056560F111683002FC0000609000000249B
+-:100ED0008E76C090046E07D1042100248403002F75
+-:100EE00000009E20056E00C9040C00248403002F1E
+-:100EF000041100248403002F036E01C900FF06D1F2
+-:100F00008F2718818483FF2E24F0002404220024DC
+-:100F100044060024C58E8E10054E4E108403002F0B
+-:100F2000C0C008010000010100FF04C9040800243A
+-:100F30008403002FE900085700B4032190D7D7108D
+-:100F4000156602690E4700516107269101010711DC
+-:100F5000212703090101211261072681C1072C9174
+-:100F60008181E01103470151C116002400DD0321F6
+-:100F7000C10D00248181C112C1072C81E4205024BD
+-:100F800064180024446767108403002F6E690351BE
+-:100F900000009E20276600698727188105080051F8
+-:100FA0006207099102020F11020208126207098109
+-:100FB0005869015157690451086902692449491067
+-:100FC00004300024C58989108403002F97072491D9
+-:100FD000D7D749009707248109680069E420F024E5
+-:100FE0006418002444060024C58686100546461071
+-:100FF0008403002F5469035100009E2096672091BE
+-:101000007676A0135656071F373707110248030993
+-:101010003737021296672081E42050246418002498
+-:10102000442828108403002F4769035100009E20A4
+-:101030001466016987671881366901513569045161
+-:10104000086902692449491004300024C5898910BF
+-:101050008403002F97072491D7D74900970724814D
+-:10106000E420F0246418002444060024C586861079
+-:10107000054646108403002F3369035100009E206B
+-:101080000E660469876720816207089102020711D2
+-:10109000226903090202221262070881E420F02477
+-:1010A0006408002444060024C586861005464610C0
+-:1010B0008403002F00009E200B66036962070991DC
+-:1010C00002020F110202671262070981E420502414
+-:1010D00064000024440700248403002F1A6903518C
+-:1010E00000009E2006660551FBFB141F04FC14C97A
+-:1010F0008281FF2EE2E2141F822D0081FBFBE312AE
+-:10110000042100248403002F0F69035100009E2056
+-:10111000966720917676A0135656061F29073081D0
+-:101120009607208126070B81C6071281E4205024F0
+-:1011300064180024440400248403002F026904512D
+-:1011400000009E20D08989108F198091014F0401E1
+-:1011500001011F11036F0168FBFB141F00009E209B
+-:10116000C14F90019039C1806119818100009E209A
+-:00000001FF
+diff --git a/firmware/keystone/pa_pdsp3_1_3_0_2.fw.ihex b/firmware/keystone/pa_pdsp3_1_3_0_2.fw.ihex
+new file mode 100755
+index 0000000..6170c9c
+--- /dev/null
++++ b/firmware/keystone/pa_pdsp3_1_3_0_2.fw.ihex
+@@ -0,0 +1,282 @@
++:10000000007B00210200BEBA02000301845050248C
++:10001000C4848410E5E4E410E6E4E410E7E4E410CA
++:10002000E8E4E410E9E4E410EAE4E410EBE4E410CA
++:1000300084E3008384E3208384E3408384E3608358
++:1000400084E3808384E3A08384E3C08384E3E08348
++:1000500004430024640304810444002464032981CC
++:10006000040A002464033281040C002464033381F5
++:100070000409002464032F810453002464030681CF
++:1000800004050024640300810406002464032B811A
++:100090000407002464032C810408002464033C81C9
++:1000A00004510024640311810452002464038881F4
++:1000B000040F00246403848180A7FF2E80F300894D
++:1000C00080F3508980FA008780FA408780FA808721
++:1000D00080FAC087E5000024E1E001248887FF2E34
++:1000E0006805002488F4E580E5E51001FEE5E16E91
++:1000F000C800812488A88824C900082489DD8624B2
++:10010000CA4788248A488824CB6488248B6388243F
++:1001100088F54081E500002485356081899FFF2EA8
++:1001200085000024C500082489F685868585400160
++:10013000FE85C56E040000246418008104010024BB
++:100140006418208104020024641840810403002400
++:10015000641860810404002464188081040500246C
++:100160006418A081E0010024E1640024806A048115
++:10017000828FFF2E82F3A0836202002442020024B9
++:10018000220200248233A0816540002445400024DF
++:100190008533AC81F4000424F50008248000A024F9
++:1001A000C000A0248020F480F4F40401FEF4F56E75
++:1001B000F4000824F5001024809FFF2E80E0F486D0
++:1001C000F4F44001FEF4F56EF480002480E0F48045
++:1001D000F480012480E0F480F480022480E0F48044
++:1001E000F480032480E0F48000009E209E5D0123C3
++:1001F0008285FF2E82A40481E201002482240081F2
++:1002000000FF00C900FF00D104FF01C99E030023C5
++:10021000E2000024822404819D81FF2E9B81FF2E19
++:100220005D17009182020024C203012482370481F9
++:1002300003FB00519B2C08819B81FF2EFDFF04CF07
++:10024000FBFB161F81240091E1E101018124008163
++:10025000868F802E03CA0ED1CAE10E1F868F002F13
++:1002600009C9006904FC13C98081FF2EE0E0131F57
++:10027000802D00813737071137375813FBFB1D1FBF
++:1002800000FC0021040800248403002F0431002412
++:10029000242000248403002F9689802E0176050BEC
++:1002A0000B0100512F0105518D01045304FC0BC9B2
++:1002B0008081FF2EE0E00B1F802D0081FBFB1C1FC7
++:1002C000042100248403002F008C002103591F11F6
++:1002D0000203165137370711040D00248403002F41
++:1002E00004000024C49696108403002FDE0000242E
++:1002F00002030B6903150024020310710503167134
++:100300009E8C002400FF07C99627208300DF002170
++:1003100000030109801500909E00C022FDDE0057F9
++:100320005959E0115959031200FF07C99627208334
++:1003300005DE016900FF0BD19E8C00240BFF0CD160
++:1003400000DF0021DE37030BDEDE040986F4DE90D9
++:100350008381FF2EE3E31C1F9E8C002400D6032123
++:100360009E8C002400B403218687812E8381FF2E7A
++:10037000E3E31C1F9E8C002400D603218687812E78
++:1003800004970AD1373707113737301300FC0021A3
++:1003900081173F118181060981810C1F8181140120
++:1003A000C197060BC1C107118381FF2EE3E31C1F18
++:1003B00003C1006986E0819000D6032103C1016971
++:1003C00086E1819000D6032103C1026986E2819013
++:1003D00000D60321373707113737581305FC14C9E6
++:1003E0008281FF2EE2E2141F822D008100FC002199
++:1003F0008137030B8181040986F481908381FF2E6C
++:10040000E3E31C1F9E8C002400D60321E60C00248D
++:100410008681002F0056022104FF0AC9E60A002443
++:100420008681002F0056022104801859E60F00240F
++:100430008681002F005602218A83802E062A00D151
++:10044000DDDD01018100202403DD8170E608002448
++:1004500000160121E60000248681002F04000024FC
++:10046000C41800248403002F8E89802EE3F2F2103A
++:10047000F2EBEB10096A0051044A1061E611002406
++:100480007A7A001F00560221814A04098181010104
++:10049000011A819072726112022A01C91D1D001F8A
++:1004A0009381FF2E73C000248E6B2083142A02C90F
++:1004B0008C33B4918327148101800024610720814B
++:1004C0006404002444060024C5CCCC10052C2C1058
++:1004D0000420002424F000248403002F81240891A8
++:1004E000E1E1010181240881E101002481240481EA
++:1004F00000FF0AD100FF01D1008C0021005602212B
++:1005000004FF0AC9E60A00248681002F0056022152
++:1005100004DD0069E60900248681002F004B0121DB
++:10052000E60000248681002FDDDD01058A83802E10
++:10053000F2EBEB109381FF2E738000240A6A0051C6
++:10054000044A1071E61100248681002F0056022112
++:10055000814A040981810101011A8190727261123C
++:10056000005B0121022A01C91D1D001D926B308113
++:1005700000560221E3010024832B04819D81FF2E7C
++:100580005D170091906D0124D1A0012491C4012434
++:10059000D2D90124922D0224D30A0224002C002453
++:1005A000000002010000220550D5228F9C81FF2E01
++:1005B00000009E20D9D90B1F589696108685802E54
++:1005C00008870051DADAC700DADA1103C5DA000366
++:1005D000C4C7C71024000024045200248403002F41
++:1005E000D796C7009696080138969610FBFB171F02
++:1005F000091D00D18068082407868068D9D90E1F9C
++:100600000314002404000024C40800248403002FE1
++:1006100000009E20151D01C9C013BA9102868050AA
++:1006200012C680681919051F0310002437370711F7
++:10063000DE02002407C70C7104E800513737E013CD
++:10064000030A002400009E203737D81300009E20A4
++:1006500004C709690368FF693737D01300009E207B
++:100660003737E81300009E208581FF2E05171710ED
++:10067000A58686108501012FDE01002400009E2042
++:10068000D9D90B1F589696108683802E8296D70450
++:10069000C4C7C71002C70069C482821019C4824847
++:1006A00018C40861DADA8200DADA8803C5DA0003EE
++:1006B00024000024045200248403002F969608018D
++:1006C00038969610FBFB171F081D00D18068082480
++:1006D000068680680314002404000024C408002453
++:1006E0008403002F00009E208581FF2E0517171020
++:1006F000A58686108501012FDE01002400009E20C2
++:100700003737071137374813DE02002400009E20D8
++:10071000D9D90D1F589696108689802E8581FF2E77
++:1007200005171710A58686108501012FC4D79604DA
++:10073000DADAC400DADA0603C5DA0003240000249A
++:10074000045200248403002F81C90C0B818102090B
++:100750009696810038969610DE010024FBFB181F48
++:1007600000009E2037370711DE020024031000240A
++:100770008687802E0166E011030120513737A813C8
++:1007800000009E20036604D13737A81300009E2086
++:100790001546FF692108002401660711090100516F
++:1007A00021210401076602C9060800511D08C0691D
++:1007B0001C090069212104015656041FA907348130
++:1007C0009696210004000024C42121108403002FE8
++:1007D0008581FF2EE5E7E7108501012FDE0100246A
++:1007E00000009E20034601693737801300009E20D9
++:1007F000034602693737881300009E2003461A69B2
++:100800003737901300009E2003461F69373798132F
++:1008100000009E200346FE693737A01300009E208B
++:100820003737A81300009E20D9D90F1F0137F811C0
++:100830000101030B81010409818100018EFA81907D
++:100840008100002404000024C4CF81048181C400FD
++:100850008403002F0680802E6566711065654E1238
++:10086000C48F81048181C4008403002F0680802E00
++:1008700045665110C4D081048181C4008403002FD7
++:100880000680802E2566311005171710062E00D120
++:10089000C49081048181C4008403002F0680802ECF
++:1008A000056611108501012FDE010024FBFB191FD5
++:1008B00000009E20C0D73801C0C00205C006C0900D
++:1008C000D7D72004D7D702056103009003013F1159
++:1008D000DE00002400009E2000009E20DA0000249C
++:1008E00080898910040D00248403002F8687802EC0
++:1008F00000FF07C9882718810447CE51E60100246C
++:100900008681002F005602215A0000240F670151F2
++:100910000F6702510F6703510F670451A967065112
++:100920005C670C514D670A53D567085108670B5334
++:100930002767095324670551C8670751E602002459
++:100940008681002F005602210003012100030121AE
++:100950000006012100400121152906698124089122
++:10096000E1E1010181240881067A00C904430024E1
++:10097000C45A5A1024040024E5E6E6108403002F2C
++:100980006400002444292910C5C9C91005090910AB
++:100990000420002424F00024611700910200035970
++:1009A0009E3602238403002F008C0021E4210024C2
++:1009B0008401002F81240C91E1E1010181240C814B
++:1009C000008C002104803859E60F00248681002F16
++:1009D00000560221E60000248681002F8A87802E9F
++:1009E00004000024C42000248403002F8E8B802E5A
++:1009F000026A00C98B33A081056A01C98C33A481C6
++:100A000061010024E2100024812204E1056A02C988
++:100A10008D33A88161010024E2200024812204E1B9
++:100A2000026A03C98E33AC81026A04C98F33B08174
++:100A3000026A05C99033B481136A06C99233BC8136
++:100A4000C100012481000024027100C90101071FB7
++:100A5000027102C90101061FE200002481220CE19B
++:100A600081000024027101C90101071F027103C93D
++:100A70000101061FE210002481220CE1E220002483
++:100A800081220CE1B56A07CFFCF3F3100056022176
++:100A9000E60000248681002F8A83802E0400002433
++:100AA000096A0069C0F801240480C058E60F0024D8
++:100AB0008681002F00560221C41800248403002FD1
++:100AC00000E60221C41400248403002F176A016980
++:100AD00004803C59E60F00247A7A001F0056022158
++:100AE0008E83802E046E0471E61000247A7A001F33
++:100AF00000560221816E0509C16E03098181C10082
++:100B0000818100018E738180C40800248403002F3A
++:100B10008E8F802E818108018EF38182C420002473
++:100B20008403002F005602210E6A026904802459B2
++:100B3000E60F00247A7A001F005602218E87802E4D
++:100B4000046E1071E61100247A7A001F005602210B
++:100B5000816E0409818100018EFA81800056022194
++:100B60000B6A046904801859E60F00247A7A001F82
++:100B7000005602218E81802E1D1D011D026E00C9AE
++:100B80001D1D011F8E33B88100560221E60200248C
++:100B90007A7A001F00560221E1000024C4100024CC
++:100BA0008E87802E8403002F02EB01C88EF4C18053
++:100BB00001010101C1C11001FA011E6700560221A5
++:100BC0008A83802E04000024C41800248403002F8C
++:100BD000194A0151E1000024026A00518101FF2EEF
++:100BE000812C0C8183000F2486E28380C2040024C0
++:100BF00082804F24E120602486E100F786E200E74E
++:100C00008483FF2E2440002404370024E5E2E21010
++:100C10008403002FE1E14001E2E2400186E100F7B8
++:100C200086E200E7E5E2E2108403002F86E283908B
++:100C300000560221086A00518E8FFF2EE200082420
++:100C4000E1000824E1E1E2008EE0E282E2E220013C
++:100C5000FEE2E16E0056022104000024C4100024CC
++:100C60008403002F240C0024043300248403002F69
++:100C70008EB700918E85002F00560221C0540024AB
++:100C80000480C058E60F00248681002F0056022100
++:100C90008A81802E046A2071E60E00248681002F4E
++:100CA000005602218E8FFF2EC26A0609144A00697F
++:100CB00004000024C41400248403002F60200024B6
++:100CC000022A0459602A03098EBF802E8EF6C28242
++:100CD0008E8FFF2EC2C22001072A04710400002457
++:100CE000C42000248403002F602A040560600309E7
++:100CF0008EBF802E8EF6C28200560221054A0169FF
++:100D00008EF6C282C2C220018EF6C2820056022135
++:100D10000C4A026904000024C41400248403002F38
++:100D20008483FF2E2440002404470024C5040024AB
++:100D300085006624E5E5C2008403002F00560221E9
++:100D4000E60F00248681002F00560221C0140024E3
++:100D50000480C058E60F00248681002F005602212F
++:100D60008A81802E8B33B091048ACB70E6130024E5
++:100D70008681002F00560221086A00C982000424DF
++:100D8000C20008248100A024C100A0248120828008
++:100D900082820401FE82C26E04000024C414002476
++:100DA0008403002FC404002482000424EB8A00552D
++:100DB0008E81802EC2CE0109C2C28200CE00C280C6
++:100DC0008A8A01058403002F006B0321C058002488
++:100DD0000480C058E60F00248681002F00560221AF
++:100DE0008A83802E246A6A10E5EBEB1004630024EA
++:100DF0008403002F04000024C41800248403002F5F
++:100E00008E8F802E240000240462002401380024E8
++:100E1000E501222C8403002F010104012424010197
++:100E2000FC24086704000024C42000248403002F4D
++:100E30008E8F802E240800240462002401380024B0
++:100E4000E501222C8403002F010104012424010167
++:100E5000FC24106700560221C09000240480C05872
++:100E6000E60F00248681002F005602218A81802E01
++:100E70008B33AC91046A6B60E61200248681002FEC
++:100E800000560221816A0609024B806981810109AD
++:100E90008A2181808181040104000024C41400247B
++:100EA0008403002FC4200024404B04058E8F802E25
++:100EB0008EE181828403002F404020058181200142
++:100EC000FB40204F0EBF802E0EE1818E0056022186
++:100ED0000037030B3737071176761F1156560F115F
++:100EE0001683002FC0000609000000248E76C090F3
++:100EF000046E07D1042100248403002F00009E20EB
++:100F0000056E00C9040C00248403002F0411002482
++:100F10008403002F036E01C900FF06D18F271881BB
++:100F20008483FF2E24F0002404220024440600249D
++:100F3000C58E8E10054E4E108403002FC0C00801D0
++:100F40000000010100FF04C9040800248403002FED
++:100F5000E900085700BB032190D7D7101566026936
++:100F60000E4700516107269101010711212703094E
++:100F70000101211261072681C1072C918181E011B5
++:100F800003470151C116002400E40321C10D0024D0
++:100F90008181C112C1072C81E420502464180024EF
++:100FA000446767108403002F6E69035100009E2080
++:100FB0002766006987271881050800516207099193
++:100FC00002020F11020208126207098158690151D9
++:100FD0005769045108690269244949100430002402
++:100FE000C58989108403002F97072491D7D749001A
++:100FF0009707248109680069E420F024641800241C
++:1010000044060024C5868610054646108403002F3A
++:101010005469035100009E20966720917676A013B4
++:101020005656071F37370711024803093737021290
++:1010300096672081E4205024641800244428281056
++:101040008403002F4769035100009E201466016944
++:101050008767188136690151356904510869026949
++:101060002449491004300024C58989108403002FC5
++:1010700097072491D7D7490097072481E420F024CB
++:101080006418002444060024C586861005464610D0
++:101090008403002F3369035100009E200E6604690B
++:1010A00087672081620708910202071122690309FC
++:1010B0000202221262070881E420F024640800245E
++:1010C00044060024C5868610054646108403002F7A
++:1010D00000009E200B6603696207099102020F114E
++:1010E0000202671262070981E42050246400002490
++:1010F000440700248403002F1A69035100009E2036
++:1011000006660551FBFB151F04FC14C98281FF2EE6
++:10111000E2E2141F822D0081FBFBE3120421002474
++:101120008403002F0F69035100009E2096672091D1
++:101130007676A0135656061F290730819607208120
++:1011400026070B81C6071281E4205024641800246E
++:10115000440400248403002F0269045100009E20EF
++:10116000D08989108F198091014F040101011F114D
++:10117000036F0168FBFB151F00009E20C14F90010B
++:0C1180009039C1806119818100009E201F
++:00000001FF
+diff --git a/firmware/keystone/pa_pdsp45_1_2_1_2.fw.ihex b/firmware/keystone/pa_pdsp45_1_2_1_2.fw.ihex
+deleted file mode 100644
+index b46bdfc..0000000
+--- a/firmware/keystone/pa_pdsp45_1_2_1_2.fw.ihex
++++ /dev/null
+@@ -1,357 +0,0 @@
+-:100000000079002184505024C4848410E5E4E41075
+-:10001000E6E4E410E7E4E410E8E4E410E9E4E410E2
+-:10002000EAE4E410EBE4E41084E3008384E3208357
+-:1000300084E3408384E3608384E3808384E3A08358
+-:1000400084E3C08384E3E0830443002464030481E5
+-:100050000444002464032981040A002464033281D7
+-:10006000040C0024640333810409002464032F81F9
+-:100070000453002464030681040500246403008102
+-:100080000406002464032B810407002464032C81EC
+-:100090000408002464033C8104510024640311819A
+-:1000A0000452002464038881040F002464038481C3
+-:1000B00080A7FF2E80F3008980F3508980FA0087A3
+-:1000C00080FA408780FA808780FAC087E5000024A4
+-:1000D000E1E001248887FF2E6805002488F4E5808C
+-:1000E000E5E51001FEE5E16EC800812488A88824BA
+-:1000F000C900082489DD8624CA4788248A488824C0
+-:10010000CB6488248B63882488F54081E500002433
+-:1001100085356081899FFF2E85000024C500082455
+-:1001200089F6858685854001FE85C56E040000241C
+-:100130006418008104010024641820810402002452
+-:1001400064184081040300246418608104040024BE
+-:1001500064188081040500246418A081E001002453
+-:10016000E1640024806A0481828DFF2E82B3A08323
+-:100170006202002442020024220200248233A08171
+-:1001800065400024454000248533AC81F4000424FC
+-:10019000F50008248000A024C000A0248020F48062
+-:1001A000F4F40401FEF4F56EF4000824F5001024C4
+-:1001B000809FFF2E80E0F486F4F44001FEF4F56E9B
+-:1001C000F480002480E0F480F480012480E0F48056
+-:1001D000F480022480E0F480F480032480E0F48042
+-:1001E00000009E209E8B05238285FF2E82A4048121
+-:1001F000E20100248224008100FF00C900FF00D139
+-:1002000004FF01C99E010023E2000024822404812E
+-:100210001D1700915D0000249B81FF2E03FB005100
+-:100220009B2C08819B81FF2E137D05516E040024B9
+-:100230004E5D5D100F6E00518E4E0809CF8E9001FD
+-:100240008E8E8001CF008E904E4E01014E4E0311D6
+-:100250006E6E0105F80F2F56812FCF0090208190F0
+-:100260002F2F04012F2F1F114F008E809E4A032332
+-:100270005D4E4E10EAFF04CF81240091E1E10101BF
+-:10028000812400819483FF2EF8000024868F802E25
+-:1002900003CA0ED1CA920E1F868F002F0BC90069A8
+-:1002A00004FC13C98081FF2EE0E0131F802D008124
+-:1002B000DEB0002486F4DE908381FF2EE3E31E1F70
+-:1002C0009E87002400F60421040800248403002FE4
+-:1002D00004310024242000248403002F9689802EDA
+-:1002E0000176050B100100514E0103512F010251FF
+-:1002F0001F010151A5010553A301045342010651F9
+-:10030000900107518483FF2E042100248403002FD1
+-:10031000C3FC13CF8081FF2EE0E0131F802D0081EE
+-:10032000008700210C7502598685802EE20000248A
+-:1003300002750051E2E20C0186B9E2807575010197
+-:1003400004010024C40C00248403002FE43506CFEC
+-:100350000000F420FBFB1E1FE1FC13CF8081FF2E69
+-:10036000E0E0131F802D008100B70021093507D17F
+-:100370008685802E86B9C0813535071F040100248B
+-:10038000C40C00248403002FD53506CF0000F420D0
+-:10039000FBFB1E1FD2FC13CF8081FF2EE0E0131F5A
+-:1003A000802D008100B700210E5504598689802ECA
+-:1003B0000046040B00000209C3550509C3C34001F0
+-:1003C00006D9C38E04010024C446040BC4C4020928
+-:1003D0008403002F55550101C13506CF0000F420DC
+-:1003E000FBFB1E1F04FC13C98081FF2EE0E0131FDE
+-:1003F000802D00818483FF2E042100248403002F9C
+-:10040000008700218E83802E8E79E0813535031F91
+-:1004100004010024C40800248403002F00B7002135
+-:100420008687802EC40C0024176603C9C4C4040147
+-:10043000426607110D4200696666F811666606138A
+-:1004400062070891020207112269030902022212BF
+-:10045000620708811502021087672081C4100024FA
+-:100460003535051F002201216207099102020F1193
+-:100470000202691262070981150202103535041F54
+-:100480000242075187671881F3E6E610ECE7E710B0
+-:10049000EDE8E810040100248401002F056604C97A
+-:1004A0003535061F942C0124D400002400B7002108
+-:1004B000383502D19E0102238483FF2E04200024BC
+-:1004C0004473071124F00024C5939310055353106F
+-:1004D000023505C964080024183503C98E79E091F6
+-:1004E000042200248403002FE1003024802108F13D
+-:1004F000C0FFFF2480C080048015629100FF04C902
+-:100500008B83802EEBE0E010ECEFEF108B83002F5D
+-:10051000040C00248403002F041100248403002F02
+-:100520008483FF2E042000244406002424F00024A9
+-:10053000C58E8E10054E4E108403002F00870021BB
+-:1005400004010024C40400248401002F01761F113B
+-:10055000630100570B0102696175025F7602002496
+-:1005600003960FC97604002496960F1DC3750209E1
+-:10057000C3C3F8019639C3807575010100B7002126
+-:10058000063506D13535021F9639F08100B70021B6
+-:100590009639F0918279F8918E85FF2ECE9696103D
+-:1005A0002E565610040C00248403002F040000244F
+-:1005B000C42E2E108403002F8689802E0066F01131
+-:1005C00003004051CFC7280100D50121CF868610F6
+-:1005D0000E660F110E0E02095FCECF585E870ED148
+-:1005E0008F878710D0CE0E045050F811E190030B86
+-:1005F000878FE100E090D000E1CF0E0403E1E048F6
+-:10060000D0E190040083012187870D1F86D00E0062
+-:10061000880000248685002F1175005104430024B2
+-:1006200024626210C442421003240251E582860013
+-:10063000008E0121C58286008403002F08750151B8
+-:1006400024636310C443431003240251E5838600EE
+-:1006500000960121C58386008403002F8483FF2E2A
+-:1006600004510024C40E0E10850A00248403002FB8
+-:1006700004000024C40E0E108401002F4A90005183
+-:1006800004010024C49090108401002F81000024F4
+-:1006900004000024C4D081048401002F9090D00075
+-:1006A000E1900E0024E1CF58041100248401002FB2
+-:1006B0008483FF2E042200244473071124F20024B3
+-:1006C000C593931005535310023505C964080024DF
+-:1006D0008403002F00FF04C9033505C968151510F0
+-:1006E0000880002F033504C9481515102880002FF5
+-:1006F0008C83002F040800248401002F073505C9CE
+-:100700000431002424040024E5ECEC108403002FC1
+-:10071000E5EDED108403002F040D00248401002F6B
+-:1007200004000024C42E2E108401002F8689802E00
+-:10073000007B0121E0862E0060E03C5F84100024F5
+-:100740008401002F8433002424E03C0D8401002F19
+-:10075000002E01211175005104430024246262100F
+-:10076000C442421003240251E582CF0000DD012182
+-:10077000C582CF008403002F0875015124636310E4
+-:10078000C443431003240251E583CF0000E5012157
+-:10079000C583CF008403002F822E2E109E2E0124AD
+-:1007A000003B022181000024BA55016F804470246F
+-:1007B000C0040024027D056920200101414000247D
+-:1007C00086394190C10E2E00B286C166B14603CF74
+-:1007D000C486C10481C4C4108403002F0401002412
+-:1007E000C4661F118403002F8181C40004370024D4
+-:1007F00024661F11C4000024E5E0E0108403002FEC
+-:1008000000A40121040C00248403002F8200002492
+-:100810002275005186B9009104000024C486861018
+-:100820008403002F82C4C41004510024C4C7C7101D
+-:10083000C5C8C810858787102446070B8403002F7E
+-:100840001675017186B90C910A868258FBFB1E1F32
+-:10085000042100248403002FFBFB1E1F70FC13CD1A
+-:100860008081FF2EE0E0131F802D00810087002192
+-:1008700004000024C48682048282C4008403002F02
+-:1008800004530024C4C7C710C5C8C8108587871083
+-:100890002446070B8403002F153507C986B9C0917C
+-:1008A00009868258FBFB1E1F042100248403002FAD
+-:1008B0005BFC13CD8081FF2EE0E0131F802D0081B3
+-:1008C0000087002104000024C48682048282C400C0
+-:1008D0008403002F04610024C4C7C710C5C8C81012
+-:1008E0008587871024460F118403002F255500515A
+-:1008F000030000242340002480447024C00400240A
+-:10090000027D0569202001011E5503708639239060
+-:1009100009868258FBFB1E1F042100248403002F3C
+-:100920003FFC13CD8081FF2EE0E0131F802D00815E
+-:100930000087002104000024C48682048282C4004F
+-:100940008403002F054603C904010024C4661F1157
+-:100950008403002F8282C400064602D1043700249B
+-:1009600024661F11C4000024E5E0E0108403002F7A
+-:100970000303010123232001E0E0200100420221C2
+-:1009800000009E20006703219E870024025607C9AD
+-:1009900000D40421D15605D1025606D100C1002150
+-:1009A000040D00248403002F007A7A108C83FF2E1C
+-:1009B0002D1800248B33AC918C000609024B806902
+-:1009C0008C8C01098C018C908C8C04014E6C006C19
+-:1009D0004D4C0A4D0C4C005186218C908C8C04019E
+-:1009E0000B660B5125660C5155660D5166660E510E
+-:1009F000A1660F51A8661051B6661151B066035139
+-:100A000000C100216767001D0084022187218C90AE
+-:100A1000080D07D1030D06C9D7D796049600002408
+-:100A2000010D3F11D7D7010000FF07C9962720838A
+-:100A30004406002424500024642D2D10046700D1A6
+-:100A4000042000248403002F00009E2004220024A0
+-:100A50008403002F040800248403002F04310024A1
+-:100A6000242000248403002F040D00248403002F7D
+-:100A70003747030900D4042187A18C908C8C0C018A
+-:100A80004C4C010581C8C81041000024878796009E
+-:100A9000898996000B6707C9046704C9CE88964EFA
+-:100AA0008896880400AB022188889600C0883801A7
+-:100AB00000FF06D18E06C09081CEC9108181470407
+-:100AC000126705C9C087380100FF06D18E26C09085
+-:100AD00061670F11046100692E2E030B410600248B
+-:100AE00000BB02212E0E030B410400244E2E0109EF
+-:100AF0006E2E010B4E4E6E0041414E00022E00C97B
+-:100B00004141010187874100B3CD874E0400002495
+-:100B1000C487CD048403002FCD8787108483FF2EE4
+-:100B2000036706D12424001F8589870404600024FC
+-:100B3000C48141048403002F0075022187218C9019
+-:100B40008C8C04014C4C0105036700D1474796008B
+-:100B500000D6022147D70704C047380100FF06D15D
+-:100B60008EE6C0902D2707009B2D204F0227145999
+-:100B70000D0D071F00070710202720010EC7208E2C
+-:100B8000007502210046040507C18C9EC08C04013B
+-:100B90008C8C00004C4C0105096701C98ECD006F9B
+-:100BA000027800697896961004010024C4787810C1
+-:100BB0008403002FCD787810000103214747960069
+-:100BC00085CD474E04000024C447CD048403002F84
+-:100BD000CD474710076702C904010024C427271026
+-:100BE0008403002FCDCD2700D7D72704007502211D
+-:100BF000056700D1002727100EC1C09E0EBE002F32
+-:100C000000750221C5040024850020240437002437
+-:100C100024272710C40000248585C0008403002FEA
+-:100C2000106701C9D7D72700D7D7780403580051D8
+-:100C3000585827005858780403380051383827008E
+-:100C40003838780403180051181827001818780449
+-:100C5000969627009696780478272710007502212B
+-:100C6000010D3F11010127000D0DC0110D0D0100F7
+-:100C7000007502214C4C010557CD006FCD969610A2
+-:100C80000D0D061F04010024C49696108403002F46
+-:100C9000007502214C4C01054FCDD74E04000024B5
+-:100CA000C4D7CD048403002FCDD7D710040100246E
+-:100CB000C489D7048403002F007502214C4C010520
+-:100CC000D086861090D7D7109E4A03230075022144
+-:100CD0003726030900D404218B83802E040D0024C1
+-:100CE0008403002F04000024C4CCCC108403002F04
+-:100CF0008E81802E06EBEE50EEEBEB108E81002FF6
+-:100D0000610709910101021F61070981962720836C
+-:100D100044060024245000246418002404200024E5
+-:100D20008403002F00009E208A33B091878A030934
+-:100D300086D00109861C869018C60DD10AD08A5823
+-:100D4000C7D00309887DC79003C60ED1E9E9010128
+-:100D500000560321E9E99000E8E80003887DC78098
+-:100D60000062032181D08A04C7810209C7C78700B6
+-:100D7000883DC79003C60ED1E8E801010061032158
+-:100D8000E8E89000883DC78004C60FD1D0C6C610E1
+-:100D900070700F11004C032100009E20DA00002427
+-:100DA00080898910040D00248403002F8687802EFB
+-:100DB00000FF07C9882718810447CE51E6010024A7
+-:100DC0008681002F008603215A0000240F670151FD
+-:100DD0000F6702510F6703510F670451996706515E
+-:100DE00057670C513D670A53C5670851F8670B51A7
+-:100DF0001767095324670551B8670751E6020024B5
+-:100E00008681002F008603210088052100880521A6
+-:100E10000083052100880521152906698124089190
+-:100E2000E1E1010181240881067A00C9044300241C
+-:100E3000C45A5A1024040024E5E6E6108403002F67
+-:100E40006400002444292910C5C9C91005090910E6
+-:100E50000420002424F000246117009102000359AB
+-:100E60009E8D05238403002F00870021E4210024A8
+-:100E70008401002F81240C91E1E1010181240C8186
+-:100E80000087002104803459E60F00248681002F5A
+-:100E900000860321E60000248681002F8A87802EA9
+-:100EA00004000024C42000248403002F8E87802E99
+-:100EB000026A00C98B33A081056A01C98C33A48101
+-:100EC00061010024E2100024812204E1056A02C9C4
+-:100ED0008D33A88161010024E2200024812204E1F5
+-:100EE000026A03C98E33AC81026A04C98F33B081B0
+-:100EF000026A05C99033B4810E6A06C9C100012493
+-:100F000081000024027100C981010024E200002454
+-:100F100081220CE181000024027101C981010024B9
+-:100F2000E210002481220CE1E220002481220CE165
+-:100F3000BA6A07CFFCF2F21000860321E600002413
+-:100F40008681002F8A83802E04000024096A0069AC
+-:100F5000C0F801240480C058E60F00248681002FC9
+-:100F600000860321C41800248403002F00060421F6
+-:100F7000C41400248403002F176A016904803C59BB
+-:100F8000E60F00247A7A001F008603218E83802ECC
+-:100F9000046E0471E61000247A7A001F0086032193
+-:100FA000816E0509C16E03098181C1008181000143
+-:100FB0008E738180C40800248403002F8E8F802EBE
+-:100FC000818108018EF38182C42000248403002FD4
+-:100FD000008603210E6A026904802459E60F00246A
+-:100FE0007A7A001F008603218E87802E046E10718E
+-:100FF000E61100247A7A001F00860321816E04091D
+-:10100000818100018EFA818000860321E60200249E
+-:101010007A7A001F00860321E1000024C410002416
+-:101020008E87802E8403002F02EB01C88EF4C180CE
+-:1010300001010101C1C11001FA011E6700860321EF
+-:101040008A83802E04000024C41800248403002F07
+-:10105000194A0151E1000024026A00518101FF2E6A
+-:10106000812C0C8183000F2486E28380C20400243B
+-:1010700082804F24E120602486E100F786E200E7C9
+-:101080008483FF2E2440002404370024E5E2E2108C
+-:101090008403002FE1E14001E2E2400186E100F734
+-:1010A00086E200E7E5E2E2108403002F86E2839007
+-:1010B00000860321086A00518E8FFF2EE20008246B
+-:1010C000E1000824E1E1E2008EE0E282E2E22001B8
+-:1010D000FEE2E16E0086032104000024C410002417
+-:1010E0008403002F240C0024043300248403002FE5
+-:1010F0008EB700918E85002F00860321C0540024F6
+-:101100000480C058E60F00248681002F008603214A
+-:101110008A81802E046A2071E60E00248681002FC9
+-:10112000008603218E8FFF2EC26A0609144A0069C9
+-:1011300004000024C41400248403002F6020002431
+-:10114000022A0459602A03098EBF802E8EF6C282BD
+-:101150008E8FFF2EC2C22001072A047104000024D2
+-:10116000C42000248403002F602A04056060030962
+-:101170008EBF802E8EF6C28200860321054A016949
+-:101180008EF6C282C2C220018EF6C2820086032180
+-:101190000C4A026904000024C41400248403002FB4
+-:1011A0008483FF2E2440002404470024C504002427
+-:1011B00085006624E5E5C2008403002F0086032134
+-:1011C000E60F00248681002F00860321C01400242E
+-:1011D0000480C058E60F00248681002F008603217A
+-:1011E0008A81802E8B33B091048ACB70E613002461
+-:1011F0008681002F00860321086A00C9820004242A
+-:10120000C20008248100A024C100A0248120828083
+-:1012100082820401FE82C26E04000024C4140024F1
+-:101220008403002FC404002482000424FB8A005598
+-:101230008E81802EC2CE0109C2C28200CE00C28041
+-:101240008A8A01058403002F008B0421C0580024E2
+-:101250000480C058E60F00248681002F00860321F9
+-:101260008A83802E246A6A10E5EBEB100463002465
+-:101270008403002F04000024C41800248403002FDA
+-:101280008E8F802E24000024046200240138002464
+-:10129000E501222C8403002F010104012424010113
+-:1012A000FC24086704000024C42000248403002FC9
+-:1012B0008E8F802E2408002404620024013800242C
+-:1012C000E501222C8403002F0101040124240101E3
+-:1012D000FC24106700860321C09000240480C058BD
+-:1012E000E60F00248681002F008603218A81802E4C
+-:1012F0008B33AC91046A6B60E61200248681002F68
+-:1013000000860321816A0609024B806981810109F7
+-:101310008A2181808181040104000024C4140024F6
+-:101320008403002FC4200024404B04058E8F802EA0
+-:101330008EE181828403002F4040200581812001BD
+-:10134000FB40204F0EBF802E0EE1818E00860321D0
+-:101350000037030B3737071176761F1156560F11DA
+-:101360001683002FC0000609000000248E76C0906E
+-:10137000046E07D1042100248403002F00009E2066
+-:10138000056E00C9040C00248403002F04110024FE
+-:101390008403002F036E01C900FF06D18F27188137
+-:1013A0008483FF2E24F00024042200244406002419
+-:1013B000C58E8E10054E4E108403002FC0C008014C
+-:1013C0000000010100FF04C9040800248403002F69
+-:1013D000E900085700DB042190D7D7101566026991
+-:1013E0000E470051610726910101071121270309CA
+-:1013F0000101211261072681C1072C918181E01131
+-:1014000003470151C116002400040521C10D002429
+-:101410008181C112C1072C81E4205024641800246A
+-:10142000446767108403002F6E69035100009E20FB
+-:10143000276600698727188105080051620709910E
+-:1014400002020F1102020812620709815869015154
+-:10145000576904510869026924494910043000247D
+-:10146000C58989108403002F97072491D7D7490095
+-:101470009707248109680069E420F0246418002497
+-:1014800044060024C5868610054646108403002FB6
+-:101490005469035100009E20966720917676A01330
+-:1014A0005656071F3737071102480309373702120C
+-:1014B00096672081E42050246418002444282810D2
+-:1014C0008403002F4769035100009E2014660169C0
+-:1014D00087671881366901513569045108690269C5
+-:1014E0002449491004300024C58989108403002F41
+-:1014F00097072491D7D7490097072481E420F02447
+-:101500006418002444060024C5868610054646104B
+-:101510008403002F3369035100009E200E66046986
+-:101520008767208162070891020207112269030977
+-:101530000202221262070881E420F02464080024D9
+-:1015400044060024C5868610054646108403002FF5
+-:1015500000009E200B6603696207099102020F11C9
+-:101560000202671262070981E4205024640000240B
+-:10157000440700248403002F1A69035100009E20B1
+-:1015800006660551FBFB141F04FC14C98281FF2E63
+-:10159000E2E2141F822D0081FBFBE31204210024F0
+-:1015A0008403002F0F69035100009E20966720914D
+-:1015B0007676A0135656061F29073081960720819C
+-:1015C00026070B81C6071281E420502464180024EA
+-:1015D000440400248403002F0269045100009E206B
+-:1015E000D08989108F198091014F040101011F11C9
+-:1015F000036F0168FBFB141F00009E20C14F900188
+-:101600009039C1806119818100009E208A83802EDB
+-:10161000042A02C9E1000024812134E1008603216B
+-:10162000E60C00248681002F008603219C81FF2E7A
+-:0816300000009E2000009E2036
+-:00000001FF
+diff --git a/firmware/keystone/pa_pdsp45_1_3_0_2.fw.ihex b/firmware/keystone/pa_pdsp45_1_3_0_2.fw.ihex
+new file mode 100755
+index 0000000..c2900b3
+--- /dev/null
++++ b/firmware/keystone/pa_pdsp45_1_3_0_2.fw.ihex
+@@ -0,0 +1,445 @@
++:10000000007B00210300BEBA02000301845050248B
++:10001000C4848410E5E4E410E6E4E410E7E4E410CA
++:10002000E8E4E410E9E4E410EAE4E410EBE4E410CA
++:1000300084E3008384E3208384E3408384E3608358
++:1000400084E3808384E3A08384E3C08384E3E08348
++:1000500004430024640304810444002464032981CC
++:10006000040A002464033281040C002464033381F5
++:100070000409002464032F810453002464030681CF
++:1000800004050024640300810406002464032B811A
++:100090000407002464032C810408002464033C81C9
++:1000A00004510024640311810452002464038881F4
++:1000B000040F00246403848180A7FF2E80F300894D
++:1000C00080F3508980FA008780FA408780FA808721
++:1000D00080FAC087E5000024E1E001248887FF2E34
++:1000E0006805002488F4E580E5E51001FEE5E16E91
++:1000F000C800812488A88824C900082489DD8624B2
++:10010000CA4788248A488824CB6488248B6388243F
++:1001100088F54081E500002485356081899FFF2EA8
++:1001200085000024C500082489F685868585400160
++:10013000FE85C56E040000246418008104010024BB
++:100140006418208104020024641840810403002400
++:10015000641860810404002464188081040500246C
++:100160006418A081E0010024E1640024806A048115
++:10017000828FFF2E82F3A0836202002442020024B9
++:10018000220200248233A0816540002445400024DF
++:100190008533AC81F4000424F50008248000A024F9
++:1001A000C000A0248020F480F4F40401FEF4F56E75
++:1001B000F4000824F5001024809FFF2E80E0F486D0
++:1001C000F4F44001FEF4F56EF480002480E0F48045
++:1001D000F480012480E0F480F480022480E0F48044
++:1001E000F480032480E0F48000009E209EEA062331
++:1001F0008285FF2E82A40481E201002482240081F2
++:1002000000FF00C900FF00D104FF01C99E030023C5
++:10021000E2000024822404811D1700915D00002467
++:1002200082020024C2030124823704818087FF2ECA
++:1002300080F710819B81FF2E03FB00519B2C0881CE
++:100240009B81FF2E137D05516E0400244E5D5D10D1
++:100250000F6E00518E4E0809CF8E90018E8E800158
++:10026000CF008E904E4E01014E4E03116E6E010571
++:10027000F80F2F56812FCF00902081902F2F04014F
++:100280002F2F1F114F008E809EA404235D4E4E1011
++:10029000EAFF04CF81240091E1E101018124008182
++:1002A0009483FF2EF80000243D0000248037109135
++:1002B000096000518483FF2E24B00024042200240E
++:1002C00044060024C5808010054040108403002FA0
++:1002D00000FF04C9868F802E9489891003CA0ED12D
++:1002E000CA920E1F868F002F0BC9006904FC13C928
++:1002F0008081FF2EE0E0131F802D0081DEB00024FE
++:1003000086F4DE908381FF2EE3E31E1F9E8E002481
++:1003100000550621040800248403002F0431002422
++:10032000242000248403002F9689802E0176050B5B
++:1003300014010051520103513301025123010151B3
++:100340000201055100D3002100490321020104519B
++:1003500000D600210048032142010651A1010751A6
++:100360008483FF2E042100248403002FB3FC13CFC9
++:100370008081FF2EE0E0131F802D0081008E002180
++:100380000C7502598685802EE2000024027500510A
++:10039000E2E20C0186B9E2807575010104010024D6
++:1003A000C40C00248403002FE03506CF0000D420C5
++:1003B000FBFB1E1FDDFC13CF8081FF2EE0E0131F2F
++:1003C000802D008100CA0021093507D18685802E45
++:1003D00086B9C0813535071F04010024C40C0024F0
++:1003E0008403002FD13506CF0000D420FBFB1E1F55
++:1003F000CEFC13CF8081FF2EE0E0131F802D008103
++:1004000000CA00210E5504598689802E0046040B2F
++:1004100000000209C3550509C3C3400106D9C38EB4
++:1004200004010024C446040BC4C402098403002F41
++:1004300055550101BD3506CF0000D420FBFB1E1F22
++:1004400004FC13C98081FF2EE0E0131F802D008182
++:100450008483FF2E042100248403002F008E0021BA
++:100460008E83802E8E79E0813535031F04010024B0
++:10047000C40800248403002F00CA00218687802E30
++:10048000C40C002400FF07C9196603C9C4C40401D1
++:10049000020900C93535011F426607110D42006986
++:1004A0006666F81166660613620708910202071174
++:1004B0002269030902022212620708811502021052
++:1004C00087672081C41000243535051F003C0121B9
++:1004D0006207099102020F11020269126207098183
++:1004E000150202103535041F024207518767188133
++:1004F000F3E6E610ECE7E710EDE8E810040100246D
++:100500008401002F046604C93535061FD445012433
++:1005100000CA0021483502D19EE60223083501C9F0
++:1005200007943C59841000248401002F8433002454
++:1005300024943C0D8401002F3D3D0101063D0051F6
++:100540009013BE91900100249EA404233D3D01051B
++:10055000004F01218483FF2E0420002444730711DF
++:1005600024F00024C593931005535310023505C998
++:1005700064080024193503C98E79E091042200240F
++:100580008403002FE1003024802108F1C0FFFF2404
++:1005900080C0800481356091C0818110EDC1C1109F
++:1005A00000FF04C9EBE0E010ECEFEF108B85002FAB
++:1005B000040C00248403002F041100248403002F62
++:1005C0008483FF2E042000244406002424F0002409
++:1005D000C58E8E10054E4E108403002F008E002114
++:1005E00004010024C40400248401002F01761F119B
++:1005F0004E0100570B0102694C75025F7602002420
++:1006000003960FC97604002496960F1DC375020940
++:10061000C3C3F8019639C3807575010100CA002172
++:10062000073506D13535021F3535011F9639F08162
++:1006300000CA00219639F0918279F8918E85FF2EBB
++:10064000CE9696102E565610040C00248403002FCC
++:1006500004000024C42E2E108403002F8689802ECF
++:100660000066F01103004051920060510000022129
++:10067000CF8686100E660F110E0E020961CECF587E
++:1006800060870ED18F878710D0CE0E045050F8119E
++:10069000E190030B878FE100E090D000E1CF0E04E2
++:1006A00003E1E048D0E1900400AC012187870D1FF1
++:1006B00086D00E00880000248685002F94862E00A8
++:1006C000FBFB111F9B2C08819B81FF2E1175005194
++:1006D0000443002424626210C442421003240251E5
++:1006E000E582860000BB0121C58286008403002FBD
++:1006F0000875015124636310C4434310032402515D
++:10070000E583860000C30121C58386008403002F92
++:100710008483FF2E04510024C40E0E10850A002489
++:100720008403002F04000024C40E0E108401002F47
++:100730004890005104010024C49090108401002FBF
++:100740008100002404000024C4D081048401002F0F
++:100750009090D000E1900E0029E1CF5804110024C0
++:100760008401002F05943C598433002424943C0DCB
++:100770008401002F3D3D01018483FF2E04220024CB
++:100780004473071124F20024C593931005535310AA
++:10079000023505C9640800248403002F00FF04C942
++:1007A000033505C9681515100880002F033504C9E5
++:1007B000481515102880002F8C83002F0408002472
++:1007C0008401002F073505C90431002424040024C6
++:1007D000E5ECEC108403002FE5EDED108403002F11
++:1007E000040D00248401002F04000024C42E2E10C8
++:1007F0008401002F8689802E00A401210047012159
++:10080000117500510443002424626210C442421056
++:1008100003240251E582CF0000080221C582CF00E7
++:100820008403002F0875015124636310C4434310EF
++:1008300003240251E583CF0000100221C583CF00BD
++:100840008403002F822E2E109E47012400200321B6
++:1008500081000024BC55016F80447024C004002432
++:10086000027D056920200101414000248639419024
++:10087000C10E2E00B486C166B34603CFC486C10440
++:1008800081C4C4108403002F04010024C4661F1116
++:100890008403002F8181C4000437002424661F11C3
++:1008A000C4000024E5E0E0108403002F00D1012102
++:1008B0008683802ECFC728010E2800248BCECF58E8
++:1008C0008083FF2E07272B510627005107273B5116
++:1008D00006273C5105272C516161001F003A022177
++:1008E0006161011F6161021F196100D1C02E2801E1
++:1008F000C006C090046102C94120201081C0C01010
++:100900006161021D07202B510620005107203B5139
++:1009100006203C5105202C516161001F004A022134
++:100920006161011F6161021FC0C00000026100D14E
++:10093000003C0221066101C9C0068190202C0024E0
++:100940000E810000C0068180005602214127271039
++:10095000272C00248683002F0E0E0801D0CE0E0413
++:100960005050F8119683FF2E7641411097356491CF
++:10097000F7F7010197356481E1909010968F81001F
++:10098000E090D000E1CF0E04E1E1080103E1E0488E
++:10099000D0E19004006702219696001FC7D00E0098
++:1009A00094C72E00C7C728058683002FFBFB111FA5
++:1009B0009B2C08819B81FF2E11750051044300245C
++:1009C00024626210C442421003240251E582C7002F
++:1009D00000760221C582C7008403002F08750151EB
++:1009E00024636310C443431003240251E583C7000A
++:1009F000007E0221C583C7008403002F0400002469
++:100A0000C40E08058401002FC104002481804F24F6
++:100A1000966100E10437002424080024C400002467
++:100A2000E5E1E1108403002F44900051040100240B
++:100A3000C49090108401002F810000240400002441
++:100A4000C4D081048401002F9090D000E1900E006A
++:100A5000E1E1080524E1CF58041100248401002FAE
++:100A60008483FF2E042200244473071124F0002401
++:100A7000C593931005535310023505C9640800242B
++:100A80008403002F00FF04C9033505C9681515103C
++:100A90000880002F033504C9481515102880002F41
++:100AA0008C83002F040800248401002F073505C91A
++:100AB0000431002424040024E5ECEC108403002F0E
++:100AC000E5EDED108403002F040D00248401002FB8
++:100AD00004000024C42E2E108401002F8683802E53
++:100AE000005E0221004701211175005104430024DA
++:100AF00024626210C442421003240251E582CF00F6
++:100B000000C20221C582CF008403002F0875015165
++:100B100024636310C443431003240251E583CF00D0
++:100B200000CA0221C583CF008403002F822E2E101D
++:100B30009E4701240020032181000024C055016F3D
++:100B400080447024C0040024027D05692020010136
++:100B50004140002486394190C10E2E00B886C166FE
++:100B6000B74603CFC486C10481C4C4108403002FD8
++:100B700004010024C4661F118403002F8181C40076
++:100B80000437002424661F11C4000024E5E0E010AF
++:100B90008403002F008F0221040C00248403002F03
++:100BA000820000242275005186B9009104000024BF
++:100BB000C48686108403002F82C4C410045100240C
++:100BC000C4C7C710C5C8C810858787102446070B3F
++:100BD0008403002F1675017186B90C910A8682581C
++:100BE000FBFB1E1F042100248403002FFBFB1E1FA0
++:100BF00019FC13C98081FF2EE0E0131F802D0081B6
++:100C0000008E002104000024C48682048282C40075
++:100C10008403002F04530024C4C7C710C5C8C810DC
++:100C2000858787102446070B8403002F153507C9D5
++:100C300086B9C09109868258FBFB1E1F042100243F
++:100C40008403002F04FC13C98081FF2EE0E0131FF2
++:100C5000802D0081008E002104000024C4868204BF
++:100C60008282C4008403002F04610024C4C7C7101B
++:100C7000C5C8C8108587871024460F118403002F2C
++:100C80002755005103000024234000248044702491
++:100C9000C0040024027D0569202001012055037055
++:100CA0008639239009868258FBFB1E1F04210024ED
++:100CB0008403002FE8FC13CF8081FF2EE0E0131F98
++:100CC000802D0081008E002104000024C48682044F
++:100CD0008282C4008403002F064603C90401002455
++:100CE000C4661F118403002F8282C4009494C4043C
++:100CF000074602D10437002424661F11C4000024D3
++:100D0000E5E0E0108403002F949424000303010124
++:100D100023232001E0E020010027032100009E2082
++:100D200000C104219E8E0024025607C9003306210B
++:100D3000035605D1045606D100D80021377D05534E
++:100D400000710421040D00248403002F5656061D53
++:100D5000007A7A108C83FF2E2D180024741800243A
++:100D60008B33AC918C000609024B80698C8C010995
++:100D70008C018C908C8C0401036C0068024C0A4935
++:100D80000062032100D800210E4C005186218C9076
++:100D90008C8C04010D660B5131660C517C660D5133
++:100DA00093660E51D2660F51D9661051E766115104
++:100DB000E1660351E76612515A66135100D80021CB
++:100DC0006767001D0073032187218C90035406C9B7
++:100DD000D7D796049600002481000024020D07C98D
++:100DE00021FF0024010D0D10D7D781007676E01188
++:100DF000767674000074040500FF07C916C7208FBB
++:100E00004406002424500024642D2D10096700D1CD
++:100E1000055605C900741C0100FF07C9952700800D
++:100E200044050024042000248403002F00009E2099
++:100E3000042200248403002F040800248403002FCC
++:100E400004310024242000248403002F040D0024F6
++:100E50008403002F374703090033062187A18C90B4
++:100E60008C8C0C014C4C010581C8C8104100002439
++:100E700087879600898996000B6707C9046704C9AC
++:100E8000C288964E8896880400A40321888896001C
++:100E9000C088380100FF06D18E06C09081CEC910EF
++:100EA00081814704126705C9C087380100FF06D158
++:100EB0008E26C09061670F11046100692E2E030B0E
++:100EC0004106002400B403212E0E030B410400242C
++:100ED0004E2E01096E2E010B4E4E6E0041414E000A
++:100EE000022E00C94141010187874100A7CD874EED
++:100EF00004000024C487CD048403002FCD8787100D
++:100F00008483FF2E036706D12424001F858987046C
++:100F100004600024C48141048403002F0062032183
++:100F200087618C908C8C08014C4C010575479600AC
++:100F3000116707C9C075380100FF06D18E26C09021
++:100F4000042700692E2E030B4106002400D603213E
++:100F50002E0E030B410400244E2E01096E2E010BB0
++:100F60004E4E6E0041414E00022E00C9414101012A
++:100F7000757541005656051F0274085974080024FF
++:100F800095888810554848100062032187218C906D
++:100F90008C8C04014C4C0105036700D14747960037
++:100FA00000EA032147D70704C047380100FF06D1F4
++:100FB0008EE6C090002707007400204F032D0058D4
++:100FC0002D0003012D2DFC11025605C96F2708675E
++:100FD000022774587427FC110007071020272001EE
++:100FE00000FF07C90EC7208E0062032100460405DA
++:100FF00007C18C9EC08C04018C8C00004C4C0105F8
++:10100000096701C961CD006F027800697896961072
++:1010100004010024C47878108403002FCD78781060
++:10102000002104214747960058CD474E0400002474
++:10103000C447CD048403002FCD4747100D6702C974
++:1010400004010024C42727108403002F0675CD70E7
++:101050000075CD040300277075752704001904215D
++:1010600075750004CDCD27000D0D27040062032106
++:10107000056700D1002727100EC1C09E0EBE002FAD
++:1010800000620321C50400248500202404370024C5
++:1010900024272710C40000248585C0008403002F66
++:1010A0000F6701C90D2778040358005158582700CD
++:1010B00058587804033800513838270038387804F5
++:1010C000031800511818270018187804969627005E
++:1010D0009696780478272710006203210275CD6068
++:1010E000757527000D0D2700006203214C4C01058A
++:1010F00026CD006FCD9696105454061F040100248F
++:10110000C49696108403002F006203214C4C010505
++:101110001ECDD74E04000024C4D7CD048403002F75
++:10112000CDD7D71004010024C489D7048403002F2D
++:10113000006203214C4C0105D086861090D7D71051
++:101140009EA40423006203213726030900330621ED
++:1011500087A18C908C8C0C014C4C01056006099188
++:1011600000006710090000571447006900FF07C915
++:1011700089271881035406C9D7D7960496000024FE
++:1011800081000024020D07C921FF0024010D0D106C
++:10119000D7D781000074040516C7208FE420F024FF
++:1011A000642D2D1044060024C5C8C810052727103B
++:1011B0008403002F00009E20042100248403002FBC
++:1011C00000009E208B83802E040D00248403002FBA
++:1011D00004000024C4CCCC108403002F8E81802E08
++:1011E00006EBEE50EEEBEB108E81002F61070991BC
++:1011F0000101021F610709815656051D96272083AC
++:1012000044060024245000246418002404200024F0
++:101210008403002F00009E2000761F1100001C0197
++:1012200000FF06D18B260090040C00248403002FBD
++:1012300004000024C46B6B108403002F04110024ED
++:101240008401002F4406002424500024640000245C
++:10125000042200248403002F00FF04C9040C00248E
++:101260008403002F04010024C46B6B108403002F3F
++:101270008483FF2E24F0002404200024440600244C
++:10128000C58B8B10054B4B108403002F00009E2054
++:101290008A33B091878A030986D00109861C86901B
++:1012A00018C60DD10AD08A58C7D00309887DC790C7
++:1012B00003C60ED1E9E9010100B00421E9E990007B
++:1012C000E8E80003887DC78000BC042181D08A043F
++:1012D000C7810209C7C78700883DC79003C60ED1E2
++:1012E000E8E8010100BB0421E8E89000883DC780E0
++:1012F00004C60FD1D0C6C61070700F1100A604210D
++:1013000000009E20DA00002480898910040D00244A
++:101310008403002F8687802E00FF07C98827188145
++:101320000447CE51E60100248681002F00E004210D
++:101330005A0000240F6701510F6702510F670351D4
++:101340000F6704519E6706515C670C5142670A5350
++:10135000CA670851FD670B511C6709532467055183
++:10136000BD670751E60200248681002F00E00421BA
++:1013700000E7062100E7062100E2062100E706213A
++:101380001529066981240891E1E101018124088180
++:10139000067A00C904430024C45A5A1024040024C5
++:1013A000E5E6E6108403002F640000244429291098
++:1013B000C5C9C910050909100420002424F000241F
++:1013C00061170091020003599EEC06238403002F4D
++:1013D000008E0021E42100248401002F81240C913F
++:1013E000E1E1010181240C81008E00210480385943
++:1013F000E60F00248681002F00E00421E60000248F
++:101400008681002F8A87802E04000024C4200024B7
++:101410008403002F8E8B802E026A00C98B33A0813B
++:10142000056A01C98C33A48161010024E210002403
++:10143000812204E1056A02C98D33A881610100247B
++:10144000E2200024812204E1026A03C98E33AC81C8
++:10145000026A04C98F33B081026A05C99033B4812E
++:10146000136A06C99233BC81C100012481000024A3
++:10147000027100C90101071F027102C90101061FA3
++:10148000E200002481220CE181000024027101C9E4
++:101490000101071F027103C90101061FE2100024A8
++:1014A00081220CE1E220002481220CE1B56A07CF01
++:1014B000FCF3F31000E00421E60000248681002FF5
++:1014C0008A83802E04000024096A0069C0F8012480
++:1014D0000480C058E60F00248681002F00E004211C
++:1014E000C41800248403002F00650521C4140024BF
++:1014F0008403002F176A016904803C59E60F002419
++:101500007A7A001F00E004218E83802E046E04711D
++:10151000E61000247A7A001F00E00421816E05099C
++:10152000C16E03098181C100818100018E738180B8
++:10153000C40800248403002F8E8F802E818108012F
++:101540008EF38182C42000248403002F00E0042154
++:101550000E6A026904802459E60F00247A7A001F7B
++:1015600000E004218E87802E046E1071E6110024A5
++:101570007A7A001F00E00421816E04098181000154
++:101580008EFA818000E00421E60200247A7A001FAE
++:1015900000E00421E1000024C41000248E87802E86
++:1015A0008403002F02EB01C88EF4C1800101010108
++:1015B000C1C11001FA011E6700E004218A83802E58
++:1015C00004000024C41800248403002F194A015188
++:1015D000E1000024026A00518101FF2E812C0C8160
++:1015E00083000F2486E28380C204002482804F247B
++:1015F000E120602486E100F786E200E78483FF2E85
++:101600002440002404370024E5E2E2108403002F84
++:10161000E1E14001E2E2400186E100F786E200E715
++:10162000E5E2E2108403002F86E2839000E00421CB
++:10163000086A00518E8FFF2EE2000824E100082482
++:10164000E1E1E2008EE0E282E2E22001FEE2E16E10
++:1016500000E0042104000024C41000248403002FAF
++:10166000240C0024043300248403002F8EB700913F
++:101670008E85002F00E00421C05400240480C0584F
++:10168000E60F00248681002F00E004218A81802E4D
++:10169000046A2071E60E00248681002F00E00421F8
++:1016A0008E8FFF2EC26A0609144A006904000024C6
++:1016B000C41400248403002F60200024022A04594B
++:1016C000602A03098EBF802E8EF6C2828E8FFF2E77
++:1016D000C2C22001072A047104000024C42000248F
++:1016E0008403002F602A0405606003098EBF802EEA
++:1016F0008EF6C28200E00421054A01698EF6C2829C
++:10170000C2C220018EF6C28200E004210C4A0269A6
++:1017100004000024C41400248403002F8483FF2EBB
++:101720002440002404470024C504002485006624C6
++:10173000E5E5C2008403002F00E00421E60F002449
++:101740008681002F00E00421C01400240480C058CA
++:10175000E60F00248681002F00E004218A81802E7C
++:101760008B33B091048ACB70E61300248681002F5E
++:1017700000E00421086A00C982000424C200082491
++:101780008100A024C100A0248120828082820401E3
++:10179000FE82C26E04000024C41400248403002FBF
++:1017A000C404002482000424F68A00558E81802E11
++:1017B000C2CE0109C2C28200CE00C2808A8A01055F
++:1017C0008403002F00EA0521C05800240480C0587B
++:1017D000E60F00248681002F00E004218A83802EFA
++:1017E000246A6A10E5EBEB10046300248403002FE5
++:1017F00004000024C41800248403002F8E8F802E40
++:10180000240000240462002401380024E501222C75
++:101810008403002F0101040124240101FC24086732
++:1018200004000024C42000248403002F8E8F802E07
++:10183000240800240462002401380024E501222C3D
++:101840008403002F0101040124240101FC241067FA
++:1018500000E00421C09000240480C058E60F00245A
++:101860008681002F00E004218A81802E8B33AC9189
++:10187000046A6B60E61200248681002F00E00421D8
++:10188000816A0609024B8069818101098A21818070
++:101890008181040104000024C41400248403002F67
++:1018A000C4200024404B04058E8F802E8EE181825F
++:1018B0008403002F4040200581812001FB40204F00
++:1018C0000EBF802E0EE1818E00E004210037030B55
++:1018D0003737071176761F1156560F111683002FD2
++:1018E000C0000609000000248E76C090046E07D167
++:1018F000042100248403002F00009E20056E00C9EF
++:10190000040C00248403002F041100248403002FFE
++:10191000036E01C900FF06D18F2718818483FF2E33
++:1019200024F000240422002444060024C58E8E10D6
++:10193000054E4E108403002FC0C0080100000101B5
++:1019400000FF04C9040800248403002FE90008579D
++:10195000003A062190D7D710156602690E4700514C
++:1019600061072691010107112127030901012112B5
++:1019700061072681C1072C918181E0110347015144
++:10198000C116002400630621C10D00248181C1120B
++:10199000C1072C81E4205024641800244467671098
++:1019A0008403002F6E69035100009E2027660069A2
++:1019B00087271881050800516207099102020F115B
++:1019C00002020812620709815869015157690451DE
++:1019D000086902692449491004300024C589891026
++:1019E0008403002F97072491D7D7490097072481B4
++:1019F00009680069E420F0246418002444060024E7
++:101A0000C5868610054646108403002F546903518D
++:101A100000009E20966720917676A0135656071FE9
++:101A200037370711024803093737021296672081BA
++:101A3000E420502464180024442828108403002F34
++:101A40004769035100009E20146601698767188169
++:101A50003669015135690451086902692449491000
++:101A600004300024C58989108403002F970724912E
++:101A7000D7D7490097072481E420F0246418002474
++:101A800044060024C5868610054646108403002FB0
++:101A90003369035100009E200E6604698767208128
++:101AA0006207089102020711226903090202221249
++:101AB00062070881E420F02464080024440600241E
++:101AC000C5868610054646108403002F00009E2020
++:101AD0000B6603696207099102020F110202671285
++:101AE00062070981E4205024640000244407002494
++:101AF0008403002F1A69035100009E2006660551D9
++:101B0000FBFB151F04FC14C98281FF2EE2E2141FA7
++:101B1000822D0081FBFBE312042100248403002FAB
++:101B20000F69035100009E20966720917676A013DE
++:101B30005656061F290730819607208126070B81FC
++:101B4000C6071281E42050246418002444040024B1
++:101B50008403002F0269045100009E20D08989105F
++:101B60008F198091014F040101011F11036F01685A
++:101B7000FBFB151F00009E20C14F90019039C180D2
++:101B80006119818100009E208A83802E042A02C967
++:101B9000E1000024812134E100E00421E60C00246E
++:101BA0008681002F00E004219C81FF2E00009E20F2
++:041BB00000009E2073
++:00000001FF
+-- 
+1.6.0.4
+
diff --git a/ti/runtime/netapi/tools/kernel_patches/README.txt b/ti/runtime/netapi/tools/kernel_patches/README.txt
new file mode 100644
index 0000000..910b461
--- /dev/null
+++ b/ti/runtime/netapi/tools/kernel_patches/README.txt
@@ -0,0 +1,4 @@
+This directory contains patches to be applied to SC-MCSDK 2.0.0.8 Linux kernel distribution.
+
+dma_patch_2.0.0.8.txt: patch to enable allocation of cacheable physically contiguous memory from CMA.
+
diff --git a/ti/runtime/netapi/tools/kernel_patches/dma_patch_2.0.0.8.txt b/ti/runtime/netapi/tools/kernel_patches/dma_patch_2.0.0.8.txt
new file mode 100644
index 0000000..fae177f
--- /dev/null
+++ b/ti/runtime/netapi/tools/kernel_patches/dma_patch_2.0.0.8.txt
@@ -0,0 +1,13 @@
+diff --git arch/arm/include/asm/pgtable.h arch/arm/include/asm/pgtable.h
+index f66626d..95bd431 100644
+--- arch/arm/include/asm/pgtable.h
++++ arch/arm/include/asm/pgtable.h
+@@ -105,7 +105,7 @@ extern pgprot_t             pgprot_kernel;
+ 
+ #ifdef CONFIG_ARM_DMA_MEM_BUFFERABLE
+ #define pgprot_dmacoherent(prot) \
+-       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_BUFFERABLE | L_PTE_XN)
++       __pgprot_modify(prot, L_PTE_MT_MASK, L_PTE_MT_WRITEBACK| L_PTE_XN)
+ #define __HAVE_PHYS_MEM_ACCESS_PROT
+ struct file;
+ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
diff --git a/ti/runtime/netapi/tools/net_test_loopback_setup.sh b/ti/runtime/netapi/tools/net_test_loopback_setup.sh
new file mode 100644
index 0000000..b1016ab
--- /dev/null
+++ b/ti/runtime/netapi/tools/net_test_loopback_setup.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+if [ -z "$1"]
+  then
+    echo "Need to supply device type, either k2h, k2k, k2l, k2e"
+    exit 1
+fi
+
+# start up RM server
+/usr/bin/rmServer.out /usr/bin/device/$1/global-resource-list.dtb /usr/bin/device/$1/policy_dsp_arm.dtb
+export KERNEL_VER=$(uname -r)
+#install kernel module
+echo $KERNEL_VER
+insmod /lib/modules/$KERNEL_VER/extra/hplibmod.ko
+# disable vlan aware mode in switch
+devmem2 0x2090804 w 0x4
+#
+# run net_test_loopback applicaton, default location of config file is in /etc/transportnetlib/test,
+# default config file name is net_test_config.txt
+/usr/bin/net_test_loopback_$1 /etc/transportnetlib/test/net_test_config.txt
diff --git a/ti/runtime/netapi/tools/net_test_router_setup.sh b/ti/runtime/netapi/tools/net_test_router_setup.sh
new file mode 100644
index 0000000..766bd37
--- /dev/null
+++ b/ti/runtime/netapi/tools/net_test_router_setup.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ -z "$1"]
+  then
+    echo "Need to supply device type, either k2h, k2k, k2l, k2e"
+    exit 1
+fi
+
+# start up RM server
+/usr/bin/rmServer.out /usr/bin/device/$1/global-resource-list.dtb /usr/bin/device/$1/policy_dsp_arm.dtb
+export KERNEL_VER=$(uname -r)
+#install kernel module
+echo $KERNEL_VER
+insmod /lib/modules/$KERNEL_VER/extra/hplibmod.ko
+#
+ifconfig eth1 up
+# any ip address ok here
+ifconfig eth1 10.0.2.100
+# disable vlan aware mode in switch
+devmem2 0x2090804 w 0x4
+#
+# run net_test_router applicaton, default location of config file is in /etc/transportnetlib/test,
+# default config file name is net_test_config.txt
+/usr/bin/net_test_router_$1 /etc/transportnetlib/test/net_test_config.txt
diff --git a/ti/runtime/netapi/tools/nt_bridge_setup.sh b/ti/runtime/netapi/tools/nt_bridge_setup.sh
new file mode 100755
index 0000000..eba7784
--- /dev/null
+++ b/ti/runtime/netapi/tools/nt_bridge_setup.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if [ -z "$1"]
+  then
+    echo "Need to supply device type, either k2h, k2k"
+    exit 1
+fi
+
+# start up RM server
+/usr/bin/rmServer.out /usr/bin/device/$1/global-resource-list.dtb /usr/bin/device/$1/policy_dsp_arm.dtb
+export KERNEL_VER=$(uname -r)
+#install kernel module
+echo $KERNEL_VER
+insmod /lib/modules/$KERNEL_VER/extra/hplibmod.ko
+#
+#reprogram qos tree shaper rates
+echo "312500000" > /sys/devices/soc.0/hwqueue.6/qos-inputs-2/qos-tree-2/output_rate
+echo "312500000" > /sys/devices/soc.0/hwqueue.6/qos-inputs-2/qos-tree-3/output_rate
+
+# run nt_bridge applicaton
+/usr/bin/nt_bridge_$1 eqos_config1.txt eqos_config2.txt
diff --git a/ti/runtime/netapi/tools/parse_clocks.awk b/ti/runtime/netapi/tools/parse_clocks.awk
new file mode 100755
index 0000000..dc6a68f
--- /dev/null
+++ b/ti/runtime/netapi/tools/parse_clocks.awk
@@ -0,0 +1,3 @@
+BEGIN {}
+/main_div_chip_clk1/ {print $5;}
+END{}
diff --git a/ti/runtime/netapi/tools/pcsetupfornetapi.sh b/ti/runtime/netapi/tools/pcsetupfornetapi.sh
new file mode 100755
index 0000000..3c5657f
--- /dev/null
+++ b/ti/runtime/netapi/tools/pcsetupfornetapi.sh
@@ -0,0 +1,7 @@
+#add local ips
+ifconfig eth0:1 10.0.0.10
+ifconfig eth0:2 192.168.1.10
+
+#install netapi evm ip addresses into arp cache
+arp -v -n -s  10.0.0.100 00:01:02:03:05:05
+arp -v -n -s 192.168.1.100 00:01:02:03:05:05
diff --git a/ti/runtime/netapi/tools/udpif b/ti/runtime/netapi/tools/udpif
new file mode 100755
index 0000000..9e19b11
--- /dev/null
+++ b/ti/runtime/netapi/tools/udpif
diff --git a/ti/runtime/netapi/tools/udpif.c b/ti/runtime/netapi/tools/udpif.c
new file mode 100644
index 0000000..e150062
--- /dev/null
+++ b/ti/runtime/netapi/tools/udpif.c
@@ -0,0 +1,272 @@
+/*
+ *
+ * udpIf.c - provides udp 
+ *
+ */
+//#define BENCHMARK
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/time.h>
+
+int nSent=0;
+
+#ifdef BENCHMARK
+struct timeval stime,mtime,etime;
+#endif
+
+#define SENDSZ 1396
+int SendSize=SENDSZ;
+
+#define MAIN_NEEDED
+#ifdef MAIN_NEEDED
+/******************************************************************************
+    main
+*******************************************************************************/
+/* argv[1] = S for Send, R for Receive
+   argv[2] = fileName
+   argv[3] = port
+   argv[4] = ipAddress
+   argv[5] = send size
+*/
+main(argc,argv)
+int argc;
+char **argv;
+{
+int  sending = 0;
+char fileName[256];
+int  port;
+char ipAddress[64];
+    if (argc < 4) 
+        {
+        printf ("usage:udpIf S|R fileName port [ipAddress] [send size]\n");
+        exit(-1);
+        }
+    sending = (*argv[1] == 'S') ? 1 : 0;
+    strcpy(fileName,argv[2]);
+    port = atoi(argv[3]);
+    if (argc >= 5)
+        strcpy(ipAddress,argv[4]);
+    else
+        strcpy(ipAddress,"");
+    if (argc ==6) SendSize=atoi(argv[5]);
+    if (SendSize > SENDSZ) SendSize=SENDSZ;
+    udpif(sending,fileName,port,ipAddress);
+}
+#endif
+char startstring[]="start";
+char endstring[]="done";
+/******************************************************************************
+    udpif
+*******************************************************************************/
+udpif(sending,fileName,port,ipAddress)
+int  sending;
+char *fileName;
+int  port;
+char *ipAddress;
+{
+struct sockaddr_in addr,fraddr;
+int    addrlen, fd, cnt;
+socklen_t fraddrlen;
+char message[SENDSZ+3];
+int  numTries = 0;
+#define MAX_TRIES 5
+int rc;
+int sstate=0;
+int total, rtotal;
+total=rtotal=0; 
+    if (sending)
+        {    
+        int inFile;
+        inFile = open(fileName,O_RDONLY);
+        if (inFile < 0)
+            {
+            printf ("Can't read %s in tcpIf\n",fileName);
+            exit(-1);
+            }
+        fd = socket(AF_INET, SOCK_DGRAM, 0);
+        printf ("socket is %d\n",fd);
+        if (fd < 0) 
+            {
+            perror("socket");
+            exit(1);
+            }
+        bzero(&addr, sizeof(addr));
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = INADDR_ANY;
+        addr.sin_port = 40000;
+        addrlen = sizeof(addr);
+        rc = bind(fd, &addr, sizeof(addr));
+        printf ("Sender:bind rc is %d\n",rc);
+        if (rc < 0) 
+            {
+            perror("bind");
+            exit(1);
+            }
+        addr.sin_addr.s_addr = inet_addr(ipAddress);
+        addr.sin_port = htons(port);
+        printf("dbg: %x %x\n", addr.sin_addr.s_addr, addr.sin_port);
+#ifdef BENCHMARK
+               sendto(fd,
+                     startstring,
+                     strlen(startstring)+1,
+                     0,&addr,sizeof(addr));
+#endif
+        while(1)
+            {
+            char *mPtr;
+            int len;
+            int count = read(inFile,message,/*4096*/ /*SENDSZ*/SendSize);
+#ifndef BENCHMARK
+            //printf ("Sender:in count is %d\n",count);
+#endif
+            if (count == 0) 
+                {
+                close(inFile);
+#ifdef BENCHMARK
+               sendto(fd,
+                     endstring,
+                     strlen(endstring)+1,
+                     0,&addr,sizeof(addr));
+                                     
+ sendto(fd,
+                     endstring,
+                     strlen(endstring)+1,
+                     0,&addr,sizeof(addr));
+ sendto(fd,
+                     endstring,
+                     strlen(endstring)+1,
+                     0,&addr,sizeof(addr));
+               printf("sending done %d\n",nSent);
+               sleep(1);
+#endif
+                printf("sending done %d\n",nSent);
+
+                break;
+                }
+            mPtr = message;
+            len = count==-1 ? 5: count;
+            do {
+                cnt = sendto(fd, 
+                     mPtr,
+                     len,
+                     0,&addr,sizeof(addr));
+#ifndef BENCHMARK
+               // printf ("Sender:sendto count is %d\n",cnt);
+#endif
+                if (cnt < 0) 
+                    {
+                    close(inFile);
+                    perror("sendto");
+                    exit(1);
+                    }
+                nSent+=1;
+                mPtr += cnt;
+                len -= cnt;
+                } while(len > 0);
+            }
+        } 
+    else 
+        { 
+        /* receive */
+        int outFile;
+        int newSocket;
+        int rc;
+        fd = socket(AF_INET, SOCK_DGRAM, 0);
+        printf ("socket is %d\n",fd);
+        if (fd < 0) 
+            {
+            perror("socket");
+            exit(1);
+            }
+        bzero(&addr, sizeof(addr));
+        addr.sin_family = AF_INET;
+        addr.sin_addr.s_addr = htonl(INADDR_ANY);
+        addr.sin_port = htons(port);
+        addrlen = sizeof(addr);
+        rc = bind(fd, &addr, sizeof(addr));
+        printf ("Receiver:bind is %d\n",rc);
+        if (rc < 0) 
+            {
+            perror("bind");
+            exit(1);
+            }
+        /*outFile = open(fileName,O_WRONLY | O_CREAT);
+        if (outFile < 0)
+            {
+            printf ("Can't write to %s in tcpIf\n",fileName);
+            exit(-1);
+            }*/
+       memset(&fraddr,0,sizeof(fraddr));
+       fraddr.sin_family= AF_INET;
+       fraddrlen = sizeof(fraddr); 
+#ifdef BENCHMARK
+        gettimeofday(&stime, 0                  );
+        printf("rcv start @ %d: %d\n",stime.tv_sec, stime.tv_usec);
+
+#endif
+       while(1)
+            {
+#ifdef BENCHMARK
+
+        gettimeofday(&mtime, 0                  );
+        if(rtotal >= 10000000) 
+        {
+        printf("rcv mtime @ %d: %d %d %d\n",mtime.tv_sec, mtime.tv_usec,total, rtotal);
+        rtotal=0;
+        }
+#endif
+            cnt = recvfrom(fd, 
+                       message, 
+                       sizeof(message), 
+                       0,
+                       NULL,
+                       &fraddrlen);
+            //printf ("Receiver:recv count = %d\n",cnt);
+            if (cnt == 0) 
+                {
+                /*close(outFile);*/
+                continue;
+                }
+            if (cnt < 0) 
+                {
+                /*close(outFile);*/
+                perror("recvfrom");
+                exit(1);
+                }
+           rtotal+=cnt;
+           total+=cnt;
+ 
+           message[cnt+1] = '\0';
+#ifndef BENCHMARK
+            printf("rcvd %s\n",message);
+#else
+            if (strcmp("done",message)==0)
+            {
+                time_t blah1;
+                suseconds_t blah2;
+                gettimeofday(&etime, 0                  );
+                blah1= (etime.tv_usec>stime.tv_usec) ?
+                               etime.tv_sec-stime.tv_sec :
+                               etime.tv_sec-stime.tv_sec-1;
+                blah2 = (etime.tv_usec>stime.tv_usec) ?
+                                     etime.tv_usec-stime.tv_usec :
+                                     1000000-stime.tv_usec+etime.tv_usec;
+                printf("DONE @ %d: %d {%d %d}\n",etime.tv_sec, etime.tv_usec,
+                                                 blah1, blah2 );
+                gettimeofday(&etime, 0                  );
+            }
+            if (strcmp("start",message)==0)
+            {
+                gettimeofday(&stime, 0                  );
+                printf("START @ %d: %d\n",stime.tv_sec, stime.tv_usec);
+            }
+
+#endif
+            }
+        }
+}
diff --git a/ti/runtime/netapi/utils/netapi_util_rm.c b/ti/runtime/netapi/utils/netapi_util_rm.c
new file mode 100644
index 0000000..9d8dd61
--- /dev/null
+++ b/ti/runtime/netapi/utils/netapi_util_rm.c
@@ -0,0 +1,285 @@
+/**************************************************************
+ * FILE PURPOSE :  NETAPI Resource Manager Configuration 
+ *          
+ **************************************************************
+ * @file netapi_rm.c
+ * 
+ * @brief DESCRIPTION:  netapi resource manager file used for user space
+ *                      transport library
+ * 
+ * REVISION HISTORY:
+ *
+ *  Copyright (c) Texas Instruments Incorporated 2014
+ * 
+ *  Redistribution and use in source and binary forms, with or without 
+ *  modification, are permitted provided that the following conditions 
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright 
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the 
+ *    documentation and/or other materials provided with the   
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*****************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#include "ti/runtime/netapi/netapi.h"
+
+/* Socket Includes */
+#include "sockutils.h"
+
+/* RM Includes */
+#include <ti/drv/rm/rm_server_if.h>
+#include <ti/drv/rm/rm.h>
+#include <ti/drv/rm/rm_transport.h>
+#include <ti/drv/rm/rm_services.h>
+
+/* Socket timeout */
+#define CLIENT_SOCK_TIMEOUT_USEC     (500)
+
+/* Application's registered RM transport indices */
+#define SERVER_TO_CLIENT_MAP_ENTRY   0
+/* Maximum number of registered RM transports */
+#define MAX_MAPPING_ENTRIES          1
+
+/* Error checking macro */
+#define RM_ERROR_CHECK(checkVal, resultVal, rmInstName, printMsg)                 \
+    if (resultVal != checkVal) {                                                  \
+        char errorMsgToPrint[] = printMsg;                                        \
+        printf("RM Inst : %s : ", rmInstName);                                    \
+        printf("%s with error code : %d, exiting\n", errorMsgToPrint, resultVal); \
+        return(-1);                                                               \
+    }
+
+/* RM registered transport mapping structure */
+typedef struct trans_map_entry_s {
+    /* Registered RM transport handle */
+    Rm_TransportHandle        transportHandle;
+    /* Remote socket tied to the transport handle */
+    sock_name_t              *remote_sock;
+} Transport_MapEntry;
+
+
+
+
+
+/* RM Client Vars */
+Rm_Handle           rmClientHandle = NULL;
+Rm_ServiceHandle   *rmClientServiceHandle = NULL;
+sock_h              rmClientSocket;
+
+/* Client instance name (must match with RM Global Resource List (GRL) and policies */
+char                rmClientName[RM_NAME_MAX_CHARS] = "RM_Client_NETAPI";
+
+/* Client socket name */
+char                rmClientSockName[] = "/tmp/var/run/rm/rm_client_netapi";
+
+/* Transport map stores the RM transport handle to IPC MessageQ queue mapping */
+Transport_MapEntry  rmTransportMap[MAX_MAPPING_ENTRIES];
+
+
+hplib_spinLock_T net_test_rm_lock;
+
+Rm_Packet *transportAlloc(Rm_AppTransportHandle appTransport, uint32_t pktSize, Rm_PacketHandle *pktHandle)
+{
+    Rm_Packet *rm_pkt = NULL;
+
+    rm_pkt = calloc(1, sizeof(*rm_pkt));
+    if (!rm_pkt) {
+        printf("can't malloc for RM send message (err: %s)\n", strerror(errno));
+        return (NULL);
+    }
+    rm_pkt->pktLenBytes = pktSize;
+    *pktHandle = rm_pkt;
+
+    return(rm_pkt);
+}
+
+void transportFree (Rm_Packet *rm_pkt)
+{
+    if (rm_pkt) {
+        free (rm_pkt);
+    }         
+}
+
+void transportReceive (void)
+{
+    int32_t             rm_result;
+    int                 retval;
+    int                 length = 0;
+    sock_name_t         server_sock_addr;
+    Rm_Packet          *rm_pkt = NULL;
+    struct sockaddr_un  server_addr;    
+    
+    retval = sock_wait(rmClientSocket, &length, NULL, -1);
+    if (retval == -2) {
+        /* Timeout */
+        printf("Error socket timeout\n");
+        return;
+    }
+    else if (retval < 0) {
+        printf("Error in reading from socket, error %d\n", retval);
+        return;
+    }
+    
+    if (length < sizeof(*rm_pkt)) {
+        printf("invalid RM message length %d\n", length);
+        return;
+    }
+    rm_pkt = calloc(1, length);
+    if (!rm_pkt) {
+        printf("can't malloc for recv'd RM message (err: %s)\n",
+               strerror(errno));
+        return;
+    }
+    
+    server_sock_addr.type = sock_addr_e;
+    server_sock_addr.s.addr = &server_addr;
+    retval = sock_recv(rmClientSocket, (char *)rm_pkt, length, &server_sock_addr);
+    if (retval != length) {
+        printf("recv RM pkt failed from socket, received = %d, expected = %d\n",
+               retval, length);
+        return;
+    }
+    
+
+    /* Provide packet to RM Client for processing */       
+    if ((rm_result = Rm_receivePacket(rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].transportHandle, rm_pkt))) {
+        printf("RM failed to process received packet !!: %d\n", rm_result);
+    }
+
+    transportFree(rm_pkt);
+}
+
+int32_t transportSendRcv (Rm_AppTransportHandle appTransport, Rm_PacketHandle pktHandle)
+{
+    sock_name_t *server_sock_name = (sock_name_t *)appTransport;
+    Rm_Packet   *rm_pkt = (Rm_Packet *)pktHandle;
+
+    hplib_mSpinLockLock(&net_test_rm_lock);
+    if (sock_send(rmClientSocket, (char *)rm_pkt, (int) rm_pkt->pktLenBytes, server_sock_name))
+    {
+        hplib_mSpinLockUnlock(&net_test_rm_lock);
+        return (-1);
+    }
+    /* Wait for response from Server */
+    transportReceive();
+    hplib_mSpinLockUnlock(&net_test_rm_lock);
+ 
+    return (0);
+}
+
+int connection_setup(void)
+{
+    Rm_TransportCfg rmTransCfg;
+    int32_t         rm_result;
+    int             i;
+    sock_name_t     sock_name;
+    char            server_sock_name[] = RM_SERVER_SOCKET_NAME;
+    
+    /* Initialize the transport map */
+    for (i = 0; i < MAX_MAPPING_ENTRIES; i++) {
+        rmTransportMap[i].transportHandle = NULL;
+    }
+
+    sock_name.type = sock_name_e;
+    sock_name.s.name = rmClientSockName;
+
+    rmClientSocket = sock_open(&sock_name);
+    if (!rmClientSocket) {
+        printf("connection_setup: Client socket open failed\n");
+        return (-1);
+    }
+
+    rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].remote_sock = calloc(1, sizeof(sock_name_t));
+    rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].remote_sock->type = sock_name_e;    
+    rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].remote_sock->s.name = calloc(1, strlen(server_sock_name)+1);
+    strncpy(rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].remote_sock->s.name, server_sock_name, strlen(server_sock_name)+1);
+
+    /* Register the Server with the Client instance */
+    rmTransCfg.rmHandle = rmClientHandle;
+    rmTransCfg.appTransportHandle = (Rm_AppTransportHandle) rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].remote_sock;
+    rmTransCfg.remoteInstType = Rm_instType_SERVER;
+    rmTransCfg.transportCallouts.rmAllocPkt = transportAlloc;
+    rmTransCfg.transportCallouts.rmSendPkt = transportSendRcv;
+    rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].transportHandle = Rm_transportRegister(&rmTransCfg, &rm_result);  
+    printf("connection_setup: complete !!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+    return(0);
+}
+
+/** ============================================================================
+ *   @n@b initRm
+ *
+ *   @b Description
+ *   @n This API initializes the RM Client for the QMSS test establishing
+ *      a socket connection with the RM Server
+ * 
+ *   @return    int32_t
+ *              -1      -   Error
+ *              0       -   Success
+ * =============================================================================
+ */
+int initRm (void)
+{
+    Rm_InitCfg         rmInitCfg;
+    int32_t            result;
+
+
+    hplib_mSpinLockInit(&net_test_rm_lock );
+    
+    /* Initialize the RM Client - RM must be initialized before anything else in the system */
+    memset(&rmInitCfg, 0, sizeof(rmInitCfg));
+    rmInitCfg.instName = rmClientName;
+    rmInitCfg.instType = Rm_instType_CLIENT;
+    rmClientHandle = Rm_init(&rmInitCfg, &result);
+    RM_ERROR_CHECK(RM_OK, result, rmClientName, "Initialization failed");
+
+
+    /* Open Client service handle */
+    rmClientServiceHandle = Rm_serviceOpenHandle(rmClientHandle, &result);
+    RM_ERROR_CHECK(RM_OK, result, rmClientName, "Service handle open failed");
+
+    return(connection_setup());
+}
+
+int32_t closeRm(void)
+{
+    int32_t            result = 0;
+
+    if(rmClientHandle)
+    {
+        result = Rm_serviceCloseHandle(rmClientServiceHandle);
+        RM_ERROR_CHECK(RM_OK, result, rmClientName, "Service handle close failed");
+        
+        result = Rm_transportUnregister(rmTransportMap[SERVER_TO_CLIENT_MAP_ENTRY].transportHandle);
+        RM_ERROR_CHECK(RM_OK, result, rmClientName, "Unregister of CD transport failed");
+    
+        result = Rm_delete(rmClientHandle, 1);  
+        RM_ERROR_CHECK(RM_OK, result, rmClientName, "Instance delete failed");
+    }
+    return (result);
+}
+
+
+
diff --git a/ti/runtime/netapi/utils/sockutils.c b/ti/runtime/netapi/utils/sockutils.c
new file mode 100644
index 0000000..13933b8
--- /dev/null
+++ b/ti/runtime/netapi/utils/sockutils.c
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <malloc.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+
+#include "sockutils.h"
+
+#define error_msg printf
+
+typedef struct sock_data {
+    struct sockaddr_un addr;
+    fd_set  readfds;
+    int fd;
+} sock_data_t;
+
+int check_and_create_path (char *path)
+{
+    char *d = path;
+    if (!d)
+        return -1;
+
+    while ((d = strchr(d + 1, '/'))) {
+        *d = 0;
+        if (mkdir(path, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) < 0) {
+            if (errno != EEXIST) {
+                *d = '/';
+                error_msg("can't create path %s (error: %s)",
+                        path, strerror(errno));
+                return -1;
+            }
+        }
+        *d = '/';
+    }
+    return 0;
+}
+
+sock_h sock_open (sock_name_t *sock_name)
+{
+    sock_data_t *sd = 0;
+    int retval = 0;
+
+    if (!sock_name) {
+        return 0;
+    }
+
+    sd = calloc (1, sizeof(sock_data_t));
+
+    if (sock_name->type == sock_addr_e) {
+        memcpy (&sd->addr, sock_name->s.addr, sizeof(struct sockaddr_un));
+    } else {
+        if (check_and_create_path(sock_name->s.name) < 0) {
+            goto check_n_return;
+        }
+        sd->addr.sun_family = AF_UNIX;
+        strncpy(sd->addr.sun_path, sock_name->s.name, UNIX_PATH_MAX);
+    }
+
+    sd->fd =  socket(AF_UNIX, SOCK_DGRAM, 0);
+    if (sd->fd < 0) {
+        error_msg("can't open socket %s (error: %s)",
+                  sd->addr.sun_path, strerror(errno));
+        goto check_n_return;
+    }
+
+    unlink(sd->addr.sun_path);
+    if (bind(sd->fd, (struct sockaddr *) &sd->addr, sizeof(struct sockaddr_un)) < 0) {
+        error_msg("can't bind socket %s (error: %s)",
+                  sd->addr.sun_path, strerror(errno));
+        goto check_n_return;
+    }
+
+    FD_ZERO(&sd->readfds);
+    FD_SET(sd->fd, &sd->readfds);
+
+    retval = (int) sd;
+
+check_n_return:
+    if (!retval) {
+        sock_close ((sock_h) &sd);
+    }
+
+    return ((sock_h) retval);
+}
+
+int sock_close (sock_h handle)
+{
+    sock_data_t *sd = (sock_data_t *) handle;
+
+    if (!sd) {
+        return -1;
+    }
+
+    if (sd->fd)
+        close (sd->fd);
+    free (sd);
+
+    return 0;    
+}
+
+int sock_send (sock_h handle, const char *data, int length,
+            sock_name_t *to)
+{
+    int fd;
+    sock_data_t *sd = (sock_data_t *) handle;
+    struct sockaddr_un to_addr;
+
+    if (!to) {
+        return -1;
+    }
+
+    if (to->type == sock_addr_e) {
+        memcpy (&to_addr, to->s.addr, sizeof(struct sockaddr_un));
+    } else {
+        to_addr.sun_family = AF_UNIX;
+        strncpy(to_addr.sun_path, to->s.name, UNIX_PATH_MAX);
+    }
+
+    if (sd) {
+        fd = sd->fd;
+    } else {
+        fd =  socket(AF_UNIX, SOCK_DGRAM, 0);
+        if (fd < 0) {
+            error_msg("can't open socket %s (error: %s)",
+                      to_addr.sun_path, strerror(errno));
+            return -1;
+        }
+    }
+
+    if (sendto (fd, data, length, 0, (struct sockaddr *) &to_addr,
+                sizeof(struct sockaddr_un)) < 0) {
+        error_msg("can't send data to %s (error: %s)",
+                to_addr.sun_path, strerror(errno));
+        return -1;
+
+    }
+
+    if (!sd) {
+        close(fd);
+    }
+
+    return 0;
+}
+
+int sock_wait (sock_h handle, int *size, struct timeval *timeout, int extern_fd)
+{
+    sock_data_t *sd = (sock_data_t *) handle;
+    int retval;
+    fd_set fds;
+
+    if (!sd) {
+        error_msg("invalid hanlde");
+        return -1;
+    }
+
+    fds = sd->readfds;
+
+    if (extern_fd != -1) {
+        FD_SET(extern_fd, &fds);
+    }
+
+    retval = select(FD_SETSIZE, &fds, NULL, NULL, timeout);
+    if (retval == -1) {
+        error_msg("select failed for %s (error: %s)",
+                sd->addr.sun_path, strerror(errno));
+        return -1;
+    }
+
+    if ((extern_fd != -1) && (FD_ISSET(extern_fd, &fds))) {
+        return 1;
+    }
+
+    if (!FD_ISSET(sd->fd, &fds)) {
+        /* Wait timedout */
+        return -2;
+    }
+
+    if (!retval) {
+        return 0;
+    }
+
+    if (size != 0) {
+        retval = ioctl(sd->fd, FIONREAD, size);
+        if (retval == -1) {
+            error_msg("can't read datagram size for %s (error: %s)",
+                    sd->addr.sun_path, strerror(errno));
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+int sock_recv (sock_h handle, char *data, int length, sock_name_t *from)
+{
+    int size;
+    sock_data_t *sd = (sock_data_t *) handle;
+    socklen_t from_length = 0;
+
+    if (!sd) {
+        error_msg("invalid hanlde");
+        return -1;
+    }
+
+    if (from) {
+        if((from->type == sock_addr_e) && (from->s.addr))
+            from_length = sizeof(struct sockaddr_un);
+        else {
+            error_msg("invalid from parameter");
+            return -1;
+        }
+    }
+
+    size = recvfrom(sd->fd, data, length, 0, (struct sockaddr *)((from_length) ? from->s.addr : NULL), &from_length);
+    if (size < 1) {
+        error_msg("can't read datagram from socket for %s (error: %s), size %d",
+                sd->addr.sun_path, strerror(errno), size);
+        return -1;
+    }
+
+    return size;
+    
+}
+
diff --git a/ti/runtime/netapi/utils/sockutils.h b/ti/runtime/netapi/utils/sockutils.h
new file mode 100644
index 0000000..ad83e08
--- /dev/null
+++ b/ti/runtime/netapi/utils/sockutils.h
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+*/
+
+#ifndef __SOCKUTILS_H__
+#define __SOCKUTILS_H__
+
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX 108
+#endif
+
+
+typedef enum {
+    sock_name_e,
+    sock_addr_e
+} sock_name_type;
+
+typedef struct {
+    sock_name_type type;
+    union sock {
+        char *name;
+        struct sockaddr_un *addr;
+    } s;
+} sock_name_t;
+
+#define sock_h void *
+
+int check_and_create_path (char *path);
+sock_h sock_open (sock_name_t *sock_name);
+
+int sock_close (sock_h handle);
+
+int sock_send (sock_h handle, const char *data, int length,
+               sock_name_t *to);
+
+/* Returns: 1 => success (external FD), 0 => success, -1 => error, -2 => timeout */
+int sock_wait (sock_h handle, int *size, struct timeval *timeout, int extern_fd);
+
+int sock_recv (sock_h handle, char *data, int length, sock_name_t *from);
+
+#endif