diff options
| author | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@hera.kernel.org> | 2005-06-21 10:39:41 -0400 |
| commit | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (patch) | |
| tree | eb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595 /net/ipv6/udp.c | |
| parent | bbc0274e9bb2e3f1d724d445a2bd32566b9b66f7 (diff) | |
| parent | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-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 e251d0ba4f39..eff050ac7049 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
| @@ -300,12 +300,12 @@ csum_copy_err: | |||
| 300 | /* Clear queue. */ | 300 | /* Clear queue. */ |
| 301 | if (flags&MSG_PEEK) { | 301 | if (flags&MSG_PEEK) { |
| 302 | int clear = 0; | 302 | int clear = 0; |
| 303 | spin_lock_irq(&sk->sk_receive_queue.lock); | 303 | spin_lock_bh(&sk->sk_receive_queue.lock); |
| 304 | if (skb == skb_peek(&sk->sk_receive_queue)) { | 304 | if (skb == skb_peek(&sk->sk_receive_queue)) { |
| 305 | __skb_unlink(skb, &sk->sk_receive_queue); | 305 | __skb_unlink(skb, &sk->sk_receive_queue); |
| 306 | clear = 1; | 306 | clear = 1; |
| 307 | } | 307 | } |
| 308 | spin_unlock_irq(&sk->sk_receive_queue.lock); | 308 | spin_unlock_bh(&sk->sk_receive_queue.lock); |
| 309 | if (clear) | 309 | if (clear) |
| 310 | kfree_skb(skb); | 310 | kfree_skb(skb); |
| 311 | } | 311 | } |