Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ac41e81 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: {nf_netlink,ip,ip6}_queue: use list_for_each_entry 



Use list_add_tail/list_for_each_entry instead of list_add and
list_for_each_prev as a preparation for switching to RCU.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c01cd429

net/ipv4/netfilter/ip_queue.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}

net/ipv6/netfilter/ip6_queue.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}

net/netfilter/nfnetlink_queue.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}