diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2012-02-21 08:30:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-21 20:58:54 +0100 |
| commit | 4934b0329f7150dcb5f90506860e2db32274c755 (patch) | |
| tree | b3181828957caaa486c4b96d6692f60b199ba5f0 /net/core | |
| parent | bnx2x: update driver version to 1.72.10-0 (diff) | |
| download | linux-4934b0329f7150dcb5f90506860e2db32274c755.tar.xz linux-4934b0329f7150dcb5f90506860e2db32274c755.zip | |
datagram: Factor out sk queue referencing
This makes lines shorter and simplifies further patching.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/datagram.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c index 68bbf9f65cb0..6f54d0a17f8e 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -180,18 +180,19 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags, * However, this function was correct in any case. 8) */ unsigned long cpu_flags; + struct sk_buff_head *queue = &sk->sk_receive_queue; - spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); - skb = skb_peek(&sk->sk_receive_queue); + spin_lock_irqsave(&queue->lock, cpu_flags); + skb = skb_peek(queue); if (skb) { *peeked = skb->peeked; if (flags & MSG_PEEK) { skb->peeked = 1; atomic_inc(&skb->users); } else - __skb_unlink(skb, &sk->sk_receive_queue); + __skb_unlink(skb, queue); } - spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); + spin_unlock_irqrestore(&queue->lock, cpu_flags); if (skb) return skb; |