diff options
| -rw-r--r-- | include/net/netfilter/nf_nat_protocol.h | 3 | ||||
| -rw-r--r-- | net/ipv4/netfilter/nf_nat_core.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h index df17bac46bf5..93cc90d28e66 100644 --- a/include/net/netfilter/nf_nat_protocol.h +++ b/include/net/netfilter/nf_nat_protocol.h | |||
| @@ -45,9 +45,6 @@ struct nf_nat_protocol { | |||
| 45 | extern int nf_nat_protocol_register(const struct nf_nat_protocol *proto); | 45 | extern int nf_nat_protocol_register(const struct nf_nat_protocol *proto); |
| 46 | extern void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto); | 46 | extern void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto); |
| 47 | 47 | ||
| 48 | extern const struct nf_nat_protocol *nf_nat_proto_find_get(u_int8_t protocol); | ||
| 49 | extern void nf_nat_proto_put(const struct nf_nat_protocol *proto); | ||
| 50 | |||
| 51 | /* Built-in protocols. */ | 48 | /* Built-in protocols. */ |
| 52 | extern const struct nf_nat_protocol nf_nat_protocol_tcp; | 49 | extern const struct nf_nat_protocol nf_nat_protocol_tcp; |
| 53 | extern const struct nf_nat_protocol nf_nat_protocol_udp; | 50 | extern const struct nf_nat_protocol nf_nat_protocol_udp; |
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c index 2c084b3a8f0c..e2e00c4da883 100644 --- a/net/ipv4/netfilter/nf_nat_core.c +++ b/net/ipv4/netfilter/nf_nat_core.c | |||
| @@ -47,7 +47,7 @@ __nf_nat_proto_find(u_int8_t protonum) | |||
| 47 | return rcu_dereference(nf_nat_protos[protonum]); | 47 | return rcu_dereference(nf_nat_protos[protonum]); |
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | const struct nf_nat_protocol * | 50 | static const struct nf_nat_protocol * |
| 51 | nf_nat_proto_find_get(u_int8_t protonum) | 51 | nf_nat_proto_find_get(u_int8_t protonum) |
| 52 | { | 52 | { |
| 53 | const struct nf_nat_protocol *p; | 53 | const struct nf_nat_protocol *p; |
| @@ -60,14 +60,12 @@ nf_nat_proto_find_get(u_int8_t protonum) | |||
| 60 | 60 | ||
| 61 | return p; | 61 | return p; |
| 62 | } | 62 | } |
| 63 | EXPORT_SYMBOL_GPL(nf_nat_proto_find_get); | ||
| 64 | 63 | ||
| 65 | void | 64 | static void |
| 66 | nf_nat_proto_put(const struct nf_nat_protocol *p) | 65 | nf_nat_proto_put(const struct nf_nat_protocol *p) |
| 67 | { | 66 | { |
| 68 | module_put(p->me); | 67 | module_put(p->me); |
| 69 | } | 68 | } |
| 70 | EXPORT_SYMBOL_GPL(nf_nat_proto_put); | ||
| 71 | 69 | ||
| 72 | /* We keep an extra hash for each conntrack, for fast searching. */ | 70 | /* We keep an extra hash for each conntrack, for fast searching. */ |
| 73 | static inline unsigned int | 71 | static inline unsigned int |
