int rc;
 
        /* Convert put fields to host byte order */
-       hdr->msg.put.match_bits = le64_to_cpu(hdr->msg.put.match_bits);
-       hdr->msg.put.ptl_index  = le32_to_cpu(hdr->msg.put.ptl_index);
-       hdr->msg.put.offset     = le32_to_cpu(hdr->msg.put.offset);
+       le64_to_cpus(&hdr->msg.put.match_bits);
+       le32_to_cpus(&hdr->msg.put.ptl_index);
+       le32_to_cpus(&hdr->msg.put.offset);
 
        info.mi_id.nid  = hdr->src_nid;
        info.mi_id.pid  = hdr->src_pid;
        int rc;
 
        /* Convert get fields to host byte order */
-       hdr->msg.get.match_bits  = le64_to_cpu(hdr->msg.get.match_bits);
-       hdr->msg.get.ptl_index   = le32_to_cpu(hdr->msg.get.ptl_index);
-       hdr->msg.get.sink_length = le32_to_cpu(hdr->msg.get.sink_length);
-       hdr->msg.get.src_offset  = le32_to_cpu(hdr->msg.get.src_offset);
+       le64_to_cpus(&hdr->msg.get.match_bits);
+       le32_to_cpus(&hdr->msg.get.ptl_index);
+       le32_to_cpus(&hdr->msg.get.sink_length);
+       le32_to_cpus(&hdr->msg.get.src_offset);
 
        info.mi_id.nid  = hdr->src_nid;
        info.mi_id.pid  = hdr->src_pid;
        src.pid = hdr->src_pid;
 
        /* Convert ack fields to host byte order */
-       hdr->msg.ack.match_bits = le64_to_cpu(hdr->msg.ack.match_bits);
-       hdr->msg.ack.mlength = le32_to_cpu(hdr->msg.ack.mlength);
+       le64_to_cpus(&hdr->msg.ack.match_bits);
+       le32_to_cpus(&hdr->msg.ack.mlength);
 
        cpt = lnet_cpt_of_cookie(hdr->msg.ack.dst_wmd.wh_object_cookie);
        lnet_res_lock(cpt);
                /* convert common msg->hdr fields to host byteorder */
                msg->msg_hdr.type       = type;
                msg->msg_hdr.src_nid    = src_nid;
-               msg->msg_hdr.src_pid    = le32_to_cpu(msg->msg_hdr.src_pid);
+               le32_to_cpus(&msg->msg_hdr.src_pid);
                msg->msg_hdr.dest_nid   = dest_nid;
                msg->msg_hdr.dest_pid   = dest_pid;
                msg->msg_hdr.payload_length = payload_length;