From patchwork Mon Oct 22 12:17:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 193140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D4EC72C008C for ; Mon, 22 Oct 2012 23:17:00 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752096Ab2JVMQ5 (ORCPT ); Mon, 22 Oct 2012 08:16:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32047 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751952Ab2JVMQ4 (ORCPT ); Mon, 22 Oct 2012 08:16:56 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9MCGk1M007173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Oct 2012 08:16:46 -0400 Received: from dragon.localdomain (ovpn-116-94.ams2.redhat.com [10.36.116.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q9MCGiPI029443; Mon, 22 Oct 2012 08:16:45 -0400 Received: from [127.0.0.1] (localhost [IPv6:::1]) by dragon.localdomain (Postfix) with ESMTP id 2EA0EE40653; Mon, 22 Oct 2012 14:17:11 +0200 (CEST) From: Jesper Dangaard Brouer Subject: [nf-next PATCH] ipvs: fix build error when CONFIG_IP_VS_IPV6 is disabled To: Pablo Neira Ayuso , Simon Horman Cc: Jesper Dangaard Brouer , fengguang.wu@intel.com, yuanhan.liu@linux.intel.com, netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org Date: Mon, 22 Oct 2012 14:17:11 +0200 Message-ID: <20121022121711.31397.6231.stgit@dragon> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Yuanhan Liu Fix build error introduced by commit 63dca2c0: "ipvs: Fix faulty IPv6 extension header handling in IPVS" The build error only occur, when CONFIG_IP_VS_IPV6 is disabled. Reported-by: Fengguang Wu Signed-off-by: Yuanhan Liu Signed-off-by: Jesper Dangaard Brouer --- include/net/ip_vs.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index a681ad6..d930749 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -212,8 +212,9 @@ ip_vs_fill_iph_addr_only(int af, const struct sk_buff *skb, (struct ipv6hdr *)skb_network_header(skb); iphdr->saddr.in6 = iph->saddr; iphdr->daddr.in6 = iph->daddr; - } else { + } else #endif + { const struct iphdr *iph = (struct iphdr *)skb_network_header(skb); iphdr->saddr.ip = iph->saddr;