Fix typo in oob_tcp.c when IPV6 enabled. Cleanup a few other warnings, including a type in coll_sm that prevented that component from registering its MCA params!

ompi/mca/coll/sm/coll_sm_component.c

@@ -13,6 +13,7 @@
  * Copyright (c) 2008-2009 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2011-2015 Los Alamos National Security, LLC.
  *                         All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -72,7 +73,7 @@ mca_coll_sm_component_t mca_coll_sm_component = {
 
             /* Component functions */
             .mca_close_component = sm_close,
-            .mca_query_component = sm_register,
+            .mca_register_component_params = sm_register,
         },
         .collm_data = {
             /* The component is not checkpoint ready */

ompi/mca/osc/pt2pt/osc_pt2pt_passive_target.c

@@ -12,6 +12,7 @@
  *                         reserved.
  * Copyright (c) 2010      IBM Corporation.  All rights reserved.
  * Copyright (c) 2012-2013 Sandia National Laboratories.  All rights reserved.
+ * Copyright (c) 2015      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -488,7 +489,7 @@ int ompi_osc_pt2pt_sync (struct ompi_win_t *win)
 static int ompi_osc_pt2pt_flush_lock (ompi_osc_pt2pt_module_t *module, ompi_osc_pt2pt_outstanding_lock_t *lock,
                                       int target)
 {
-    int ret, flush_count;
+    int ret;
     int my_rank = ompi_comm_rank (module->comm);
 
     /* wait until ack has arrived from target, since we need to be
@@ -510,7 +511,6 @@ static int ompi_osc_pt2pt_flush_lock (ompi_osc_pt2pt_module_t *module, ompi_osc_
 
     if (-1 == target) {
         /* NTH: no local flush */
-        flush_count = ompi_comm_size(module->comm) - 1;
         for (int i = 0 ; i < ompi_comm_size(module->comm) ; ++i) {
             if (i == my_rank) {
                 continue;
@@ -522,7 +522,6 @@ static int ompi_osc_pt2pt_flush_lock (ompi_osc_pt2pt_module_t *module, ompi_osc_
             }
         }
     } else {
-        flush_count = 1;
 
         /* send control message with flush request and count */
         ret = ompi_osc_pt2pt_flush_remote (module, target, lock);

ompi/mca/pml/cm/pml_cm_recvreq.h

@@ -315,6 +315,7 @@ do {                                                                    \
 }
 
 extern void mca_pml_cm_recv_request_completion(struct mca_mtl_request_t *mtl_request);
+extern void mca_pml_cm_recv_fast_completion(struct mca_mtl_request_t *mtl_request);
 
 #endif
 

orte/mca/oob/tcp/oob_tcp.c

@@ -238,7 +238,7 @@ static int parse_uri(const uint16_t af_family,
 #if OPAL_ENABLE_IPV6
     else if (AF_INET6 == af_family) {
         struct sockaddr_in6 *in6;
-        memset(inaddr, 0, sizeof(struct sockaddr_in6));=
+        memset(inaddr, 0, sizeof(struct sockaddr_in6));
         in6 = (struct sockaddr_in6*) inaddr;
 
         if (0 == inet_pton(AF_INET6, host, (void*)&in6->sin6_addr)) {