PERFORCE change 128360 for review

[Kip Macy]

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

Change 128360 by kmacy at kmacy:storage:toestack on 2007/10/30 19:02:59

	IFethng #128359

Affected files ...

.. //depot/projects/toestack/sys/contrib/rdma/ib_addr.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_sa.h#2 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#3 integrate
.. //depot/projects/toestack/sys/contrib/rdma/ib_verbs.h#3 integrate
.. //depot/projects/toestack/sys/contrib/rdma/rdma_addr.c#1 branch
.. //depot/projects/toestack/sys/contrib/rdma/rdma_cma.c#1 branch
.. //depot/projects/toestack/sys/contrib/rdma/rdma_device.c#1 branch
.. //depot/projects/toestack/sys/contrib/rdma/rdma_iwcm.c#1 branch
.. //depot/projects/toestack/sys/contrib/rdma/rdma_verbs.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#8 integrate
.. //depot/projects/toestack/sys/modules/Makefile#6 integrate
.. //depot/projects/toestack/sys/modules/rdma/Makefile#1 branch
.. //depot/projects/toestack/sys/net/if_arp.h#4 integrate
.. //depot/projects/toestack/sys/sys/linux_compat.h#3 integrate

Differences ...

==== //depot/projects/toestack/sys/contrib/rdma/ib_addr.h#2 (text+ko) ====

@@ -30,15 +30,11 @@
 #if !defined(IB_ADDR_H)
 #define IB_ADDR_H
 
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/netdevice.h>
-#include <linux/socket.h>
-#include <rdma/ib_verbs.h>
+#include <contrib/rdma/ib_verbs.h>
 
 struct rdma_addr_client {
 	atomic_t refcount;
-	struct completion comp;
+	struct cv comp;
 };
 
 /**

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

@@ -326,10 +326,10 @@
  *
  * If the join operation fails; status will be non-zero, with the following
  * failures possible:
- * -ETIMEDOUT: The request timed out.
- * -EIO: An error occurred sending the query.
- * -EINVAL: The MCMemberRecord values differed from the existing group's.
- * -ENETRESET: Indicates that an fatal error has occurred on the multicast
+ * ETIMEDOUT: The request timed out.
+ * EIO: An error occurred sending the query.
+ * EINVAL: The MCMemberRecord values differed from the existing group's.
+ * ENETRESET: Indicates that an fatal error has occurred on the multicast
  *   group, and the user must rejoin the group to continue using it.
  */
 struct ib_sa_multicast *ib_sa_join_multicast(struct ib_sa_client *client,

==== //depot/projects/toestack/sys/contrib/rdma/ib_umem.h#3 (text+ko) ====

@@ -74,7 +74,7 @@
 static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context,
 					  unsigned long addr, size_t size,
 					  int access) {
-	return ERR_PTR(-EINVAL);
+	return ERR_PTR(EINVAL);
 }
 static inline void ib_umem_release(struct ib_umem *umem) { }
 static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; }

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

@@ -1072,12 +1072,12 @@
 
 static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len)
 {
-	return copyin(udata->inbuf, dest, len) ? -EFAULT : 0;
+	return copyin(udata->inbuf, dest, len);
 }
 
 static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len)
 {
-	return copyout(src, udata->outbuf, len) ? -EFAULT : 0;
+	return copyout(src, udata->outbuf, len);
 }
 
 /**
@@ -1452,7 +1452,7 @@
 {
 	return cq->device->req_ncomp_notif ?
 		cq->device->req_ncomp_notif(cq, wc_cnt) :
-		-ENOSYS;
+		ENOSYS;
 }
 
 /**
@@ -1766,7 +1766,7 @@
 	/* XXX reference counting in corresponding MR? */
 	return mw->device->bind_mw ?
 		mw->device->bind_mw(qp, mw, mw_bind) :
-		-ENOSYS;
+		ENOSYS;
 }
 
 /**

==== //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#8 (text+ko) ====


==== //depot/projects/toestack/sys/modules/Makefile#6 (text+ko) ====

@@ -216,6 +216,7 @@
 	${_ray} \
 	rc \
 	rc4 \
+	rdma \
 	re \
 	reiserfs \
 	rl \

==== //depot/projects/toestack/sys/net/if_arp.h#4 (text+ko) ====

@@ -44,12 +44,14 @@
  * specified.  Field names used correspond to RFC 826.
  */
 struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_IEEE802	6	/* token-ring hardware format */
-#define ARPHRD_ARCNET	7	/* arcnet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-#define ARPHRD_IEEE1394	24	/* firewire hardware format */
+	u_short	ar_hrd;		/* format of hardware address   */
+#define ARPHRD_ETHER 	1	/* ethernet hardware format     */
+#define ARPHRD_IEEE802	6	/* token-ring hardware format   */
+#define ARPHRD_ARCNET	7	/* arcnet hardware format       */
+#define ARPHRD_FRELAY 	15	/* frame relay hardware format  */
+#define ARPHRD_IEEE1394	24	/* firewire hardware format     */
+#define ARPHRD_INFINIBAND 32    /* InfiniBand                   */
+
 	u_short	ar_pro;		/* format of protocol address */
 	u_char	ar_hln;		/* length of hardware address */
 	u_char	ar_pln;		/* length of protocol address */

==== //depot/projects/toestack/sys/sys/linux_compat.h#3 (text+ko) ====

@@ -66,6 +66,8 @@
 {
 	caddr_t tmp = m->m_data;
 
+	panic("FIXME");
+	
 	m->m_data += len;
 	m->m_len += len;
 
@@ -148,4 +150,9 @@
 #define IS_ERR(ptr)  ((unsigned long)(ptr) > (unsigned long)(-1000))
 #define PTR_ERR(ptr)    ((long)(ptr))
 
+#define MODULE_AUTHOR(x)
+#define MODULE_DESCRIPTION(x)
+#define MODULE_LICENSE(x)
+#define EXPORT_SYMBOL(x)
+
 #endif