Commit dd3cc111 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_queue: make nf_queue_entry_release_refs static 



This is a preparation patch, no logical changes.
Move free_entry into core and rename it to something more sensible.

Will ease followup patches which will complicate the refcount handling.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7da182a9

include/net/netfilter/nf_queue.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ void nf_unregister_queue_handler(struct net *net); 
void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);



void nf_queue_entry_get_refs(struct nf_queue_entry *entry);

void nf_queue_entry_release_refs(struct nf_queue_entry *entry);

void nf_queue_entry_free(struct nf_queue_entry *entry);



static inline void init_hashrandom(u32 *jhash_initval)

{

net/netfilter/nf_queue.c

+8 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void nf_queue_entry_release_br_nf_refs(struct sk_buff *skb) 
#endif

}



void nf_queue_entry_release_refs(struct nf_queue_entry *entry)

static void nf_queue_entry_release_refs(struct nf_queue_entry *entry)

{

	struct nf_hook_state *state = &entry->state;
@@ -78,7 +78,13 @@ void nf_queue_entry_release_refs(struct nf_queue_entry *entry) 


	nf_queue_entry_release_br_nf_refs(entry->skb);

}

EXPORT_SYMBOL_GPL(nf_queue_entry_release_refs);



void nf_queue_entry_free(struct nf_queue_entry *entry)

{

	nf_queue_entry_release_refs(entry);

	kfree(entry);

}

EXPORT_SYMBOL_GPL(nf_queue_entry_free);



static void nf_queue_entry_get_br_nf_refs(struct sk_buff *skb)

{

net/netfilter/nfnetlink_queue.c

+2 −8
Original line number Diff line number Diff line
@@ -737,12 +737,6 @@ static void nf_bridge_adjust_segmented_data(struct sk_buff *skb) 
#define nf_bridge_adjust_segmented_data(s) do {} while (0)

#endif



static void free_entry(struct nf_queue_entry *entry)

{

	nf_queue_entry_release_refs(entry);

	kfree(entry);

}



static int

__nfqnl_enqueue_packet_gso(struct net *net, struct nfqnl_instance *queue,

			   struct sk_buff *skb, struct nf_queue_entry *entry)
@@ -768,7 +762,7 @@ __nfqnl_enqueue_packet_gso(struct net *net, struct nfqnl_instance *queue, 
		entry_seg->skb = skb;

		ret = __nfqnl_enqueue_packet(net, queue, entry_seg);

		if (ret)

			free_entry(entry_seg);

			nf_queue_entry_free(entry_seg);

	}

	return ret;

}
@@ -827,7 +821,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum) 


	if (queued) {

		if (err) /* some segments are already queued */

			free_entry(entry);

			nf_queue_entry_free(entry);

		kfree_skb(skb);

		return 0;

	}