diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-20 18:12:51 (GMT) |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-20 18:12:51 (GMT) |
| commit | 58aab753de605c14b9878a897e7349c3063afeff (patch) | |
| tree | c9339c8cbcaae4dfe2232618fe6de1398d05455e /net/ipv6/udp.c | |
| parent | 5893a65711164e42fea4a58bb8adf47c2fac8a4b (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
| download | linux-58aab753de605c14b9878a897e7349c3063afeff.tar.xz | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index e251d0b..eff050a 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -300,12 +300,12 @@ csum_copy_err: /* Clear queue. */ if (flags&MSG_PEEK) { int clear = 0; - spin_lock_irq(&sk->sk_receive_queue.lock); + spin_lock_bh(&sk->sk_receive_queue.lock); if (skb == skb_peek(&sk->sk_receive_queue)) { __skb_unlink(skb, &sk->sk_receive_queue); clear = 1; } - spin_unlock_irq(&sk->sk_receive_queue.lock); + spin_unlock_bh(&sk->sk_receive_queue.lock); if (clear) kfree_skb(skb); } |