From patchwork Thu Oct 20 12:18:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Wilczynski X-Patchwork-Id: 120802 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1B719B70B2 for ; Thu, 20 Oct 2011 23:18:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751511Ab1JTMST (ORCPT ); Thu, 20 Oct 2011 08:18:19 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:36930 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751055Ab1JTMSS (ORCPT ); Thu, 20 Oct 2011 08:18:18 -0400 Received: by wyg36 with SMTP id 36so2800130wyg.19 for ; Thu, 20 Oct 2011 05:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=Vg3jJahhCdpJQ6xIH8bckDuFuM/pUZf8jIPsgtrgEVk=; b=P1kPT64jlOA9XzMWLlbRXnYEnKxa0nqfgMeT0sb1tkWoDt+nxG8pEoh4Nf5qJZGtok 36EPbEDo64DAEoZy0uvMlYP25o7dHU/Rxtc40zlgQGYH77UiQbgO76XPa1e8lV3DSFmF H5qt9RSB/gcFgn5lUweYnFR9LkXkNqnkm6nNY= Received: by 10.216.137.159 with SMTP id y31mr3711448wei.68.1319113097220; Thu, 20 Oct 2011 05:18:17 -0700 (PDT) Received: from localhost.localdomain (ldn-office.youdevise.com. [83.244.178.146]) by mx.google.com with ESMTPS id e7sm15340701wbh.12.2011.10.20.05.18.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Oct 2011 05:18:15 -0700 (PDT) From: Krzysztof Wilczynski To: Simon Horman Cc: Patrick McHardy , netdev@vger.kernel.org Subject: [PATCH] ipvs: Fix compilation error in ip_vs.h for ip_vs_confirm_conntrack function. Date: Thu, 20 Oct 2011 13:18:04 +0100 Message-Id: <1319113084-7498-1-git-send-email-krzysztof.wilczynski@linux.com> X-Mailer: git-send-email 1.7.7 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- include/net/ip_vs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 139784e..de527d1 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1395,7 +1395,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; }