X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Fklnds%2Fo2iblnd%2Fo2iblnd_cb.c;h=ce7c601944344310b60492ec5af867adfb04b1f6;hp=8f61006828f8b932589675c27761095d626c17f7;hb=dc2e27a6c3ae7d67ffbccfd07c975a08583f1399;hpb=8b0b0892da03dc5de5cd4025b9d31c9217b1e6f1

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 8f61006..ce7c601 100644
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1255,14 +1255,12 @@ static int kiblnd_resolve_addr(struct rdma_cm_id *cmid,
         unsigned short port;
         int rc;
 
-#ifdef HAVE_OFED_RDMA_SET_REUSEADDR
         /* allow the port to be reused */
         rc = rdma_set_reuseaddr(cmid, 1);
         if (rc != 0) {
                 CERROR("Unable to set reuse on cmid: %d\n", rc);
                 return rc;
         }
-#endif
 
         /* look for a free privileged port */
         for (port = PROT_SOCK-1; port > 0; port--) {
@@ -1283,9 +1281,6 @@ static int kiblnd_resolve_addr(struct rdma_cm_id *cmid,
         }
 
         CERROR("Failed to bind to a free privileged port\n");
-#ifndef HAVE_OFED_RDMA_SET_REUSEADDR
-        CERROR("You may need IB verbs that supports rdma_set_reuseaddr()\n");
-#endif
         return rc;
 }
 
@@ -2980,11 +2975,10 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
                 /* net keeps its ref on conn! */
                 return 0;
 
-#ifdef HAVE_OFED_RDMA_CMEV_TIMEWAIT_EXIT
         case RDMA_CM_EVENT_TIMEWAIT_EXIT:
                 CDEBUG(D_NET, "Ignore TIMEWAIT_EXIT event\n");
                 return 0;
-#endif
+
 	case RDMA_CM_EVENT_DISCONNECTED:
                 conn = (kib_conn_t *)cmid->context;
                 if (conn->ibc_state < IBLND_CONN_ESTABLISHED) {
@@ -3006,11 +3000,9 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
                  * to ignore this */
                 return 0;
 
-#ifdef HAVE_OFED_RDMA_CMEV_ADDRCHANGE
         case RDMA_CM_EVENT_ADDR_CHANGE:
                 LCONSOLE_INFO("Physical link changed (eg hca/port)\n");
                 return 0;
-#endif
         }
 }