| Message ID | 1411174973-323-1-git-send-email-azhou@nicira.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
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. -- 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
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 -- 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
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. -- 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
==================================================================
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