From: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Date: Thu, 20 Oct 2011 12:18:04 +0000 (+0100)
Subject: ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e23ebf0fa9e1548c94d8277e393be97ba48faa06;p=mv-sheeva.git

ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function.

This is to address the following error during the compilation:

  In file included from kernel/sysctl_binary.c:6:
  include/net/ip_vs.h:1406: error: expected identifier or ‘(’ before ‘{’ token
  make[1]: *** [kernel/sysctl_binary.o] Error 1
  make[1]: *** Waiting for unfinished jobs....

That manifests itself when CONFIG_IP_VS_NFCT is undefined in .config file.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index a6b8b47e41a..05b08c926ad 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1396,7 +1396,7 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb,
 {
 }
 
-static inline int ip_vs_confirm_conntrack(struct sk_buff *skb);
+static inline int ip_vs_confirm_conntrack(struct sk_buff *skb)
 {
 	return NF_ACCEPT;
 }