LU-14206 lnet: Router ping timeout with discovery disabled

[fs/lustre-release.git] / lnet / lnet / router.c

diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c
index 9357dd0..e5dd77b 100644 (file)
--- a/lnet/lnet/router.c
+++ b/lnet/lnet/router.c
@@ -507,11 +507,11 @@ lnet_router_discovery_complete(struct lnet_peer *lp)
        lp->lp_alive = lp->lp_dc_error == 0;
        spin_unlock(&lp->lp_lock);
 
-       /* ping replies are being handled when discovery is disabled */
-       if (lnet_is_discovery_disabled_locked(lp))
-               return;
-
        if (!lp->lp_dc_error) {
+               /* ping replies are being handled when discovery is disabled */
+               if (lnet_is_discovery_disabled_locked(lp))
+                       return;
+
                /*
                * mark single-hop routes.  If the remote net is not configured on
                * the gateway we assume this is intentional and we mark the