From owner-p4-projects@FreeBSD.ORG Mon Oct 15 03:33:41 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87B5516A421; Mon, 15 Oct 2007 03:33:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D82116A41B for ; Mon, 15 Oct 2007 03:33:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 34D9413C45D for ; Mon, 15 Oct 2007 03:33:41 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9F3XfNT080584 for ; Mon, 15 Oct 2007 03:33:41 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9F3Xfmh080581 for perforce@freebsd.org; Mon, 15 Oct 2007 03:33:41 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 15 Oct 2007 03:33:41 GMT Message-Id: <200710150333.l9F3Xfmh080581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 127542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2007 03:33:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=127542 Change 127542 by kmacy@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 -#include +#include +#include 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 + +#include /* 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 -#include +#include -#include +#include +#include -#include -#include - 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 -#include +#include struct iw_cm_id;