datapath: Use alternate name for udp_sock_create() backport

Account for kernels which provide udp_sock_create() in an
insufficient version.

Avoids the following error when inserting openvswitch.ko on
respective kernels:

openvswitch: exports duplicate symbol udp_sock_create (owned by udp_tunnel)

Fixes: eb6eebd28 ("datapath: Account for "udp: Add udp_sock_create for UDP tunnels to open listener socket")
Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Cc: Jesse Gross <jesse@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/linux/compat/include/net/udp_tunnel.h b/datapath/linux/compat/include/net/udp_tunnel.h
index 7dadac1..6c25ca5 100644 (file)
--- a/datapath/linux/compat/include/net/udp_tunnel.h
+++ b/datapath/linux/compat/include/net/udp_tunnel.h
@@ -49,6 +49,7 @@ struct udp_port_cfg {
                                use_udp6_rx_checksums:1;
 };
 
+#define udp_sock_create rpl_udp_sock_create
 int udp_sock_create(struct net *net, struct udp_port_cfg *cfg,
                    struct socket **sockp);