Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 14:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/vxlan: Use the underlying device index when joining/leaving multicast groups

Browse Source 
The socket calls from vxlan to join/leave multicast group aren't
using the index of the underlying device, as a result the stack uses
the first interface that is up. This results in vxlan being non functional
over a device which isn't the 1st to be up.
Fix this by providing the iflink field to the vxlan instance
to the multicast calls.

Signed-off-by: Yan Burman <yanb@mellanox.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yan Burman 2012-12-20 03:36:08 +00:00 committed by David S. Miller
parent c3ae62af8e
commit af9b078e35
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/vxlan.c
View File

@ -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 vxlan_net *vn = net_generic(dev_net(dev), vxlan_net_id);
struct sock *sk = vn->sock->sk; struct sock *sk = vn->sock->sk;
struct ip_mreqn mreq = { struct ip_mreqn mreq = {
.imr_multiaddr.s_addr = vxlan->gaddr, .imr_multiaddr.s_addr = vxlan->gaddr,
.imr_ifindex = vxlan->link,
}; };
int err; int err;
@ -532,7 +533,8 @@ static int vxlan_leave_group(struct net_device *dev)
int err = 0; int err = 0;
struct sock *sk = vn->sock->sk; struct sock *sk = vn->sock->sk;
struct ip_mreqn mreq = { 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. */ /* Only leave group when last vxlan is done. */