Rename of NWAL_TX_FLAG1_DO_IPSEC_CRYPTO to NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO for...

Removed stale unused nwalMemBuf_t

diff --git a/ti/runtime/netapi/src/netapi_init.c b/ti/runtime/netapi/src/netapi_init.c
index ffe4fc89c15aabfbebc8f01b54910a8f5800e378..90aed7d0b4223f01c860d17dce3bceeef922054b 100755 (executable)
--- a/ti/runtime/netapi/src/netapi_init.c
+++ b/ti/runtime/netapi/src/netapi_init.c
@@ -398,7 +398,6 @@ int netapi_init_nwal(
      NETAPI_CFG_T*p_cfg )
 {
     nwalSizeInfo_t  nwalSizeInfo;
-    nwalMemBuf_t    nwalMemBuf[nwal_N_BUFS];
     nwal_RetValue   nwalRetVal;
     nwalGlobCfg_t   nwalGlobCfg;
     uint8_t         count;
@@ -473,7 +472,6 @@ int netapi_init_nwal(
     nwalGlobCfg.rxDefPktQ = QMSS_PARAM_NOT_SPECIFIED;
 
     /* Get the Buffer Requirement from NWAL */
-    memset(&nwalMemBuf,0,sizeof(nwalMemBuf));
     memset(&nwalSizeInfo,0,sizeof(nwalSizeInfo));
     nwalSizeInfo.nMaxMacAddress = TUNE_NETAPI_MAX_NUM_MAC;
     nwalSizeInfo.nMaxIpAddress = TUNE_NETAPI_MAX_NUM_IP;
@@ -482,10 +480,6 @@ int netapi_init_nwal(
     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;
-    for(count=0;count < nwal_N_BUFS;count++)
-    {
-        nwalMemBuf[count].cacheLineSize = CACHE_LINESZ;
-    }
     nwalRetVal = nwal_getBufferReq(&nwalSizeInfo,
                                    sizes,
                                    aligns);

diff --git a/ti/runtime/netapi/test/net_test.c b/ti/runtime/netapi/test/net_test.c
index db5c0b93cbf7a28dd5eed35d1346892e3d67ba1a..bf1794bdf1a618b98f486f1f7d43c48f282614c9 100755 (executable)
--- a/ti/runtime/netapi/test/net_test.c
+++ b/ti/runtime/netapi/test/net_test.c
@@ -1072,7 +1072,7 @@ if (len <1500)
 }
 #endif
            meta.sa_handle=p_sa_info->tx_inflow_mode_handle; //this tells netapi that inflow crypto needs to be applied
-           //meta_tx.txFlag1 = (NWAL_TX_FLAG1_DO_IPV4_CHKSUM|NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_DO_IPSEC_CRYPTO| NWAL_TX_FLAG1_META_DATA_VALID );
+           //meta_tx.txFlag1 = (NWAL_TX_FLAG1_DO_IPV4_CHKSUM|NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO| NWAL_TX_FLAG1_META_DATA_VALID );
            meta_tx.txFlag1 = p_sa_info->tx_pkt_info.txFlag1;
            meta_tx.enetPort=0;
            //meta_tx.saOffBytes=14+20;  
@@ -1944,7 +1944,7 @@ void  build_sa_db(int i)
         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_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        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 ;
 
          trie_insert(p_trie_sa,(char *)&(tx_sa[i].spi),4, (void *) &sa_info[i]); //asociate with tx sa SPI
          
@@ -1997,7 +1997,7 @@ void  build_sa_db(int i)
         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_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        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 ;
 
        trie_insert(p_trie_sa,(char *)&(tx_sa[i].spi),4, (void *) &sa_info[i]); //asociate with tx sa SPI
     }
@@ -2045,7 +2045,7 @@ void  build_sa_db(int i)
         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_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        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 ;
 
        trie_insert(p_trie_sa,(char *)&(tx_sa[i].spi),4, (void *) &sa_info[i]); //asociate with tx sa SPI
     }
@@ -2095,7 +2095,7 @@ void  build_sa_db(int i)
         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_CRYPTO| NWAL_TX_FLAG1_DO_UDP_CHKSUM| NWAL_TX_FLAG1_META_DATA_VALID ;
+        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 ;
 
        trie_insert(p_trie_sa,(char *)&(tx_sa[i].spi),4, (void *) &sa_info[i]); //asociate with tx sa SPI
     }
@@ -3059,7 +3059,7 @@ static inline void send_it(Ti_Pkt *tip, int len, ROUTE_SEC_T * p_sec)
   meta_tx2.ploadLen = len ;
   if(p_sec)
   {   
-       meta_tx2.txFlag1 |= NWAL_TX_FLAG1_DO_IPSEC_CRYPTO ;
+       meta_tx2.txFlag1 |= NWAL_TX_FLAG1_DO_IPSEC_ESP_CRYPTO ;
        meta2.sa_handle=p_sec->tx_inflow_mode_handle; //this tells netapi that inflow crypto needs to be applied
        meta_tx2.enetPort=0;
        meta_tx2.saOffBytes=14+20;