* [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module
@ 2013-04-28 21:08 David Rientjes
2013-04-29 1:43 ` Cong Wang
0 siblings, 1 reply; 2+ messages in thread
From: David Rientjes @ 2013-04-28 21:08 UTC (permalink / raw)
To: David S. Miller
Cc: Alexey Kuznetsov, James Morris, Hideaki YOSHIFUJI,
Patrick McHardy, netdev, linux-kernel
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(-)
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module
2013-04-28 21:08 [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module David Rientjes
@ 2013-04-29 1:43 ` Cong Wang
0 siblings, 0 replies; 2+ messages in thread
From: Cong Wang @ 2013-04-29 1:43 UTC (permalink / raw)
To: David Rientjes
Cc: David S. Miller, Alexey Kuznetsov, James Morris,
Hideaki YOSHIFUJI, Patrick McHardy,
Linux Kernel Network Developers, LKML
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-29 1:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-28 21:08 [patch] net, ipv4: fix link error when CONFIG_IPV6 is a module David Rientjes
2013-04-29 1:43 ` Cong Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).