These changes are a raw update to a vanilla kernel 4.1.10, with the

[kvmfornfv.git] / kernel / drivers / net / vxlan.c

diff --git a/kernel/drivers/net/vxlan.c b/kernel/drivers/net/vxlan.c
index 21a0fbf..0085b8d 100644 (file)
--- a/kernel/drivers/net/vxlan.c
+++ b/kernel/drivers/net/vxlan.c
@@ -2212,6 +2212,8 @@ static int vxlan_open(struct net_device *dev)
 
        if (vxlan_addr_multicast(&vxlan->default_dst.remote_ip)) {
                ret = vxlan_igmp_join(vxlan);
+               if (ret == -EADDRINUSE)
+                       ret = 0;
                if (ret) {
                        vxlan_sock_release(vs);
                        return ret;