diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 11:26:22 +0100 |
| commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
| tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /net/ipv6/raw.c | |
| parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
| parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) | |
| download | linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.gz linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.tar.bz2 linux-3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4.zip | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'net/ipv6/raw.c')
| -rw-r--r-- | net/ipv6/raw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index 617645bc5ed6..e2b848ec9851 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c @@ -434,12 +434,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); } @@ -971,11 +971,11 @@ static int rawv6_ioctl(struct sock *sk, int cmd, unsigned long arg) struct sk_buff *skb; int amount = 0; - spin_lock_irq(&sk->sk_receive_queue.lock); + spin_lock_bh(&sk->sk_receive_queue.lock); skb = skb_peek(&sk->sk_receive_queue); if (skb != NULL) amount = skb->tail - skb->h.raw; - spin_unlock_irq(&sk->sk_receive_queue.lock); + spin_unlock_bh(&sk->sk_receive_queue.lock); return put_user(amount, (int __user *)arg); } |