From 6a890044b77e6ea0bc8d069e01e72a5094f295d1 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@gmx.de>
Date: Sat, 7 Jul 2007 22:17:36 -0700
Subject: [PATCH] --- yaml --- r: 58971 b: refs/heads/master c:
 170b197c0afc621179f0f82284e331e3c252b7cf h: refs/heads/master i:   58969:
 7475d618477b52692e4ca914aae617725df5d4da   58967:
 f2ce8d88c7a187b835bad232e6b834e6f476e184 v: v3

---
 [refs]                                    | 2 +-
 trunk/net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +-
 trunk/net/ipv4/netfilter/nf_nat_rule.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 882a79f55853..1d7ed56b7576 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a47362a226456d8db8207e618324a2278d05d3a7
+refs/heads/master: 170b197c0afc621179f0f82284e331e3c252b7cf
diff --git a/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c b/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
index 846a0e727218..f136ef7f23f8 100644
--- a/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
+++ b/trunk/net/ipv4/netfilter/ipt_MASQUERADE.c
@@ -109,7 +109,7 @@ masquerade_target(struct sk_buff **pskb,
 	return nf_nat_setup_info(ct, &newrange, hooknum);
 }
 
-static inline int
+static int
 device_cmp(struct nf_conn *i, void *ifindex)
 {
 	const struct nf_conn_nat *nat = nfct_nat(i);
diff --git a/trunk/net/ipv4/netfilter/nf_nat_rule.c b/trunk/net/ipv4/netfilter/nf_nat_rule.c
index fc3d9437beba..ea1a07c74fe3 100644
--- a/trunk/net/ipv4/netfilter/nf_nat_rule.c
+++ b/trunk/net/ipv4/netfilter/nf_nat_rule.c
@@ -172,7 +172,7 @@ static bool ipt_dnat_checkentry(const char *tablename,
 	return true;
 }
 
-inline unsigned int
+unsigned int
 alloc_null_binding(struct nf_conn *ct, unsigned int hooknum)
 {
 	/* Force range to this IP; let proto decide mapping for