Patchwork net, ipv4: fix link error when CONFIG_IPV6 is a module

login
register
mail settings
Submitter David Rientjes
Date April 28, 2013, 9:08 p.m.
Message ID <alpine.DEB.2.02.1304281407310.3194@chino.kir.corp.google.com>
Download mbox | patch
Permalink /patch/240307/
State Rejected
Delegated to: David Miller
Headers show

Comments

David Rientjes - April 28, 2013, 9:08 p.m.
net/built-in.o: In function `ip_tunnel_xmit':
(.text+0x11ec70): undefined reference to `icmpv6_send'

Signed-off-by: David Rientjes <rientjes@google.com>
---
 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
WANG Cong - April 29, 2013, 1:43 a.m.
On Mon, Apr 29, 2013 at 5:08 AM, David Rientjes <rientjes@google.com> wrote:
> -#if IS_ENABLED(CONFIG_IPV6)
> +#if IS_BUILTIN(CONFIG_IPV6)

This is not a right fix. We had a right one:

[PATCH net-next v3] ipv6: Kill ipv6 dependency of icmpv6_send()
http://marc.info/?l=linux-netdev&m=136692412322576&w=2
--
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

Patch

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);