mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
netfilter: nf_nat: fix compiler warning with CONFIG_NF_CT_NETLINK=n
net/ipv4/netfilter/nf_nat_core.c:52: warning: 'nf_nat_proto_find_get' defined but not used net/ipv4/netfilter/nf_nat_core.c:66: warning: 'nf_nat_proto_put' defined but not used Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
6b1686a71e
commit
64e4674922
1 changed files with 20 additions and 20 deletions
|
@ -47,26 +47,6 @@ __nf_nat_proto_find(u_int8_t protonum)
|
||||||
return rcu_dereference(nf_nat_protos[protonum]);
|
return rcu_dereference(nf_nat_protos[protonum]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct nf_nat_protocol *
|
|
||||||
nf_nat_proto_find_get(u_int8_t protonum)
|
|
||||||
{
|
|
||||||
const struct nf_nat_protocol *p;
|
|
||||||
|
|
||||||
rcu_read_lock();
|
|
||||||
p = __nf_nat_proto_find(protonum);
|
|
||||||
if (!try_module_get(p->me))
|
|
||||||
p = &nf_nat_unknown_protocol;
|
|
||||||
rcu_read_unlock();
|
|
||||||
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
nf_nat_proto_put(const struct nf_nat_protocol *p)
|
|
||||||
{
|
|
||||||
module_put(p->me);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* We keep an extra hash for each conntrack, for fast searching. */
|
/* We keep an extra hash for each conntrack, for fast searching. */
|
||||||
static inline unsigned int
|
static inline unsigned int
|
||||||
hash_by_src(const struct net *net, u16 zone,
|
hash_by_src(const struct net *net, u16 zone,
|
||||||
|
@ -588,6 +568,26 @@ static struct nf_ct_ext_type nat_extend __read_mostly = {
|
||||||
#include <linux/netfilter/nfnetlink.h>
|
#include <linux/netfilter/nfnetlink.h>
|
||||||
#include <linux/netfilter/nfnetlink_conntrack.h>
|
#include <linux/netfilter/nfnetlink_conntrack.h>
|
||||||
|
|
||||||
|
static const struct nf_nat_protocol *
|
||||||
|
nf_nat_proto_find_get(u_int8_t protonum)
|
||||||
|
{
|
||||||
|
const struct nf_nat_protocol *p;
|
||||||
|
|
||||||
|
rcu_read_lock();
|
||||||
|
p = __nf_nat_proto_find(protonum);
|
||||||
|
if (!try_module_get(p->me))
|
||||||
|
p = &nf_nat_unknown_protocol;
|
||||||
|
rcu_read_unlock();
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
nf_nat_proto_put(const struct nf_nat_protocol *p)
|
||||||
|
{
|
||||||
|
module_put(p->me);
|
||||||
|
}
|
||||||
|
|
||||||
static const struct nla_policy protonat_nla_policy[CTA_PROTONAT_MAX+1] = {
|
static const struct nla_policy protonat_nla_policy[CTA_PROTONAT_MAX+1] = {
|
||||||
[CTA_PROTONAT_PORT_MIN] = { .type = NLA_U16 },
|
[CTA_PROTONAT_PORT_MIN] = { .type = NLA_U16 },
|
||||||
[CTA_PROTONAT_PORT_MAX] = { .type = NLA_U16 },
|
[CTA_PROTONAT_PORT_MAX] = { .type = NLA_U16 },
|
||||||
|
|
Loading…
Reference in a new issue