Version: 1
-Previous: bba336c0517732c249a686eae4d8b30825ee213a
-Head: 1bb28598bd4713ad10a72f2629f09fb7b0f95a21
+Previous: 60b2949b0881f00e6118d3cbb4b41e1e05471b88
+Head: 1aa0b9f57f7544c8a16f73608547f6c76af64fb9
Applied:
rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
- dapl-rb: 28aa625f1a03db2223a9f46f3c1d2bb5fa120fe9
- refresh-temp: 1bb28598bd4713ad10a72f2629f09fb7b0f95a21
+ dapl-rb: 1aa0b9f57f7544c8a16f73608547f6c76af64fb9
Unapplied:
dapl-rbuf: 1b32ba003ddd6d87afa33599a75331eaacd0c37f
debug-wv: f98e9be2365ed35d30abdf31128c331322849c93
Bottom: 444ca51fb8db59667c31c6148b6e3a866befb8e8
-Top: 53744f9d03b1210efb078e95d0e3c38356e99ceb
+Top: 3e4e6e1b1b16b3341c6fe252783f5a62a278a73f
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-03-04 14:00:34 -0800
#endif /* _DAPL_RING_BUFFER_H_ */
diff --git a/trunk/ulp/dapl2/dapl/include/dapl.h b/trunk/ulp/dapl2/dapl/include/dapl.h
-index 4439ec5..a32743f 100644
+index 4439ec5..208113b 100644
--- a/trunk/ulp/dapl2/dapl/include/dapl.h
+++ b/trunk/ulp/dapl2/dapl/include/dapl.h
-@@ -1,1269 +1,1268 @@
+@@ -1,1269 +1,1270 @@
-/*\r
- * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.\r
- *\r
+struct dapl_ring_buffer
+{
+ void **base; /* base of element array */
-+ DAT_COUNT size;
-+ DAT_COUNT head;
-+ DAT_COUNT tail;
-+ DAPL_OS_LOCK lock;
++ DAT_COUNT lim; /* mask, number of entries - 1 */
++ DAPL_ATOMIC head; /* head pointer index */
++ DAPL_ATOMIC tail; /* tail pointer index */
+};
+
+struct dapl_cookie_buffer
+ unsigned int qpn; /* qp number */
+ ib_qp_state_t qp_state;
+
++ /* communications manager handle (IBM OS API) */
++ // dp_ib_cm_handle_t cm_handle;
++
+ /* Add support for multiple CM object ownership */
+ DAPL_LLIST_HEAD cm_list_head;
+
+++ /dev/null
-Bottom: 53744f9d03b1210efb078e95d0e3c38356e99ceb
-Top: 3e4e6e1b1b16b3341c6fe252783f5a62a278a73f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-03-04 14:47:43 -0800
-
-Refresh of dapl-rb
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/include/dapl.h b/trunk/ulp/dapl2/dapl/include/dapl.h
-index a32743f..208113b 100644
---- a/trunk/ulp/dapl2/dapl/include/dapl.h
-+++ b/trunk/ulp/dapl2/dapl/include/dapl.h
-@@ -237,10 +237,9 @@ struct dapl_llist_entry
- struct dapl_ring_buffer
- {
- void **base; /* base of element array */
-- DAT_COUNT size;
-- DAT_COUNT head;
-- DAT_COUNT tail;
-- DAPL_OS_LOCK lock;
-+ DAT_COUNT lim; /* mask, number of entries - 1 */
-+ DAPL_ATOMIC head; /* head pointer index */
-+ DAPL_ATOMIC tail; /* tail pointer index */
- };
-
- struct dapl_cookie_buffer
-@@ -438,6 +437,9 @@ struct dapl_ep
- unsigned int qpn; /* qp number */
- ib_qp_state_t qp_state;
-
-+ /* communications manager handle (IBM OS API) */
-+ // dp_ib_cm_handle_t cm_handle;
-+
- /* Add support for multiple CM object ownership */
- DAPL_LLIST_HEAD cm_list_head;