X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Flo.c;h=eaa06fb41631d3de553b822a47d263216d38ea9b;hp=673f9b38c6436e59329e11d002fadc9eeb5fef6a;hb=dab78a9efd05e4f22fc83232bdadce347d3dafda;hpb=72057a3af19ee02d9a686bd7e7d074917e381310

diff --git a/lnet/lnet/lo.c b/lnet/lnet/lo.c
index 673f9b3..eaa06fb 100644
--- a/lnet/lnet/lo.c
+++ b/lnet/lnet/lo.c
@@ -32,7 +32,7 @@
 #include <lnet/lib-lnet.h>
 
 static int
-lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
+lolnd_send(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg)
 {
 	LASSERT(!lntmsg->msg_routing);
 	LASSERT(!lntmsg->msg_target_is_router);
@@ -41,12 +41,12 @@ lolnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 }
 
 static int
-lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
-	    int delayed, unsigned int niov,
-	    struct kvec *iov, lnet_kiov_t *kiov,
-	    unsigned int offset, unsigned int mlen, unsigned int rlen)
+lolnd_recv(struct lnet_ni *ni, void *private, struct lnet_msg *lntmsg,
+	   int delayed, unsigned int niov,
+	   struct kvec *iov, lnet_kiov_t *kiov,
+	   unsigned int offset, unsigned int mlen, unsigned int rlen)
 {
-	lnet_msg_t *sendmsg = private;
+	struct lnet_msg *sendmsg = private;
 
 	if (lntmsg != NULL) {			/* not discarding */
 		if (sendmsg->msg_iov != NULL) {
@@ -73,17 +73,17 @@ lolnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg,
 						    sendmsg->msg_offset, mlen);
 		}
 
-		lnet_finalize(ni, lntmsg, 0);
+		lnet_finalize(lntmsg, 0);
 	}
 
-	lnet_finalize(ni, sendmsg, 0);
+	lnet_finalize(sendmsg, 0);
 	return 0;
 }
 
 static int lolnd_instanced;
 
 static void
-lolnd_shutdown(lnet_ni_t *ni)
+lolnd_shutdown(struct lnet_ni *ni)
 {
 	CDEBUG (D_NET, "shutdown\n");
 	LASSERT(lolnd_instanced);
@@ -92,25 +92,23 @@ lolnd_shutdown(lnet_ni_t *ni)
 }
 
 static int
-lolnd_startup (lnet_ni_t *ni)
+lolnd_startup(struct lnet_ni *ni)
 {
-	LASSERT (ni->ni_lnd == &the_lolnd);
+	LASSERT (ni->ni_net->net_lnd == &the_lolnd);
 	LASSERT (!lolnd_instanced);
 	lolnd_instanced = 1;
 
 	return (0);
 }
 
-lnd_t the_lolnd = {
-	/* .lnd_list	   = */ {&the_lolnd.lnd_list, &the_lolnd.lnd_list},
-	/* .lnd_refcount   = */ 0,
-	/* .lnd_type	   = */ LOLND,
-	/* .lnd_startup    = */ lolnd_startup,
-	/* .lnd_shutdown   = */ lolnd_shutdown,
-	/* .lnt_ctl	   = */ NULL,
-	/* .lnd_send	   = */ lolnd_send,
-	/* .lnd_recv	   = */ lolnd_recv,
-	/* .lnd_eager_recv = */ NULL,
-	/* .lnd_notify	   = */ NULL,
-	/* .lnd_accept	   = */ NULL
+struct lnet_lnd the_lolnd = {
+	.lnd_list	= {
+				.next = &the_lolnd.lnd_list,
+				.prev = &the_lolnd.lnd_list
+			},
+	.lnd_type	= LOLND,
+	.lnd_startup	= lolnd_startup,
+	.lnd_shutdown	= lolnd_shutdown,
+	.lnd_send	= lolnd_send,
+	.lnd_recv	= lolnd_recv
 };