Always declare oob_tcp_disable_family, no matter if --disable-ipv6 is set.

This commit was SVN r18164.

orte/mca/oob/tcp/oob_tcp.c

@@ -357,6 +357,11 @@ int mca_oob_tcp_component_open(void)
                            false, false,
                            64*1024 - 1 - mca_oob_tcp_component.tcp_port_min,
                            &mca_oob_tcp_component.tcp_port_range);
+    mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
+                           "disable_family", "Disable IPv4 (4) or IPv6 (6)",
+                           false, false,
+                           0,
+                           &mca_oob_tcp_component.disable_family);
 #if OPAL_WANT_IPV6
     mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
                            "port_min_v6", "Starting port allowed (IPv6)",
@@ -368,11 +373,6 @@ int mca_oob_tcp_component_open(void)
                            false, false,
                            64*1024 - 1 - mca_oob_tcp_component.tcp6_port_min,
                            &mca_oob_tcp_component.tcp6_port_range);
-    mca_base_param_reg_int(&mca_oob_tcp_component.super.oob_base,
-                           "disable_family", "Disable IPv4 (4) or IPv6 (6)",
-                           false, false,
-                           0,
-                           &mca_oob_tcp_component.disable_family);
     mca_oob_tcp_component.tcp6_listen_sd = -1;
 #endif  /* OPAL_WANT_IPV6 */
 

orte/mca/oob/tcp/oob_tcp.h

@@ -205,13 +205,13 @@ struct mca_oob_tcp_component_t {
     unsigned short     tcp_listen_port;      /**< IPv4 listen port */
     int                tcp_port_min;         /**< Minimum allowed port for the OOB listen socket */
     int                tcp_port_range;       /**< Range of allowed TCP ports */
+    int                disable_family;       /**< disable AF: 0-nothing, 4-IPv4, 6-IPv6 */
 #if OPAL_WANT_IPV6
     opal_event_t       tcp6_recv_event;      /**< event structure for IPv6 recvs */
     int                tcp6_listen_sd;       /**< listen socket for incoming IPv6 connection requests */
     unsigned short     tcp6_listen_port;     /**< IPv6 listen port */
     int                tcp6_port_min;        /**< Minimum allowed port for the OOB listen socket */
     int                tcp6_port_range;      /**< Range of allowed TCP ports */
-    int                disable_family;       /**< disable AF: 0-nothing, 4-IPv4, 6-IPv6 */
 #endif  /* OPAL_WANT_IPV6 */
     opal_mutex_t       tcp_lock;             /**< lock for accessing module state */
     opal_list_t        tcp_events;           /**< list of pending events (accepts) */