diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2012-02-21 02:30:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-21 14:58:54 -0500 |
commit | 4934b0329f7150dcb5f90506860e2db32274c755 (patch) | |
tree | b3181828957caaa486c4b96d6692f60b199ba5f0 /net/core | |
parent | 0b0a635f79f91f3755b6518627ea06dd0dbfd523 (diff) |
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, | |||
180 | * However, this function was correct in any case. 8) | 180 | * However, this function was correct in any case. 8) |
181 | */ | 181 | */ |
182 | unsigned long cpu_flags; | 182 | unsigned long cpu_flags; |
183 | struct sk_buff_head *queue = &sk->sk_receive_queue; | ||
183 | 184 | ||
184 | spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags); | 185 | spin_lock_irqsave(&queue->lock, cpu_flags); |
185 | skb = skb_peek(&sk->sk_receive_queue); | 186 | skb = skb_peek(queue); |
186 | if (skb) { | 187 | if (skb) { |
187 | *peeked = skb->peeked; | 188 | *peeked = skb->peeked; |
188 | if (flags & MSG_PEEK) { | 189 | if (flags & MSG_PEEK) { |
189 | skb->peeked = 1; | 190 | skb->peeked = 1; |
190 | atomic_inc(&skb->users); | 191 | atomic_inc(&skb->users); |
191 | } else | 192 | } else |
192 | __skb_unlink(skb, &sk->sk_receive_queue); | 193 | __skb_unlink(skb, queue); |
193 | } | 194 | } |
194 | spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags); | 195 | spin_unlock_irqrestore(&queue->lock, cpu_flags); |
195 | 196 | ||
196 | if (skb) | 197 | if (skb) |
197 | return skb; | 198 | return skb; |