diff options
| author | David S. Miller | 2015-08-28 06:45:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-08-28 06:45:31 +0200 |
| commit | 0d36938bb82a7775c21ce0a7429f08ba13d025b6 (patch) | |
| tree | f502caf5555591ee237e14e5fa96b2c005a85036 /drivers/net/vxlan.c | |
| parent | Merge branch 'iff_no_queue_fixups' (diff) | |
| parent | Merge tag 'powerpc-4.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| download | kernel-qcow2-linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.gz kernel-qcow2-linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.tar.xz kernel-qcow2-linux-0d36938bb82a7775c21ce0a7429f08ba13d025b6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 5b4cf66e632e..30e56cb58884 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -2256,6 +2256,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; |