diff options
author | Jan Engelhardt <jengelh@gmx.de> | 2007-07-08 01:17:36 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-11 01:17:02 -0400 |
commit | 170b197c0afc621179f0f82284e331e3c252b7cf (patch) | |
tree | 5a32d18b0c2251a0aec6eb2992c66739e2e2e3fa /net | |
parent | a47362a226456d8db8207e618324a2278d05d3a7 (diff) |
[NETFILTER]: Remove incorrect inline markers
device_cmp: the function's address is taken (call to nf_ct_iterate_cleanup)
alloc_null_binding: referenced externally
Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/ipt_MASQUERADE.c | 2 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_nat_rule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ipt_MASQUERADE.c b/net/ipv4/netfilter/ipt_MASQUERADE.c index 846a0e727218..f136ef7f23f8 100644 --- a/net/ipv4/netfilter/ipt_MASQUERADE.c +++ b/net/ipv4/netfilter/ipt_MASQUERADE.c | |||
@@ -109,7 +109,7 @@ masquerade_target(struct sk_buff **pskb, | |||
109 | return nf_nat_setup_info(ct, &newrange, hooknum); | 109 | return nf_nat_setup_info(ct, &newrange, hooknum); |
110 | } | 110 | } |
111 | 111 | ||
112 | static inline int | 112 | static int |
113 | device_cmp(struct nf_conn *i, void *ifindex) | 113 | device_cmp(struct nf_conn *i, void *ifindex) |
114 | { | 114 | { |
115 | const struct nf_conn_nat *nat = nfct_nat(i); | 115 | const struct nf_conn_nat *nat = nfct_nat(i); |
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c index fc3d9437beba..ea1a07c74fe3 100644 --- a/net/ipv4/netfilter/nf_nat_rule.c +++ b/net/ipv4/netfilter/nf_nat_rule.c | |||
@@ -172,7 +172,7 @@ static bool ipt_dnat_checkentry(const char *tablename, | |||
172 | return true; | 172 | return true; |
173 | } | 173 | } |
174 | 174 | ||
175 | inline unsigned int | 175 | unsigned int |
176 | alloc_null_binding(struct nf_conn *ct, unsigned int hooknum) | 176 | alloc_null_binding(struct nf_conn *ct, unsigned int hooknum) |
177 | { | 177 | { |
178 | /* Force range to this IP; let proto decide mapping for | 178 | /* Force range to this IP; let proto decide mapping for |