diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2010-05-03 03:22:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-03 15:39:58 -0700 |
| commit | a2f3be17c07ad9bd45ab300f79642ecb39cfb553 (patch) | |
| tree | 22cd236918d0428c1f03f51079cbbf093ca5e5ed /net/unix | |
| parent | 26d27844dfb1d84eafa886f150098c54e192c260 (diff) | |
| download | blackbird-op-linux-a2f3be17c07ad9bd45ab300f79642ecb39cfb553.tar.gz blackbird-op-linux-a2f3be17c07ad9bd45ab300f79642ecb39cfb553.zip | |
unix/garbage: kill copy of the skb queue walker
Worse yet, it seems that its arguments were in reverse order. Also
remove one related helper which seems hardly worth keeping.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/garbage.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 14c22c3768da..c8df6fda0b1f 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c @@ -153,15 +153,6 @@ void unix_notinflight(struct file *fp) } } -static inline struct sk_buff *sock_queue_head(struct sock *sk) -{ - return (struct sk_buff *)&sk->sk_receive_queue; -} - -#define receive_queue_for_each_skb(sk, next, skb) \ - for (skb = sock_queue_head(sk)->next, next = skb->next; \ - skb != sock_queue_head(sk); skb = next, next = skb->next) - static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *), struct sk_buff_head *hitlist) { @@ -169,7 +160,7 @@ static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *), struct sk_buff *next; spin_lock(&x->sk_receive_queue.lock); - receive_queue_for_each_skb(x, next, skb) { + skb_queue_walk_safe(&x->sk_receive_queue, skb, next) { /* * Do we have file descriptors ? */ @@ -225,7 +216,7 @@ static void scan_children(struct sock *x, void (*func)(struct unix_sock *), * and perform a scan on them as well. */ spin_lock(&x->sk_receive_queue.lock); - receive_queue_for_each_skb(x, next, skb) { + skb_queue_walk_safe(&x->sk_receive_queue, skb, next) { u = unix_sk(skb->sk); /* |
