Make the trunk openib btl compile again.

This commit was SVN r13110.

ompi/mca/btl/openib/btl_openib.h

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -155,12 +155,12 @@ typedef struct mca_btl_openib_port_info_t mca_btl_openib_port_info_t;
 #define MCA_BTL_OPENIB_PORT_INFO_NTOH(hdr)     \
     do {                              \
         (hdr).mtu = ntohl((hdr).mtu); \
-        (hdr).subnet = ntoh64((hdr).subnet); \
+        (hdr).subnet_id = ntoh64((hdr).subnet_id); \
     } while (0)
 #define MCA_BTL_OPENIB_PORT_INFO_HTON(hdr)     \
     do {                              \
         (hdr).mtu = htonl((hdr).mtu); \
-        (hdr).subnet = hton64((hdr).subnet); \
+        (hdr).subnet_id = hton64((hdr).subnet_id); \
     } while (0)
 
 struct mca_btl_openib_hca_t {