LU-16548 lnet: report actual timeout used by lnd

[fs/lustre-release.git] / lnet / klnds / gnilnd / gnilnd.c

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index c9880f9..62d578a 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -592,19 +592,20 @@ kgnilnd_peer_notify(kgn_peer_t *peer, int error, int alive)
                up_read(&kgnilnd_data.kgn_net_rw_sem);
 
                for (i = 0; i < nnets; i++) {
-                       lnet_nid_t peer_nid;
+                       struct lnet_nid peer_nid;
 
                        net = nets[i];
 
-                       peer_nid = kgnilnd_lnd2lnetnid(
-                               lnet_nid_to_nid4(&net->gnn_ni->ni_nid),
-                               peer->gnp_nid);
+                       lnet_nid4_to_nid(kgnilnd_lnd2lnetnid(
+                                                lnet_nid_to_nid4(&net->gnn_ni->ni_nid),
+                                                peer->gnp_nid),
+                                        &peer_nid);
 
                        CDEBUG(D_NET, "peer 0x%p->%s last_alive %lld (%llds ago)\n",
                                peer, libcfs_nid2str(peer_nid), peer->gnp_last_alive,
                                ktime_get_seconds() - peer->gnp_last_alive);
 
-                       lnet_notify(net->gnn_ni, peer_nid, alive, true,
+                       lnet_notify(net->gnn_ni, &peer_nid, alive, true,
                                    peer->gnp_last_alive);
 
                        kgnilnd_net_decref(net);
@@ -2608,12 +2609,8 @@ kgnilnd_startup(struct lnet_ni *ni)
        INIT_LIST_HEAD(&net->gnn_list);
        ni->ni_data = net;
        net->gnn_ni = ni;
-       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;
-       }
+
+       kgnilnd_tunables_setup(ni);
 
        if (!ni->ni_interface) {
                rc = lnet_ni_add_interface(ni, "ipogif0");