diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-12-05 11:50:17 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-12-05 11:50:17 -0800 |
| commit | 3e356b2660eda9da7776144cbc0a038c93dcb335 (patch) | |
| tree | 378a38636f6b67a5f092a73850223d11cdfb5ff5 /net/sctp/socket.c | |
| parent | 05f70395c642bed0300bc1955bfa8c0f93de2bc2 (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Auto-update from upstream
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index abab81f3818..d890dfa8818 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4743,11 +4743,6 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, struct sk_buff *skb; long timeo; - /* Caller is allowed not to check sk->sk_err before calling. */ - error = sock_error(sk); - if (error) - goto no_packet; - timeo = sock_rcvtimeo(sk, noblock); SCTP_DEBUG_PRINTK("Timeout: timeo: %ld, MAX: %ld.\n", @@ -4774,6 +4769,11 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags, if (skb) return skb; + /* Caller is allowed not to check sk->sk_err before calling. */ + error = sock_error(sk); + if (error) + goto no_packet; + if (sk->sk_shutdown & RCV_SHUTDOWN) break; |