Index: pvfs2/src/io/bmi/bmi_ib/ib.c
diff -c pvfs2/src/io/bmi/bmi_ib/ib.c:1.58.2.1 pvfs2/src/io/bmi/bmi_ib/ib.c:1.58.2.3
*** pvfs2/src/io/bmi/bmi_ib/ib.c:1.58.2.1	Thu Nov  8 19:32:05 2007
--- pvfs2/src/io/bmi/bmi_ib/ib.c	Thu Nov 15 10:40:02 2007
***************
*** 6,12 ****
   *
   * See COPYING in top-level directory.
   *
!  * $Id: ib.c,v 1.58.2.1 2007/11/09 00:32:05 slang Exp $
   */
  #include <stdio.h>
  #include <stdlib.h>
--- 6,12 ----
   *
   * See COPYING in top-level directory.
   *
!  * $Id: ib.c,v 1.58.2.3 2007/11/15 15:40:02 slang Exp $
   */
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 41,46 ****
--- 41,48 ----
   */
  static int bmi_ib_method_id;
  
+ const struct bmi_method_ops bmi_ib_ops;
+ 
  /* alloc space for the single device structure pointer; one for
   * vapi and one for openib */
  ib_device_t *ib_device __hidden = NULL;
***************
*** 1541,1547 ****
      struct bmi_method_addr *map;
      ib_method_addr_t *ibmap;
  
!     map = alloc_method_addr(bmi_ib_method_id, (bmi_size_t) sizeof(*ibmap));
      ibmap = map->method_data;
      ibmap->c = c;
      ibmap->hostname = hostname;
--- 1543,1549 ----
      struct bmi_method_addr *map;
      ib_method_addr_t *ibmap;
  
!     map = bmi_alloc_method_addr(bmi_ib_method_id, (bmi_size_t) sizeof(*ibmap));
      ibmap = map->method_data;
      ibmap->c = c;
      ibmap->hostname = hostname;
Index: pvfs2/src/io/bmi/bmi_ib/ib.h
diff -c pvfs2/src/io/bmi/bmi_ib/ib.h:1.29 pvfs2/src/io/bmi/bmi_ib/ib.h:1.29.2.1
*** pvfs2/src/io/bmi/bmi_ib/ib.h:1.29	Tue Oct  9 17:58:30 2007
--- pvfs2/src/io/bmi/bmi_ib/ib.h	Thu Nov 15 10:19:14 2007
***************
*** 5,11 ****
   *
   * See COPYING in top-level directory.
   *
!  * $Id: ib.h,v 1.29 2007/10/09 21:58:30 slang Exp $
   */
  #ifndef __ib_h
  #define __ib_h
--- 5,11 ----
   *
   * See COPYING in top-level directory.
   *
!  * $Id: ib.h,v 1.29.2.1 2007/11/15 15:19:14 slang Exp $
   */
  #ifndef __ib_h
  #define __ib_h
***************
*** 38,44 ****
      struct qlist_head list;
  
      /* connection management */
!     struct method_addr *remote_map;
      char *peername;  /* string representation of remote_map */
  
      /* per-connection buffers */
--- 38,44 ----
      struct qlist_head list;
  
      /* connection management */
!     struct bmi_method_addr *remote_map;
      char *peername;  /* string representation of remote_map */
  
      /* per-connection buffers */
***************
*** 362,368 ****
   */
  typedef struct {
      int listen_sock;  /* TCP sock on which to listen for new connections */
!     struct method_addr *listen_addr;  /* and BMI listen address */
  
      struct qlist_head connection; /* list of current connections */
      struct qlist_head sendq;  /* outstanding sent items */
--- 362,368 ----
   */
  typedef struct {
      int listen_sock;  /* TCP sock on which to listen for new connections */
!     struct bmi_method_addr *listen_addr;  /* and BMI listen address */
  
      struct qlist_head connection; /* list of current connections */
      struct qlist_head sendq;  /* outstanding sent items */