usnic: minor cleanup / consolidation

CMR'ing just to (try to) keep the differences between trunk and v1.8
branch (somewhat) small.

Reviewed by Dave Goodell

cmr=v1.8.3:reviewer=ompi-rm1.8

This commit was SVN r32315.

ompi/mca/btl/usnic/btl_usnic_ack.c

@@ -187,11 +187,6 @@ ompi_btl_usnic_ack_send(
     ompi_btl_usnic_endpoint_t *endpoint)
 {
     ompi_btl_usnic_ack_segment_t *ack;
-#if MSGDEBUG1
-    uint8_t mac[6];
-    char src_mac[32];
-    char dest_mac[32];
-#endif
 
     /* Get an ACK frag.  If we don't get one, just discard this ACK. */
     ack = ompi_btl_usnic_ack_segment_alloc(module);
@@ -209,16 +204,22 @@ ompi_btl_usnic_ack_send(
         sizeof(ompi_btl_usnic_btl_header_t);
 
 #if MSGDEBUG1
-    memset(src_mac, 0, sizeof(src_mac));
-    memset(dest_mac, 0, sizeof(dest_mac));
-    ompi_btl_usnic_sprintf_mac(src_mac, module->if_mac);
-    ompi_btl_usnic_gid_to_mac(&endpoint->endpoint_remote_addr.gid, mac);
-    ompi_btl_usnic_sprintf_mac(dest_mac, mac);
+    {
+        uint8_t mac[6];
+        char src_mac[32];
+        char dest_mac[32];
 
-    opal_output(0, "--> Sending ACK, sg_entry length %d, seq %" UDSEQ " to %s, qp %u", 
-                ack->ss_base.us_sg_entry[0].length,
-                ack->ss_base.us_btl_header->ack_seq, dest_mac,
-                endpoint->endpoint_remote_addr.qp_num[ack->ss_channel]);
+        memset(src_mac, 0, sizeof(src_mac));
+        memset(dest_mac, 0, sizeof(dest_mac));
+        ompi_btl_usnic_sprintf_mac(src_mac, module->if_mac);
+        ompi_btl_usnic_gid_to_mac(&endpoint->endpoint_remote_addr.gid, mac);
+        ompi_btl_usnic_sprintf_mac(dest_mac, mac);
+
+        opal_output(0, "--> Sending ACK, sg_entry length %d, seq %" UDSEQ " to %s, qp %u",
+                    ack->ss_base.us_sg_entry[0].length,
+                    ack->ss_base.us_btl_header->ack_seq, dest_mac,
+                    endpoint->endpoint_remote_addr.qp_num[ack->ss_channel]);
+    }
 #endif
 
     /* Do we need to check the connectivity?  If enabled, we'll check