1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 3b3fdf648ea7..656230e0d18c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -505,7 +505,8 @@ static int vxlan_join_group(struct net_device *dev)
         struct vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
         struct sock *sk = vn->sock->sk;
         struct ip_mreqn mreq = {
-                .imr_multiaddr.s_addr = vxlan->gaddr,
+                .imr_multiaddr.s_addr   = vxlan->gaddr,
+                .imr_ifindex            = vxlan->link,
         };
         int err;
 
@@ -532,7 +533,8 @@ static int vxlan_leave_group(struct net_device *dev)
         int err = 0;
         struct sock *sk = vn->sock->sk;
         struct ip_mreqn mreq = {
-                .imr_multiaddr.s_addr = vxlan->gaddr,
+                .imr_multiaddr.s_addr   = vxlan->gaddr,
+                .imr_ifindex            = vxlan->link,
         };
 
         /* Only leave group when last vxlan is done. */
@@ -1189,6 +1191,7 @@ static void vxlan_setup(struct net_device *dev)
 
         dev->hw_features |= NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM;
         dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
+        dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
 
         spin_lock_init(&vxlan->hash_lock);