From a795ffc95e772305d841281b3a59bcf9c88945f7 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 5 Dec 2007 01:25:03 -0800 Subject: [PATCH] --- yaml --- r: 78307 b: refs/heads/master c: 0ac41e81462de20f87242caac2b9084c202c33b7 h: refs/heads/master i: 78305: 9dfd0a331bfb6d8331ba2fb6d6591f2f884c322d 78303: 2cf6fc5bb9d973469646958910db8feba0454ed8 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_queue.c | 8 +++----- trunk/net/ipv6/netfilter/ip6_queue.c | 8 +++----- trunk/net/netfilter/nfnetlink_queue.c | 8 +++----- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index e1ff9a25b2b7..5168d4a24f1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c01cd429fc118c5db92475c5f08b307718aa4efc +refs/heads/master: 0ac41e81462de20f87242caac2b9084c202c33b7 diff --git a/trunk/net/ipv4/netfilter/ip_queue.c b/trunk/net/ipv4/netfilter/ip_queue.c index 2966fbddce8b..9e72246ede25 100644 --- a/trunk/net/ipv4/netfilter/ip_queue.c +++ b/trunk/net/ipv4/netfilter/ip_queue.c @@ -73,7 +73,7 @@ ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict) static inline void __ipq_enqueue_entry(struct ipq_queue_entry *entry) { - list_add(&entry->list, &queue_list); + list_add_tail(&entry->list, &queue_list); queue_total++; } @@ -84,11 +84,9 @@ __ipq_enqueue_entry(struct ipq_queue_entry *entry) static inline struct ipq_queue_entry * __ipq_find_entry(ipq_cmpfn cmpfn, unsigned long data) { - struct list_head *p; - - list_for_each_prev(p, &queue_list) { - struct ipq_queue_entry *entry = (struct ipq_queue_entry *)p; + struct ipq_queue_entry *entry; + list_for_each_entry(entry, &queue_list, list) { if (!cmpfn || cmpfn(entry, data)) return entry; } diff --git a/trunk/net/ipv6/netfilter/ip6_queue.c b/trunk/net/ipv6/netfilter/ip6_queue.c index 7ff9915750a3..243a00bcd3df 100644 --- a/trunk/net/ipv6/netfilter/ip6_queue.c +++ b/trunk/net/ipv6/netfilter/ip6_queue.c @@ -71,7 +71,7 @@ ipq_issue_verdict(struct ipq_queue_entry *entry, int verdict) static inline void __ipq_enqueue_entry(struct ipq_queue_entry *entry) { - list_add(&entry->list, &queue_list); + list_add_tail(&entry->list, &queue_list); queue_total++; } @@ -82,11 +82,9 @@ __ipq_enqueue_entry(struct ipq_queue_entry *entry) static inline struct ipq_queue_entry * __ipq_find_entry(ipq_cmpfn cmpfn, unsigned long data) { - struct list_head *p; - - list_for_each_prev(p, &queue_list) { - struct ipq_queue_entry *entry = (struct ipq_queue_entry *)p; + struct ipq_queue_entry *entry; + list_for_each_entry(entry, &queue_list, list) { if (!cmpfn || cmpfn(entry, data)) return entry; } diff --git a/trunk/net/netfilter/nfnetlink_queue.c b/trunk/net/netfilter/nfnetlink_queue.c index 3a09f021065a..74d5ed9490a9 100644 --- a/trunk/net/netfilter/nfnetlink_queue.c +++ b/trunk/net/netfilter/nfnetlink_queue.c @@ -231,7 +231,7 @@ static inline void __enqueue_entry(struct nfqnl_instance *queue, struct nfqnl_queue_entry *entry) { - list_add(&entry->list, &queue->queue_list); + list_add_tail(&entry->list, &queue->queue_list); queue->queue_total++; } @@ -243,11 +243,9 @@ static inline struct nfqnl_queue_entry * __find_entry(struct nfqnl_instance *queue, nfqnl_cmpfn cmpfn, unsigned long data) { - struct list_head *p; - - list_for_each_prev(p, &queue->queue_list) { - struct nfqnl_queue_entry *entry = (struct nfqnl_queue_entry *)p; + struct nfqnl_queue_entry *entry; + list_for_each_entry(entry, &queue->queue_list, list) { if (!cmpfn || cmpfn(entry, data)) return entry; }