|
@@ -1286,11 +1286,6 @@ kiblnd_connect_peer(struct kib_peer *peer)
|
|
|
goto failed2;
|
|
|
}
|
|
|
|
|
|
- LASSERT(cmid->device);
|
|
|
- CDEBUG(D_NET, "%s: connection bound to %s:%pI4h:%s\n",
|
|
|
- libcfs_nid2str(peer->ibp_nid), dev->ibd_ifname,
|
|
|
- &dev->ibd_ifip, cmid->device->name);
|
|
|
-
|
|
|
return;
|
|
|
|
|
|
failed2:
|
|
@@ -2992,8 +2987,19 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
|
|
|
} else {
|
|
|
rc = rdma_resolve_route(
|
|
|
cmid, *kiblnd_tunables.kib_timeout * 1000);
|
|
|
- if (!rc)
|
|
|
+ if (!rc) {
|
|
|
+ struct kib_net *net = peer->ibp_ni->ni_data;
|
|
|
+ struct kib_dev *dev = net->ibn_dev;
|
|
|
+
|
|
|
+ CDEBUG(D_NET, "%s: connection bound to "\
|
|
|
+ "%s:%pI4h:%s\n",
|
|
|
+ libcfs_nid2str(peer->ibp_nid),
|
|
|
+ dev->ibd_ifname,
|
|
|
+ &dev->ibd_ifip, cmid->device->name);
|
|
|
+
|
|
|
return 0;
|
|
|
+ }
|
|
|
+
|
|
|
/* Can't initiate route resolution */
|
|
|
CERROR("Can't resolve route for %s: %d\n",
|
|
|
libcfs_nid2str(peer->ibp_nid), rc);
|