Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / ulp / isert / ib_isert.h

diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index b9d6cc6917cf2bc6640bc58763f5fbf221e58571..032f65abee3694ec56122dd0bd9091eb5e84caa6 100644 (file)
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -78,7 +78,6 @@ struct isert_device;
 
 struct isert_conn {
        enum iser_conn_state    state;
-       bool                    logout_posted;
        int                     post_recv_buf_count;
        atomic_t                post_send_buf_count;
        u32                     responder_resources;
@@ -106,6 +105,7 @@ struct isert_conn {
        struct completion       conn_wait;
        struct completion       conn_wait_comp_err;
        struct kref             conn_kref;
+       bool                    disconnect;
 };
 
 #define ISERT_MAX_CQ 64
@@ -131,7 +131,7 @@ struct isert_device {
 };
 
 struct isert_np {
-       wait_queue_head_t       np_accept_wq;
+       struct semaphore        np_sem;
        struct rdma_cm_id       *np_cm_id;
        struct mutex            np_accept_mutex;
        struct list_head        np_accept_list;