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

1 files changed, 2 insertions, 6 deletions

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 2a3c0e08a090..e6926cb19420 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -4368,15 +4368,11 @@ static struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
                  *  However, this function was corrent in any case. 8)
                  */
                 if (flags & MSG_PEEK) {
-                        unsigned long cpu_flags;
-
-                        sctp_spin_lock_irqsave(&sk->sk_receive_queue.lock,
-                                               cpu_flags);
+                        spin_lock_bh(&sk->sk_receive_queue.lock);
                         skb = skb_peek(&sk->sk_receive_queue);
                         if (skb)
                                 atomic_inc(&skb->users);
-                        sctp_spin_unlock_irqrestore(&sk->sk_receive_queue.lock,
-                                                    cpu_flags);
+                        spin_unlock_bh(&sk->sk_receive_queue.lock);
                 } else {
                         skb = skb_dequeue(&sk->sk_receive_queue);
                 }