From a1e8168e49cef0cd4a79c21d665da958f6bf6a42 Mon Sep 17 00:00:00 2001 From: Yan Burman Date: Thu, 20 Dec 2012 03:36:08 +0000 Subject: [PATCH] --- yaml --- r: 348026 b: refs/heads/master c: af9b078e354614fad1e2e0cef04e216ae37cc389 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/vxlan.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3716c09215e4..e4b47edbb30b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3ae62af8e755ea68380fb5ce682e60079a4c388 +refs/heads/master: af9b078e354614fad1e2e0cef04e216ae37cc389 diff --git a/trunk/drivers/net/vxlan.c b/trunk/drivers/net/vxlan.c index 3b3fdf648ea7..40f2cc135a49 100644 --- a/trunk/drivers/net/vxlan.c +++ b/trunk/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. */