diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2017-03-24 18:08:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-03-25 04:49:30 +0100 |
| commit | 2b5cd0dfa384242f78a396b90087368c9440cc9a (patch) | |
| tree | aba02503d7405e225fe590248127028e10cafd8c /net/sctp | |
| parent | net: Only define skb_mark_napi_id in one spot instead of two (diff) | |
| download | linux-2b5cd0dfa384242f78a396b90087368c9440cc9a.tar.xz linux-2b5cd0dfa384242f78a396b90087368c9440cc9a.zip | |
net: Change return type of sk_busy_loop from bool to void
checking the return value of sk_busy_loop. As there are only a few
consumers of that data, and the data being checked for can be replaced
with a check for !skb_queue_empty() we might as well just pull the code
out of sk_busy_loop and place it in the spots that actually need it.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
| -rw-r--r-- | net/sctp/socket.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 72cc3ecf6516..ccc08fc39722 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -7518,9 +7518,12 @@ struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, if (sk->sk_shutdown & RCV_SHUTDOWN) break; - if (sk_can_busy_loop(sk) && - sk_busy_loop(sk, noblock)) - continue; + if (sk_can_busy_loop(sk)) { + sk_busy_loop(sk, noblock); + + if (!skb_queue_empty(&sk->sk_receive_queue)) + continue; + } /* User doesn't want to wait. */ error = -EAGAIN; |