netfilter: remove nf_ct_l4proto_find_get/nf_ct_l4proto_put
users have been moved to __nf_ct_l4proto_find. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
cd91566e4b
commit
711d60a9e7
@ -98,11 +98,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
|
|||||||
extern struct nf_conntrack_l4proto *
|
extern struct nf_conntrack_l4proto *
|
||||||
__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
|
__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
|
||||||
|
|
||||||
extern struct nf_conntrack_l4proto *
|
|
||||||
nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);
|
|
||||||
|
|
||||||
extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
|
|
||||||
|
|
||||||
/* Protocol registration. */
|
/* Protocol registration. */
|
||||||
extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
|
extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
|
||||||
extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
|
extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
|
||||||
|
@ -74,27 +74,6 @@ EXPORT_SYMBOL_GPL(__nf_ct_l4proto_find);
|
|||||||
|
|
||||||
/* this is guaranteed to always return a valid protocol helper, since
|
/* this is guaranteed to always return a valid protocol helper, since
|
||||||
* it falls back to generic_protocol */
|
* it falls back to generic_protocol */
|
||||||
struct nf_conntrack_l4proto *
|
|
||||||
nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto)
|
|
||||||
{
|
|
||||||
struct nf_conntrack_l4proto *p;
|
|
||||||
|
|
||||||
rcu_read_lock();
|
|
||||||
p = __nf_ct_l4proto_find(l3proto, l4proto);
|
|
||||||
if (!try_module_get(p->me))
|
|
||||||
p = &nf_conntrack_l4proto_generic;
|
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);
|
|
||||||
|
|
||||||
void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)
|
|
||||||
{
|
|
||||||
module_put(p->me);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(nf_ct_l4proto_put);
|
|
||||||
|
|
||||||
struct nf_conntrack_l3proto *
|
struct nf_conntrack_l3proto *
|
||||||
nf_ct_l3proto_find_get(u_int16_t l3proto)
|
nf_ct_l3proto_find_get(u_int16_t l3proto)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user