Skip to content

Commit 711d60a

Browse files
Florian Westphalkaber
authored andcommitted
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>
1 parent cd91566 commit 711d60a

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

include/net/netfilter/nf_conntrack_l4proto.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
9898
extern struct nf_conntrack_l4proto *
9999
__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
100100

101-
extern struct nf_conntrack_l4proto *
102-
nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);
103-
104-
extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
105-
106101
/* Protocol registration. */
107102
extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
108103
extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);

net/netfilter/nf_conntrack_proto.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,27 +74,6 @@ EXPORT_SYMBOL_GPL(__nf_ct_l4proto_find);
7474

7575
/* this is guaranteed to always return a valid protocol helper, since
7676
* it falls back to generic_protocol */
77-
struct nf_conntrack_l4proto *
78-
nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto)
79-
{
80-
struct nf_conntrack_l4proto *p;
81-
82-
rcu_read_lock();
83-
p = __nf_ct_l4proto_find(l3proto, l4proto);
84-
if (!try_module_get(p->me))
85-
p = &nf_conntrack_l4proto_generic;
86-
rcu_read_unlock();
87-
88-
return p;
89-
}
90-
EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);
91-
92-
void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)
93-
{
94-
module_put(p->me);
95-
}
96-
EXPORT_SYMBOL_GPL(nf_ct_l4proto_put);
97-
9877
struct nf_conntrack_l3proto *
9978
nf_ct_l3proto_find_get(u_int16_t l3proto)
10079
{

0 commit comments

Comments
 (0)