Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index abab81f3818f..d890dfa8818f 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;