]> git.baikalelectronics.ru Git - kernel.git/commit
udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected
authorAndy Zhou <azhou@nicira.com>
Sat, 20 Sep 2014 01:02:53 +0000 (18:02 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Sep 2014 02:05:28 +0000 (22:05 -0400)
commit2ca7379625579a27b921cc40b595b2b1855625e4
treeb51fb98b60ff90e73ac190e61401f319327b82e6
parent11f941fdcbf5a0011f144c3cd69204b46cd5788c
udp_tunnel: Only build ip6_udp_tunnel.c when IPV6 is selected

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: a7d3dd39a 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/Makefile