leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: nf_queue: make nf_queue_entry_release_refs static

Browse Source 
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: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
2020-03-27 03:24:46 +01:00
committed by Pablo Neira Ayuso
parent 7da182a998
commit dd3cc111f2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netfilter/nf_queue.h
View File

@@ -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_reinject(struct nf_queue_entry *entry, unsigned int verdict);
void nf_queue_entry_get_refs(struct nf_queue_entry *entry); 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) static inline void init_hashrandom(u32 *jhash_initval)
{ {

10
net/netfilter/nf_queue.c
View File

@@ -64,7 +64,7 @@ static void nf_queue_entry_release_br_nf_refs(struct sk_buff *skb)
#endif #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; 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); 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) static void nf_queue_entry_get_br_nf_refs(struct sk_buff *skb)
{ {

10
net/netfilter/nfnetlink_queue.c
View File

@@ -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) #define nf_bridge_adjust_segmented_data(s) do {} while (0)
#endif #endif
static void free_entry(struct nf_queue_entry *entry)
{
nf_queue_entry_release_refs(entry);
kfree(entry);
}
static int static int
__nfqnl_enqueue_packet_gso(struct net *net, struct nfqnl_instance *queue, __nfqnl_enqueue_packet_gso(struct net *net, struct nfqnl_instance *queue,
struct sk_buff *skb, struct nf_queue_entry *entry) 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; entry_seg->skb = skb;
ret = __nfqnl_enqueue_packet(net, queue, entry_seg); ret = __nfqnl_enqueue_packet(net, queue, entry_seg);
if (ret) if (ret)
free_entry(entry_seg); nf_queue_entry_free(entry_seg);
} }
return ret; return ret;
} }
@@ -827,7 +821,7 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)
if (queued) { if (queued) {
if (err) /* some segments are already queued */ if (err) /* some segments are already queued */
free_entry(entry); nf_queue_entry_free(entry);
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
} }