From patchwork Thu Dec 20 13:36:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Burman X-Patchwork-Id: 207664 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C3FF92C007E for ; Fri, 21 Dec 2012 00:36:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752066Ab2LTNgh (ORCPT ); Thu, 20 Dec 2012 08:36:37 -0500 Received: from eu1sys200aog112.obsmtp.com ([207.126.144.133]:35017 "HELO eu1sys200aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751744Ab2LTNgg (ORCPT ); Thu, 20 Dec 2012 08:36:36 -0500 Received: from mtlsws123.lab.mtl.com ([82.166.227.17]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKUNMUU6ZaSjIQA7xETiIz4uTsCHB1QKsu@postini.com; Thu, 20 Dec 2012 13:36:35 UTC Received: from r-vnc09.lab.mtl.com (r-vnc09.mtr.labs.mlnx [10.208.0.120]) by mtlsws123.lab.mtl.com (8.13.8/8.13.8) with ESMTP id qBKDaINr006325; Thu, 20 Dec 2012 15:36:18 +0200 From: Yan Burman To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, ogerlitz@mellanox.com, Yan Burman Subject: [PATCH net] net/vxlan: Use the underlying device index when joining/leaving multicast groups Date: Thu, 20 Dec 2012 15:36:08 +0200 Message-Id: <1356010568-21644-1-git-send-email-yanb@mellanox.com> X-Mailer: git-send-email 1.7.10.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Stephen Hemminger --- drivers/net/vxlan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 3b3fdf6..40f2cc1 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. */