SDOCM00113252: transportnetlib queue clean up logic does not work when RM is used

diff --git a/ti/runtime/netapi/netapi_util.h b/ti/runtime/netapi/netapi_util.h
index 642e39542dc434cb4bdf7098c95590899fcaf35d..a1cc0c721a1071e4d23a7d5ea62a246847ecbce9 100644 (file)
--- a/ti/runtime/netapi/netapi_util.h
+++ b/ti/runtime/netapi/netapi_util.h
@@ -146,14 +146,14 @@ static inline int netapi_unregisterHeap(NETAPI_T p,
 static inline int netapi_closeHeap(NETAPI_T p,
                                    Pktlib_HeapHandle h)
 {
 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);
     NETAPI_HANDLE_T *pp = (NETAPI_HANDLE_T *) p;
     Qmss_QueueHnd q;
     Pktlib_garbageCollection(h);

-    q = Pktlib_getZeroHeapQueue(h);
-    netapip_zapQ(q);
-    q= Pktlib_getInternalHeapQueue(h);
-    if (pp->master == 2)
-        netapip_zapQ(q);
+
+    Pktlib_deleteHeap(h, &err);
+

     return 1;
 }
 /**
     return 1;
 }
 /**

diff --git a/ti/runtime/netapi/netapi_ver.h b/ti/runtime/netapi/netapi_ver.h
index 566efc1de3fd4b866c2742278fc0ee441ce829a3..24d028cb5f7aad5773f088426e59d7a91fc961ae 100755 (executable)
--- a/ti/runtime/netapi/netapi_ver.h
+++ b/ti/runtime/netapi/netapi_ver.h
@@ -54,14 +54,14 @@ extern "C" {
  *      format:
  *              0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */
  *      format:
  *              0xAABBCCDD -> Arch (AA); API Changes (BB); Major (CC); Minor (DD)
  */

-#define NETAPI_VERSION_ID                   (0x01010003)
+#define NETAPI_VERSION_ID                   (0x01010004)

 
 /**
  * @def NETAPI_VERSION_STR
  *      This is the version string which describes the NETAPI along with the
  *      date and build information.
  */
 
 /**
  * @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.03"
+#define NETAPI_VERSION_STR      "NETAPI Revision: 01.01.00.04"

 
 /**
  *  @ingroup netapi_gen_functions
 
 /**
  *  @ingroup netapi_gen_functions