* [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
@ 2014-09-20 1:02 Andy Zhou
2014-09-20 2:06 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Andy Zhou @ 2014-09-20 1:02 UTC (permalink / raw)
To: davem; +Cc: netdev, Andy Zhou
Functions supplied in ip6_udp_tunnel.c are only needed when IPV6 is
selected. When IPV6 is not selected, those functions are stubbed out
in udp_tunnel.h.
==================================================================
net/ipv6/ip6_udp_tunnel.c:15:5: error: redefinition of 'udp_sock_create6'
int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
In file included from net/ipv6/ip6_udp_tunnel.c:9:0:
include/net/udp_tunnel.h:36:19: note: previous definition of 'udp_sock_create6' was here
static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
==================================================================
Fixes: fd384412e udp_tunnel: Seperate ipv6 functions into its own file
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
---
net/ipv6/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/Makefile b/net/ipv6/Makefile
index 45f830e..2e8c061 100644
--- a/net/ipv6/Makefile
+++ b/net/ipv6/Makefile
@@ -35,7 +35,6 @@ obj-$(CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION) += xfrm6_mode_ro.o
obj-$(CONFIG_INET6_XFRM_MODE_BEET) += xfrm6_mode_beet.o
obj-$(CONFIG_IPV6_MIP6) += mip6.o
obj-$(CONFIG_NETFILTER) += netfilter/
-obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
obj-$(CONFIG_IPV6_VTI) += ip6_vti.o
obj-$(CONFIG_IPV6_SIT) += sit.o
@@ -46,3 +45,7 @@ obj-y += addrconf_core.o exthdrs_core.o ip6_checksum.o ip6_icmp.o
obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload)
obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o
+
+ifneq ($(CONFIG_IPV6),)
+obj-$(CONFIG_NET_UDP_TUNNEL) += ip6_udp_tunnel.o
+endif
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
2014-09-20 1:02 [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected Andy Zhou
@ 2014-09-20 2:06 ` David Miller
2014-09-20 23:14 ` Tom Herbert
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2014-09-20 2:06 UTC (permalink / raw)
To: azhou; +Cc: netdev
From: Andy Zhou <azhou@nicira.com>
Date: Fri, 19 Sep 2014 18:02:53 -0700
> Functions supplied in ip6_udp_tunnel.c are only needed when IPV6 is
> selected. When IPV6 is not selected, those functions are stubbed out
> in udp_tunnel.h.
>
> ==================================================================
> net/ipv6/ip6_udp_tunnel.c:15:5: error: redefinition of 'udp_sock_create6'
> int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
> In file included from net/ipv6/ip6_udp_tunnel.c:9:0:
> include/net/udp_tunnel.h:36:19: note: previous definition of 'udp_sock_create6' was here
> static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
> ==================================================================
>
> Fixes: fd384412e udp_tunnel: Seperate ipv6 functions into its own file
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Andy Zhou <azhou@nicira.com>
Applied, thanks Andy.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
2014-09-20 2:06 ` David Miller
@ 2014-09-20 23:14 ` Tom Herbert
2014-09-21 1:38 ` David Miller
0 siblings, 1 reply; 4+ messages in thread
From: Tom Herbert @ 2014-09-20 23:14 UTC (permalink / raw)
To: David Miller; +Cc: Andy Zhou, Linux Netdev List
On Fri, Sep 19, 2014 at 7:06 PM, David Miller <davem@davemloft.net> wrote:
> From: Andy Zhou <azhou@nicira.com>
> Date: Fri, 19 Sep 2014 18:02:53 -0700
>
>> Functions supplied in ip6_udp_tunnel.c are only needed when IPV6 is
>> selected. When IPV6 is not selected, those functions are stubbed out
>> in udp_tunnel.h.
>>
>> ==================================================================
>> net/ipv6/ip6_udp_tunnel.c:15:5: error: redefinition of 'udp_sock_create6'
>> int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>> In file included from net/ipv6/ip6_udp_tunnel.c:9:0:
>> include/net/udp_tunnel.h:36:19: note: previous definition of 'udp_sock_create6' was here
>> static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>> ==================================================================
>>
>> Fixes: fd384412e udp_tunnel: Seperate ipv6 functions into its own file
>> Reported-by: kbuild test robot <fengguang.wu@intel.com>
>> Signed-off-by: Andy Zhou <azhou@nicira.com>
>
> Applied, thanks Andy.
David, what branch did you apply this to? I pulled from your net-next
but don't see this patch...
Thanks,
Tom
> --
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
2014-09-20 23:14 ` Tom Herbert
@ 2014-09-21 1:38 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2014-09-21 1:38 UTC (permalink / raw)
To: therbert; +Cc: azhou, netdev
From: Tom Herbert <therbert@google.com>
Date: Sat, 20 Sep 2014 16:14:47 -0700
> On Fri, Sep 19, 2014 at 7:06 PM, David Miller <davem@davemloft.net> wrote:
>> From: Andy Zhou <azhou@nicira.com>
>> Date: Fri, 19 Sep 2014 18:02:53 -0700
>>
>>> Functions supplied in ip6_udp_tunnel.c are only needed when IPV6 is
>>> selected. When IPV6 is not selected, those functions are stubbed out
>>> in udp_tunnel.h.
>>>
>>> ==================================================================
>>> net/ipv6/ip6_udp_tunnel.c:15:5: error: redefinition of 'udp_sock_create6'
>>> int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>>> In file included from net/ipv6/ip6_udp_tunnel.c:9:0:
>>> include/net/udp_tunnel.h:36:19: note: previous definition of 'udp_sock_create6' was here
>>> static inline int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg,
>>> ==================================================================
>>>
>>> Fixes: fd384412e udp_tunnel: Seperate ipv6 functions into its own file
>>> Reported-by: kbuild test robot <fengguang.wu@intel.com>
>>> Signed-off-by: Andy Zhou <azhou@nicira.com>
>>
>> Applied, thanks Andy.
>
> David, what branch did you apply this to? I pulled from your net-next
> but don't see this patch...
The one I didn't push from my workstation yet, oops :-)
It should be there now, sorry about that.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-09-21 1:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-20 1:02 [net-next] udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected Andy Zhou
2014-09-20 2:06 ` David Miller
2014-09-20 23:14 ` Tom Herbert
2014-09-21 1:38 ` David Miller
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).