diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2012-02-21 07:30:33 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-12 16:33:22 +0200 |
| commit | 6f26afc900c8c346f39e2088cbfea7f5db373928 (patch) | |
| tree | 41bbf61f6ce37f231f9eaea32fe46692da9bc3f4 /net | |
| parent | d6ded32444c070ce41ad0d64fce8957d18009d72 (diff) | |
| download | kernel_samsung_smdk4412-6f26afc900c8c346f39e2088cbfea7f5db373928.zip kernel_samsung_smdk4412-6f26afc900c8c346f39e2088cbfea7f5db373928.tar.gz kernel_samsung_smdk4412-6f26afc900c8c346f39e2088cbfea7f5db373928.tar.bz2 | |
datagram: Factor out sk queue referencing
commit 4934b0329f7150dcb5f90506860e2db32274c755 upstream.
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>
[bwh: Prerequisite of "net: Clone skb before setting peeked flag"]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -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 68bbf9f..6f54d0a 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; |