On 04/20/15 at 10:16am, Thomas Graf wrote:
> On 04/20/15 at 11:25am, Tuan Nguyen wrote:
> > Hi Ben,
> > 
> > I tried with newest openvswitch in github (
> > https://github.com/openvswitch/ovs) with OpenWrt version in trunk.
> > When kernel booting, it shows:
> >          openvswitch: exports duplicate symbol setup_udp_tunnel_sock (owned
> > by udp_tunnel)
> > 
> > Is it a issue ? I traced and saw 2 files below have export the same
> > function: setup_udp_tunnel_sock
> > 
> > openvswitch source: /datapath/linux/compat/udp_tunnel.c
> > kernel (3.18.11): /net/ipv4/udp_tunnel.c
> > 
> > How about I comment a export line in openvswitch source ?
> 
> This is a bug. We need to rename our compat function. I'll send
> a patch.

Please try this patch

Reported-by: Tuan Nguyen <[email protected]>
Signed-off-by: Thomas Graf <[email protected]>
---
 datapath/linux/compat/include/net/udp_tunnel.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datapath/linux/compat/include/net/udp_tunnel.h 
b/datapath/linux/compat/include/net/udp_tunnel.h
index 6c25ca5..6f9d458 100644
--- a/datapath/linux/compat/include/net/udp_tunnel.h
+++ b/datapath/linux/compat/include/net/udp_tunnel.h
@@ -65,6 +65,7 @@ struct udp_tunnel_sock_cfg {
 };
 
 /* Setup the given (UDP) sock to receive UDP encapsulated packets */
+#define setup_udp_tunnel_sock rpl_setup_udp_tunnel_sock
 void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
                           struct udp_tunnel_sock_cfg *sock_cfg);
 
-- 
2.3.5

>From 3e85b2d55fcc647b9daeb4dd96457b8d2e805ca2 Mon Sep 17 00:00:00 2001
Message-Id: 
<3e85b2d55fcc647b9daeb4dd96457b8d2e805ca2.1429518206.git.tg...@noironetworks.com>
From: Thomas Graf <[email protected]>
Date: Mon, 20 Apr 2015 10:20:37 +0200
Subject: [PATCH] datapath: Provide alternate name for setup_udp_tunnel_sock()

Reported-by: Tuan Nguyen <[email protected]>
Signed-off-by: Thomas Graf <[email protected]>
---
 datapath/linux/compat/include/net/udp_tunnel.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/datapath/linux/compat/include/net/udp_tunnel.h 
b/datapath/linux/compat/include/net/udp_tunnel.h
index 6c25ca5..6f9d458 100644
--- a/datapath/linux/compat/include/net/udp_tunnel.h
+++ b/datapath/linux/compat/include/net/udp_tunnel.h
@@ -65,6 +65,7 @@ struct udp_tunnel_sock_cfg {
 };
 
 /* Setup the given (UDP) sock to receive UDP encapsulated packets */
+#define setup_udp_tunnel_sock rpl_setup_udp_tunnel_sock
 void setup_udp_tunnel_sock(struct net *net, struct socket *sock,
                           struct udp_tunnel_sock_cfg *sock_cfg);
 
-- 
2.3.5

_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev

Reply via email to