From d0c1b473996c0d3ab70cd6211cd1cba7fab10bd9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 25 Nov 2008 18:20:13 +0100
Subject: [PATCH] --- yaml --- r: 122386 b: refs/heads/master c:
 65f233fb1669e6c990cd1d7fd308ac7dc66dc207 h: refs/heads/master v: v3

---
 [refs]                                             | 2 +-
 trunk/include/net/netfilter/nf_conntrack_l4proto.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8c0136948154..cab461654ac8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f40ac713c49fb6ca655550b620edc85c445d743
+refs/heads/master: 65f233fb1669e6c990cd1d7fd308ac7dc66dc207
diff --git a/trunk/include/net/netfilter/nf_conntrack_l4proto.h b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
index 7f2f43c77284..debdaf75cecf 100644
--- a/trunk/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/trunk/include/net/netfilter/nf_conntrack_l4proto.h
@@ -129,7 +129,7 @@ extern const struct nla_policy nf_ct_port_nla_policy[];
 	 && net_ratelimit())
 #endif
 #else
-#define LOG_INVALID(net, proto) 0
+static inline int LOG_INVALID(struct net *net, int proto) { return 0; }
 #endif /* CONFIG_SYSCTL */
 
 #endif /*_NF_CONNTRACK_PROTOCOL_H*/