Minor shuffling of code: no need to query the GID in the iWARP case.

This commit was SVN r18446.

ompi/mca/btl/openib/btl_openib_component.c

@@ -459,8 +459,6 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
     union ibv_gid gid;
     uint64_t subnet_id;
 
-    ibv_query_gid(hca->ib_dev_context, port_num, 0, &gid);
-
     /* If we have struct ibv_device.transport_type, then we're >= OFED
        v1.2, and the transport could be iWarp or IB.  If we don't have
        that member, then we're < OFED v1.2, and it can only be IB. */
@@ -468,9 +466,11 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca,
     if (IBV_TRANSPORT_IWARP == hca->ib_dev->transport_type) {
         subnet_id = get_iwarp_subnet_id(hca->ib_dev);
     } else {
+        ibv_query_gid(hca->ib_dev_context, port_num, 0, &gid);
         subnet_id = ntoh64(gid.global.subnet_prefix);
     }
 #else
+    ibv_query_gid(hca->ib_dev_context, port_num, 0, &gid);
     subnet_id = ntoh64(gid.global.subnet_prefix);
 #endif