fix for SDOCM00101400- sp config file parameter is used for both slow path and switc...

diff --git a/ti/runtime/netapi/test/net_test_config.txt b/ti/runtime/netapi/test/net_test_config.txt
index 65bfee24e28c0a22a804b3751cbfc2a377300b2f..2b759cdb1a4ffbe1002606a67196c142ea2c571a 100755 (executable)
--- a/ti/runtime/netapi/test/net_test_config.txt
+++ b/ti/runtime/netapi/test/net_test_config.txt
@@ -4,8 +4,8 @@ fp0 = 2 1-1
 fp1 = 3 2-2
 fp2 = 4 3-3
 #mac0 = mac-address switch-port
-mac0 = 00-01-02-03-05-05 sp0
-mac1 = 00-01-02-03-06-07 sp1
+mac0 = 00-01-02-03-05-05 swp0
+mac1 = 00-01-02-03-06-07 swp1
 #ip0 = ip-address mac-interface
 ip0 = 10.0.0.100  mac0
 ip1 = 10.0.1.100  mac1
@@ -14,7 +14,6 @@ local_ipsec_ip = 192.168.1.100
 remote_ipsec_ip = 192.168.1.10
 ipsec_if = 0
 #
-dsp_mac = mac0
 dsp_ip = ip0
 #
 #ipsec_mode_rx = SIDEBAND

diff --git a/ti/runtime/netapi/test/net_test_utils.c b/ti/runtime/netapi/test/net_test_utils.c
index e2db46422fceb6a2717bee01c170e062c8638bab..8f3a942213038918ddf8e31483807eb4385eea8d 100755 (executable)
--- a/ti/runtime/netapi/test/net_test_utils.c
+++ b/ti/runtime/netapi/test/net_test_utils.c
@@ -625,7 +625,7 @@ void netTest_utilParseMac(netTestConfigFile_t *pConfig)
         {
             netTestCfg.num_macs++;
             netTest_utilParseOneMac(&pConfig->mac[i][0],&netTestCfg.mac[i][0]);
-            sscanf(&pConfig->switch_port[i][0],"sp%d",&netTestCfg.switch_port[i]);
+            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);

diff --git a/ti/runtime/netapi/tools/setkey_hmac-sha1_aes-cbc.conf b/ti/runtime/netapi/tools/IPSEC_TOOLS/setkey_hmac-sha1_aes-cbc.conf
similarity index 100%
rename from ti/runtime/netapi/tools/setkey_hmac-sha1_aes-cbc.conf
rename to ti/runtime/netapi/tools/IPSEC_TOOLS/setkey_hmac-sha1_aes-cbc.conf