diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-22 22:14:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-22 22:14:36 -0700 |
| commit | 3d09274cc9d816d62945408840a9cb76a5e7aac7 (patch) | |
| tree | aaa71085396fae5c2bcbd0752071e3a0139d370d | |
| parent | 1d4a31dde95af56edac4dee268249a29a21fa7c0 (diff) | |
| download | linux-3.10-3d09274cc9d816d62945408840a9cb76a5e7aac7.tar.gz linux-3.10-3d09274cc9d816d62945408840a9cb76a5e7aac7.tar.bz2 linux-3.10-3d09274cc9d816d62945408840a9cb76a5e7aac7.zip | |
sctp: Use skb_queue_walk_safe() and skb_queue_split_tail_init().
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/sctp.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 17b932b8a55..703305d0036 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -406,10 +406,7 @@ struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id); /* A macro to walk a list of skbs. */ #define sctp_skb_for_each(pos, head, tmp) \ -for (pos = (head)->next;\ - tmp = (pos)->next, pos != ((struct sk_buff *)(head));\ - pos = tmp) - + skb_queue_walk_safe(head, pos, tmp) /* A helper to append an entire skb list (list) to another (head). */ static inline void sctp_skb_list_tail(struct sk_buff_head *list, @@ -420,10 +417,7 @@ static inline void sctp_skb_list_tail(struct sk_buff_head *list, sctp_spin_lock_irqsave(&head->lock, flags); sctp_spin_lock(&list->lock); - list_splice((struct list_head *)list, (struct list_head *)head->prev); - - head->qlen += list->qlen; - list->qlen = 0; + skb_queue_splice_tail_init(list, head); sctp_spin_unlock(&list->lock); sctp_spin_unlock_irqrestore(&head->lock, flags); |