PERFORCE change 127542 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=127542

Change 127542 by kmacy at kmacy_home:ethng on 2007/10/15 03:32:46

	more general build fixes by adjusting the include paths

Affected files ...

.. //depot/projects/ethng/src/sys/contrib/rdma/ib_cm.h#2 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/ib_mad.h#2 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#2 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#3 edit
.. //depot/projects/ethng/src/sys/contrib/rdma/iw_cm.h#2 edit

Differences ...

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_cm.h#2 (text+ko) ====

@@ -37,8 +37,8 @@
 #if !defined(IB_CM_H)
 #define IB_CM_H
 
-#include <rdma/ib_mad.h>
-#include <rdma/ib_sa.h>
+#include <contrib/rdma/ib_mad.h>
+#include <contrib/rdma/ib_sa.h>
 
 enum ib_cm_state {
 	IB_CM_IDLE,

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_mad.h#2 (text+ko) ====

@@ -39,7 +39,8 @@
 #if !defined( IB_MAD_H )
 #define IB_MAD_H
 
-#include <rdma/ib_verbs.h>
+
+#include <contrib/rdma/ib_verbs.h>
 
 /* Management base version */
 #define IB_MGMT_BASE_VERSION			1
@@ -380,7 +381,7 @@
  * @mad: References the start of the received MAD.
  */
 struct ib_mad_recv_buf {
-	struct list_head	list;
+	TAILQ_ENTRY(ib_mad_recv_buf)	entry;
 	struct ib_grh		*grh;
 	struct ib_mad		*mad;
 };
@@ -398,7 +399,7 @@
 struct ib_mad_recv_wc {
 	struct ib_wc		*wc;
 	struct ib_mad_recv_buf	recv_buf;
-	struct list_head	rmpp_list;
+	TAILQ_ENTRY(ib_mad_recv_wc)	entry;
 	int			mad_len;
 };
 
@@ -418,7 +419,9 @@
 	u8	mgmt_class;
 	u8	mgmt_class_version;
 	u8	oui[3];
+#ifdef notyet	
 	DECLARE_BITMAP(method_mask, IB_MGMT_MAX_METHODS);
+#endif	
 };
 
 /**

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#2 (text+ko) ====

@@ -37,14 +37,11 @@
 #ifndef IB_SA_H
 #define IB_SA_H
 
-#include <linux/completion.h>
-#include <linux/compiler.h>
+#include <machine/atomic.h>
 
-#include <asm/atomic.h>
+#include <contrib/rdma/ib_verbs.h>
+#include <contrib/rdma/ib_mad.h>
 
-#include <rdma/ib_verbs.h>
-#include <rdma/ib_mad.h>
-
 enum {
 	IB_SA_CLASS_VERSION		= 2,	/* IB spec version 1.1/1.2 */
 
@@ -256,7 +253,9 @@
 
 struct ib_sa_client {
 	atomic_t users;
+#ifdef notyet
 	struct completion comp;
+#endif	
 };
 
 /**

==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#3 (text+ko) ====

@@ -717,7 +717,7 @@
 	TAILQ_ENTRY(ib_uobject)	entry;		/* link to context's list */
 	u32			id;		/* index into kernel idr */
 	atomic_t		ref;
-	struct rw_semaphore	mutex;		/* protects .live */
+	struct rwlock	        lock;		/* protects .live */
 	int			live;
 };
 

==== //depot/projects/ethng/src/sys/contrib/rdma/iw_cm.h#2 (text+ko) ====

@@ -33,8 +33,7 @@
 #ifndef IW_CM_H
 #define IW_CM_H
 
-#include <linux/in.h>
-#include <rdma/ib_cm.h>
+#include <contrib/rdma/ib_cm.h>
 
 struct iw_cm_id;