From patchwork Sun Apr 28 21:08:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Rientjes X-Patchwork-Id: 240307 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 729E22C00B8 for ; Mon, 29 Apr 2013 07:09:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756560Ab3D1VIp (ORCPT ); Sun, 28 Apr 2013 17:08:45 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:32926 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753722Ab3D1VIn (ORCPT ); Sun, 28 Apr 2013 17:08:43 -0400 Received: by mail-pd0-f172.google.com with SMTP id 4so3303269pdd.3 for ; Sun, 28 Apr 2013 14:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type; bh=dkIq8L8WX0X2iDyf+ZUDlpOclfcPITd8Uu5ZEe2kaO4=; b=KyOtK6IH4xIawnFGNnFRGE4UBbBvqQ6u55eJPyF+yO+R7LxyjWkZhYuZm+VYNJmNlT 0W5QtSZ6/9TVpawnzO6V3YEgReDEwmQpVAHXaySWaJwRu6Kpxsewpp6f3V8GLAuuCsx+ FnOrPjxCsgdUg0RAQdCqztkh35wZRV6XYH/KC345oodwgaT9VpZoRe9iEB3JxIitfFZs rgcbvTXJJrtE/c+JIcz5HCz5+Qn4/VaECB07Q8yNU8gSvYj0Rd2uryL4Y2UCB4Cmjmn2 T+PCHLSioypMRXd3/L1wb5yf6mFoGO536UGyzof5Gsgsdd5LFnGJP+42tpN8SF6m+s0j txpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:x-x-sender:to:cc:subject:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=dkIq8L8WX0X2iDyf+ZUDlpOclfcPITd8Uu5ZEe2kaO4=; b=NWLd11WfPJw/XFl9YTATpHd/iB46F3OyJG/iW7qPAqPJYN5Ry3Ft55JquWgXOT5vLA beDk3aTTXwEQC/O4wXY8Ee1Ns/jVrdnY5jBA8HCrEAWQ7BR2ASnpVMSm9N3nbNiCXqd/ G4C87/GvqwLOKkKhn6aCjKHmLqIys0nus44B/P8Qu+oermJuRIzaCFnGPSTkT69n3JiU hUx3Y9mF5npHjdqVXBYupewWroWNKDOukN/YSS2JaiZ946WMI0BlgQHyRP3sDiTL2ue1 ta4mlNvOhbsovTyYmsDnz+PUtnVfNUKmIA6BCORPI5Qv2UinJwKVkkcyUAZMr6d2KE66 rXTA== X-Received: by 10.66.118.172 with SMTP id kn12mr55934897pab.128.1367183323350; Sun, 28 Apr 2013 14:08:43 -0700 (PDT) Received: from [2620:0:1008:1101:be30:5bff:fed8:5e64] ([2620:0:1008:1101:be30:5bff:fed8:5e64]) by mx.google.com with ESMTPSA id ux10sm22771607pab.1.2013.04.28.14.08.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 28 Apr 2013 14:08:42 -0700 (PDT) Date: Sun, 28 Apr 2013 14:08:41 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: "David S. Miller" cc: Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkBqKFJDuYrhvFB1vC3U+gyrWivHZwehQ4j6vwzMGEK5twcdgcXRy+FXjzUm4aOlr53oWcw9v5RogWZPsNX2CkJhPeq4zePaJiErFgA6O5sFBz+1EftI0VZc0MTXwQVMFpvh6k9zDeSAM1gIPwkOu9Ohq6h0Ko81Qa5/oa9bgTj/3T61haFxNaUTaW+/y068sxy2xHz Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net/built-in.o: In function `ip_tunnel_xmit': (.text+0x11ec70): undefined reference to `icmpv6_send' Signed-off-by: David Rientjes --- net/ipv4/ip_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" 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/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -600,7 +600,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, goto tx_error; } } -#if IS_ENABLED(CONFIG_IPV6) +#if IS_BUILTIN(CONFIG_IPV6) else if (skb->protocol == htons(ETH_P_IPV6)) { struct rt6_info *rt6 = (struct rt6_info *)skb_dst(skb);