X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Flnet%2Flo.c;h=82b723ce37f719cc5aff21d7234ee3bfeaa1b64f;hb=a75f1a90611038ea097912384413813e8d350290;hp=e3506fc957dc46bfabb957cf0f812137737b1e3e;hpb=585e6df77ebf2553760c42b3c7344a6bb0ee7f5e;p=fs%2Flustre-release.git

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index e3506fc..82b723c 100644
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #define DEBUG_SUBSYSTEM S_LNET
@@ -39,28 +38,23 @@ lolnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
 	LASSERT(!lntmsg->msg_routing);
 	LASSERT(!lntmsg->msg_target_is_router);
 
-	return lnet_parse(ni, &lntmsg->msg_hdr, ni->ni_nid, lntmsg, 0);
+	return lnet_parse(ni, &lntmsg->msg_hdr,
+			  lnet_nid_to_nid4(&ni->ni_nid), lntmsg, 0);
 }
 
 static int
 lolnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
 	   int delayed, unsigned int niov,
-	   struct kvec *iov, struct bio_vec *kiov,
+	   struct bio_vec *kiov,
 	   unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
 	struct lnet_msg *sendmsg = private;
 
-	if (lntmsg != NULL) {			/* not discarding */
-		if (iov != NULL)
-			lnet_copy_kiov2iov(niov, iov, offset,
-					   sendmsg->msg_niov,
-					   sendmsg->msg_kiov,
-					   sendmsg->msg_offset, mlen);
-		else
-			lnet_copy_kiov2kiov(niov, kiov, offset,
-					    sendmsg->msg_niov,
-					    sendmsg->msg_kiov,
-					    sendmsg->msg_offset, mlen);
+	if (lntmsg) {			/* not discarding */
+		lnet_copy_kiov2kiov(niov, kiov, offset,
+				    sendmsg->msg_niov,
+				    sendmsg->msg_kiov,
+				    sendmsg->msg_offset, mlen);
 
 		lnet_finalize(lntmsg, 0);
 	}