aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/netfilter/nf_conntrack_l4proto.h5
-rw-r--r--net/netfilter/nf_conntrack_proto.c21
2 files changed, 0 insertions, 26 deletions
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index 16ab604659e7..b01070bf2f84 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -98,11 +98,6 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
98extern struct nf_conntrack_l4proto * 98extern struct nf_conntrack_l4proto *
99__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto); 99__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
100 100
101extern struct nf_conntrack_l4proto *
102nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);
103
104extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
105
106/* Protocol registration. */ 101/* Protocol registration. */
107extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto); 102extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
108extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto); 103extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index 592d73344d46..9a62b4efa0e1 100644
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -74,27 +74,6 @@ EXPORT_SYMBOL_GPL(__nf_ct_l4proto_find);
74 74
75/* this is guaranteed to always return a valid protocol helper, since 75/* this is guaranteed to always return a valid protocol helper, since
76 * it falls back to generic_protocol */ 76 * it falls back to generic_protocol */
77struct nf_conntrack_l4proto *
78nf_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}
90EXPORT_SYMBOL_GPL(nf_ct_l4proto_find_get);
91
92void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p)
93{
94 module_put(p->me);
95}
96EXPORT_SYMBOL_GPL(nf_ct_l4proto_put);
97
98struct nf_conntrack_l3proto * 77struct nf_conntrack_l3proto *
99nf_ct_l3proto_find_get(u_int16_t l3proto) 78nf_ct_l3proto_find_get(u_int16_t l3proto)
100{ 79{