2013-04-28 21:08:45

by David Rientjes

Subject: [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module

net/built-in.o: In function `ip_tunnel_xmit':
(.text+0x11ec70): undefined reference to `icmpv6_send'

Signed-off-by: David Rientjes <[email protected]>
---
net/ipv4/ip_tunnel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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

2013-04-29 01:43:16

by Cong Wang

Subject: Re: [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module

On Mon, Apr 29, 2013 at 5:08 AM, David Rientjes <[email protected]> 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