Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[deliverable/linux.git] / net / rds / rdma_transport.c

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 9c1fed81bf0f73927cc97a09c92e66fd926f288a..7220bebcf5586e0ad9c3a2ec03507017c0403e88 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -49,9 +49,7 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
        rdsdebug("conn %p id %p handling event %u (%s)\n", conn, cm_id,
                 event->event, rdma_event_msg(event->event));
 
-       if (cm_id->device->node_type == RDMA_NODE_RNIC)
-               trans = &rds_iw_transport;
-       else
+       if (cm_id->device->node_type == RDMA_NODE_IB_CA)
                trans = &rds_ib_transport;
 
        /* Prevent shutdown from tearing down the connection
@@ -119,6 +117,14 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
                rds_conn_drop(conn);
                break;
 
+       case RDMA_CM_EVENT_TIMEWAIT_EXIT:
+               if (conn) {
+                       pr_info("RDS: RDMA_CM_EVENT_TIMEWAIT_EXIT event: dropping connection %pI4->%pI4\n",
+                               &conn->c_laddr, &conn->c_faddr);
+                       rds_conn_drop(conn);
+               }
+               break;
+
        default:
                /* things like device disconnect? */
                printk(KERN_ERR "RDS: unknown event %u (%s)!\n",
@@ -200,10 +206,6 @@ static int rds_rdma_init(void)
        if (ret)
                goto out;
 
-       ret = rds_iw_init();
-       if (ret)
-               goto err_iw_init;
-
        ret = rds_ib_init();
        if (ret)
                goto err_ib_init;
@@ -211,8 +213,6 @@ static int rds_rdma_init(void)
        goto out;
 
 err_ib_init:
-       rds_iw_exit();
-err_iw_init:
        rds_rdma_listen_stop();
 out:
        return ret;
@@ -224,11 +224,10 @@ static void rds_rdma_exit(void)
        /* stop listening first to ensure no new connections are attempted */
        rds_rdma_listen_stop();
        rds_ib_exit();
-       rds_iw_exit();
 }
 module_exit(rds_rdma_exit);
 
 MODULE_AUTHOR("Oracle Corporation <rds-devel@oss.oracle.com>");
-MODULE_DESCRIPTION("RDS: IB/iWARP transport");
+MODULE_DESCRIPTION("RDS: IB transport");
 MODULE_LICENSE("Dual BSD/GPL");