From: Eldad Zinger Date: Sun, 10 Oct 2010 09:47:06 +0000 (+0200) Subject: sdp: fix code readability X-Git-Tag: v4.1.12-92~264^2~5^2~93 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a2c0485a276d6c3df4d7c089c2bd647b3631a580;p=users%2Fjedix%2Flinux-maple.git sdp: fix code readability Signed-off-by: Eldad Zinger --- diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c index 3b7c249194d0..fd6e00c14bb8 100644 --- a/drivers/infiniband/ulp/sdp/sdp_main.c +++ b/drivers/infiniband/ulp/sdp/sdp_main.c @@ -2373,29 +2373,16 @@ sdp_mid_data: } } - rc = poll_recv_cq(sk); - if (!rc) { - sdp_do_posts(ssk); - } - - if (copied >= target && !recv_poll) { - /* Do not sleep, just process backlog. */ - release_sock(sk); - lock_sock(sk); - } else if (rc) { + if (poll_recv_cq(sk)) { sdp_dbg_data(sk, "sk_wait_data %ld\n", timeo); - sdp_prf(sk, NULL, "giving up polling"); posts_handler_put(ssk, 0); - - /* socket lock is released inside sk_wait_data */ sk_wait_data(sk, &timeo); - posts_handler_get(ssk); - sdp_prf(sk, NULL, "got data"); - sdp_do_posts(ssk); + sdp_dbg_data(sk, "got data/timeout\n"); } + sdp_do_posts(ssk); continue; found_ok_skb: