sdp: unnecessary wait-queue removed from sdp_sock structure.

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 453a1e5a16d10e0dd01e87c497fe2724961250a8..bb258c68b73ef8baaf13d4fa8fe0f7893911b6db 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -340,7 +340,6 @@ struct sdp_sock {
        int max_sge;
 
        struct work_struct rx_comp_work;
-       wait_queue_head_t wq;
 
        struct delayed_work dreq_wait_work;
        struct work_struct destroy_work;

diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index e2816544f771a14f83feb4c8f3814e86321bf4a7..128d625836488ae81bbb38a3a41a666384a91ba7 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -127,8 +127,6 @@ static int sdp_init_qp(struct sock *sk, struct rdma_cm_id *id)
        sdp_sk(sk)->qp_active = 1;
        sdp_sk(sk)->context.device = device;
 
-       init_waitqueue_head(&sdp_sk(sk)->wq);
-
        sdp_dbg(sk, "%s done\n", __func__);
        return 0;
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index d5bfe698514e3084d6a7b60afac04933df4cf6d3..0bfb6b6e82cea479612be1654e31497801ff9194 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -466,7 +466,6 @@ void sdp_reset(struct sock *sk)
        err = (sk->sk_shutdown & RCV_SHUTDOWN) ? EPIPE : ECONNRESET;
 
        sdp_set_error(sk, -err);
-       wake_up(&sdp_sk(sk)->wq);
        sk->sk_state_change(sk);
 }
 

diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 173949eab76277ec354ec6b7779ce91739f59acd..1f697ccebc1aaba868631ff4f135f8de3de6daf0 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -157,7 +157,6 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
                sdp_cleanup_sdp_buf(ssk, tx_req, skb->len - skb->data_len, DMA_TO_DEVICE);
 
                sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-               wake_up(&ssk->wq);
 
                goto err;
        }
@@ -219,7 +218,6 @@ static int sdp_handle_send_comp(struct sdp_sock *ssk, struct ib_wc *wc)
                        sdp_dbg_data(sk, "Send completion with error. "
                                "Status %d\n", wc->status);
                        sdp_set_error(sk, -ECONNRESET);
-                       wake_up(&ssk->wq);
 
                        queue_work(sdp_wq, &ssk->destroy_work);
                }
@@ -281,7 +279,6 @@ static inline void sdp_process_tx_wc(struct sdp_sock *ssk, struct ib_wc *wc)
                return;
 
        sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-       wake_up(&ssk->wq);
 }
 
 static int sdp_process_tx_cq(struct sdp_sock *ssk)
@@ -459,7 +456,6 @@ void sdp_post_keepalive(struct sdp_sock *ssk)
                sdp_dbg(&ssk->isk.sk,
                        "ib_post_keepalive failed with status %d.\n", rc);
                sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-               wake_up(&ssk->wq);
        }
 
        sdp_cnt(sdp_keepalive_probes_sent);

diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index a6f8b14c5b815c7468b0aa1a3457c77d1167bb54..7b9a6c497076ace039e7114924808afb92614757 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -140,7 +140,6 @@ void srcavail_cancel_timeout(struct work_struct *work)
        sdp_dbg_data(sk, "both SrcAvail and SrcAvailCancel timedout."
                        " closing connection\n");
        sdp_set_error(sk, -ECONNRESET);
-       wake_up(&ssk->wq);
 
        release_sock(sk);
 }
@@ -575,7 +574,6 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
        if (unlikely(rc)) {
                sdp_warn(sk, "ib_post_send failed with status %d.\n", rc);
                sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-               wake_up(&ssk->wq);
                goto err_post_send;
        }