X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fklnds%2Fgnilnd%2Fgnilnd.c;h=74d0fa2b2dffe19334c12d0c1fa702c6be6994f7;hp=2922f5e95e79bbecc08d9fff02d7c03bb05fbde5;hb=254aec0ff702a856e688e0e61e773d63b3285171;hpb=0308951e8bba1663bc9495eee2f6ae631e6bcbd0

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index 2922f5e..74d0fa2b 100644
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -2706,8 +2706,12 @@ kgnilnd_startup(lnet_ni_t *ni)
 	INIT_LIST_HEAD(&net->gnn_list);
 	ni->ni_data = net;
 	net->gnn_ni = ni;
-	ni->ni_maxtxcredits = *kgnilnd_tunables.kgn_credits;
-	ni->ni_peertxcredits = *kgnilnd_tunables.kgn_peer_credits;
+	if (!ni->ni_net->net_tunables_set) {
+		ni->ni_net->net_tunables.lct_max_tx_credits =
+			*kgnilnd_tunables.kgn_credits;
+		ni->ni_net->net_tunables.lct_peer_tx_credits =
+			*kgnilnd_tunables.kgn_peer_credits;
+	}
 
 	if (*kgnilnd_tunables.kgn_peer_health) {
 		int     fudge;
@@ -2717,9 +2721,10 @@ kgnilnd_startup(lnet_ni_t *ni)
 		fudge = (GNILND_TO2KA(*kgnilnd_tunables.kgn_timeout) / GNILND_REAPER_NCHECKS);
 		timeout = *kgnilnd_tunables.kgn_timeout + fudge;
 
-		if (*kgnilnd_tunables.kgn_peer_timeout >= timeout)
-			ni->ni_peertimeout = *kgnilnd_tunables.kgn_peer_timeout;
-		else if (*kgnilnd_tunables.kgn_peer_timeout > -1) {
+		if (*kgnilnd_tunables.kgn_peer_timeout >= timeout) {
+			ni->ni_net->net_tunables.lct_peer_timeout =
+				 *kgnilnd_tunables.kgn_peer_timeout;
+		} else if (*kgnilnd_tunables.kgn_peer_timeout > -1) {
 			LCONSOLE_ERROR("Peer_timeout is set to %d but needs to be >= %d\n",
 					*kgnilnd_tunables.kgn_peer_timeout,
 					timeout);
@@ -2727,10 +2732,10 @@ kgnilnd_startup(lnet_ni_t *ni)
 			LIBCFS_FREE(net, sizeof(*net));
 			GOTO(failed, rc = -EINVAL);
 		} else
-			ni->ni_peertimeout = timeout;
+			ni->ni_net->net_tunables.lct_peer_timeout = timeout;
 
 		LCONSOLE_INFO("Enabling LNet peer health for gnilnd, timeout %ds\n",
-			      ni->ni_peertimeout);
+			      ni->ni_net->net_tunables.lct_peer_timeout);
 	}
 
 	atomic_set(&net->gnn_refcount, 1);