netfilter: nf_nat: make find/put static
Quoted 63 lines · Linux Kernel Mailing List
Gitweb: http://git.kernel.org/linus/0c200d935346fe0ebde9b6dffbb683dddd166fb9
Commit:0c200d935346fe0ebde9b6dffbb683dddd166fb9
Parent:758ff03387228824617cef9507e5682488bf9e0c
Author: Stephen Hemminger <[email protected]>
AuthorDate: Mon Oct 4 20:53:18 2010 +0200
Committer: Patrick McHardy <[email protected]>
CommitDate: Mon Oct 4 20:53:18 2010 +0200netfilter:
nf_nat: make find/put staticThe functions
nf_nat_proto_find_getandnf_nat_proto_putare only used internally innf_nat_core. This might break some out of tree NAT module.Signed-off-by Stephen Hemminger <[email protected]>Signed-off-by Patrick McHardy <[email protected]>---
include/net/netfilter/nf_nat_protocol.h | 3 ---net/ipv4/netfilter/nf_nat_core.c| 6 ++----2 files changed, 2 insertions(+), 7 deletions(-)include/net/netfilter/nf_nat_protocol.h +0
-3@@ -45,9 +45,6 @@ struct nf_nat_protocol { extern int nf_nat_protocol_register(const struct nf_nat_protocol *proto); extern void nf_nat_protocol_unregister(const struct nf_nat_protocol *proto); -extern const struct nf_nat_protocol *nf_nat_proto_find_get (u_int8_t protocol); -extern void nf_nat_proto_put (const struct nf_nat_protocol *proto); - /* Built-in protocols. */ extern const struct nf_nat_protocol nf_nat_protocol_tcp; extern const struct nf_nat_protocol nf_nat_protocol_udp;net/ipv4/netfilter/nf_nat_core.c +2
-4@@ -47,7 +47,7 @@ __nf_nat_proto_find(u_int8_t protonum) return rcu_dereference(nf_nat_protos[protonum]); } -const struct nf_nat_protocol * +static const struct nf_nat_protocol * nf_nat_proto_find_get(u_int8_t protonum) { const struct nf_nat_protocol *p;@@ -60,14 +60,12 @@ nf_nat_proto_find_get(u_int8_t protonum) return p; } -EXPORT_SYMBOL_GPL (nf_nat_proto_find_get); -void +static void nf_nat_proto_put(const struct nf_nat_protocol *p) { module_put(p->me); } -EXPORT_SYMBOL_GPL (nf_nat_proto_put); /* We keep an extra hash for each conntrack, for fast searching. */
Quoted 1 line
static inline unsigned int
They should be moved inside the
"#if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)", as I now get:
net/ipv4/netfilter/nf_nat_core.c:52: warning: ‘nf_nat_proto_find_get’ defined but not usednet/ipv4/netfilter/nf_nat_core.c:66: warning: ‘nf_nat_proto_put’ defined but not used
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Am 28.10.2010 20:42, schrieb Geert Uytterhoeven:
Quoted 6 lines
Quoted 3 lines · Linux Kernel Mailing List
netfilter:
nf_nat: make find/put static...
Quoted 8 lines
They should be moved inside the
"#ifdefined(CONFIG_NF_CT_NETLINK)||defined(CONFIG_NF_CT_NETLINK_MODULE)", as I now get:
net/ipv4/netfilter/nf_nat_core.c:52: warning: ‘nf_nat_proto_find_get’ defined but not usednet/ipv4/netfilter/nf_nat_core.c:66: warning: ‘nf_nat_proto_put’ defined but not used
Thanks, I'll fix this up.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html