From patchwork Sun Oct 19 18:04:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Schlaegl Manfred jun." X-Patchwork-Id: 400820 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 8773A14007B for ; Mon, 20 Oct 2014 05:08:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbaJSSIk (ORCPT ); Sun, 19 Oct 2014 14:08:40 -0400 Received: from mout.gmx.net ([212.227.15.18]:64317 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495AbaJSSIi (ORCPT ); Sun, 19 Oct 2014 14:08:38 -0400 Received: from [10.30.2.13] ([90.146.126.97]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0M5uLh-1Y3bss2Ny5-00xoEp; Sun, 19 Oct 2014 20:08:31 +0200 Message-ID: <5443FD47.7040003@gmx.at> Date: Sun, 19 Oct 2014 20:04:55 +0200 From: Manfred Schlaegl User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Icedove/24.8.1 MIME-Version: 1.0 To: "David S. Miller" CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Manfred Schlaegl Subject: [PATCH] ipv6: tcp_v6_iff: fix compilation error on CONFIG_IPV6=n X-Enigmail-Version: 1.6 X-Provags-ID: V03:K0:9wAcTJmfUgTuqr4/y2Mu6K8uIrXVJjtXPaYkkf1lEKP/4svIVMX /JtvdSU+4vxnro1J86D1EkEGxJLOq4SmZ9JsWUCRsyzmvysMGmuTYuQ7gHj6+7KMycqvjW6 jJoHY1HkgthItVLmmnhu4Q2yuUFEXNN9QQV8Hi78l81RGa5C562jgyxW065HnC8VBoZZPrj 9eiONjRQ92OedbnPeP71Q== X-UI-Out-Filterresults: notjunk:1; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If CONFIG_IPV6=n, then h6 in struct tcp_skb_cb.header is missing which leads to compilation-errors on tcp_v6_iff like: In file included from net/core/sock.c:140:0: include/net/tcp.h: In function ‘tcp_v6_iif’: include/net/tcp.h:738:32: error: ‘union ’ has no member named ‘h6’ This fix solves the problem by removing tcp_v6_iif, in case of CONFIG_IPV6=n. Signed-off-by: Manfred Schlaegl --- include/net/tcp.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/net/tcp.h b/include/net/tcp.h index c9766f8..4062b4f 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -730,6 +730,7 @@ struct tcp_skb_cb { #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0])) +#if IS_ENABLED(CONFIG_IPV6) /* This is the variant of inet6_iif() that must be used by TCP, * as TCP moves IP6CB into a different location in skb->cb[] */ @@ -737,6 +738,7 @@ static inline int tcp_v6_iif(const struct sk_buff *skb) { return TCP_SKB_CB(skb)->header.h6.iif; } +#endif /* Due to TSO, an SKB can be composed of multiple actual * packets. To keep these tracked properly, we use this.