projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
nf_nat_proto_common.c
diff --git
a/net/netfilter/nf_nat_proto_common.c
b/net/netfilter/nf_nat_proto_common.c
index 83a72a235cae7c6b9ee3c97dcabb8629fe6e7008..fbce552a796e14a6249e6e9a5d0d2ea16aaf3f09 100644
(file)
--- a/
net/netfilter/nf_nat_proto_common.c
+++ b/
net/netfilter/nf_nat_proto_common.c
@@
-95,7
+95,7
@@
void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto,
}
EXPORT_SYMBOL_GPL(nf_nat_l4proto_unique_tuple);
}
EXPORT_SYMBOL_GPL(nf_nat_l4proto_unique_tuple);
-#if
defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE
)
+#if
IS_ENABLED(CONFIG_NF_CT_NETLINK
)
int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],
struct nf_nat_range *range)
{
int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],
struct nf_nat_range *range)
{