usnic: revert r32315 because the BTL move to opal is ongoing

Let's not make the move to OPAL any harder than it has to be; this
commit can wait until after the BTL move.

This commit was SVN r32316.

The following SVN revision numbers were found above:
  r32315 --> open-mpi/ompi@7b7ed8ed97

ompi/mca/btl/usnic/btl_usnic_ack.c

@@ -187,6 +187,11 @@ 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);
@@ -204,22 +209,16 @@ ompi_btl_usnic_ack_send(
         sizeof(ompi_btl_usnic_btl_header_t);
 
 #if MSGDEBUG1
-    {
+    memset(src_mac, 0, sizeof(src_mac));
-        uint8_t mac[6];
+    memset(dest_mac, 0, sizeof(dest_mac));
-        char src_mac[32];
+    ompi_btl_usnic_sprintf_mac(src_mac, module->if_mac);
-        char dest_mac[32];
+    ompi_btl_usnic_gid_to_mac(&endpoint->endpoint_remote_addr.gid, mac);
+    ompi_btl_usnic_sprintf_mac(dest_mac, mac);
 
-        memset(src_mac, 0, sizeof(src_mac));
+    opal_output(0, "--> Sending ACK, sg_entry length %d, seq %" UDSEQ " to %s, qp %u", 
-        memset(dest_mac, 0, sizeof(dest_mac));
+                ack->ss_base.us_sg_entry[0].length,
-        ompi_btl_usnic_sprintf_mac(src_mac, module->if_mac);
+                ack->ss_base.us_btl_header->ack_seq, dest_mac,
-        ompi_btl_usnic_gid_to_mac(&endpoint->endpoint_remote_addr.gid, mac);
+                endpoint->endpoint_remote_addr.qp_num[ack->ss_channel]);
-        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