From patchwork Wed Apr 10 08:52:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atzm Watanabe X-Patchwork-Id: 235343 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 702A32C00C3 for ; Wed, 10 Apr 2013 18:52:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936782Ab3DJIwZ (ORCPT ); Wed, 10 Apr 2013 04:52:25 -0400 Received: from mail-da0-f48.google.com ([209.85.210.48]:33287 "EHLO mail-da0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936757Ab3DJIwT (ORCPT ); Wed, 10 Apr 2013 04:52:19 -0400 Received: by mail-da0-f48.google.com with SMTP id p8so120503dan.35 for ; Wed, 10 Apr 2013 01:52:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:message-id:from:to:cc:subject:user-agent :mime-version:content-type:x-gm-message-state; bh=K+XVQDHTgILxLp57CuohNUDYwWPXW3zmxHvKVm4Lv+s=; b=bq3oHhXCkpgk18OK3VGskLNcaO+ZlY/QcwOFipyK+tqsp4tFwmr6neFt4f/77hkb7e aNozLr9+6I0xYMsZZntVCSM3e1bQ1416b8VfS/HSIic9l0QE2PPQG5ogRnjkh2+3YJZj EWQ4tn535N5z+z0wvQqfcfuKULnvO1E4Ecp9xZBfQIvzH2AWN4iCkOt5bJDWVer2njSK Ir0DmwRagCM0F8GUpc01igsR85qpXPA5adHzm6YZp4ErNrLjoZoRp/9WpmkSwmTkmBYf 7LdmWbgPTeSJXsHflnu+HZGlGtUVMMPy4jNJ0wUpL2bl6OdmAAiHigmAr1nQ5TK7zmHZ Tj+g== X-Received: by 10.66.217.193 with SMTP id pa1mr2215519pac.140.1365583938573; Wed, 10 Apr 2013 01:52:18 -0700 (PDT) Received: from sayva.stratosphere.co.jp ([2001:240:2001:2901:33:59ff:fe84:a1ce]) by mx.google.com with ESMTPS id xl10sm50217225pac.15.2013.04.10.01.52.16 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 01:52:17 -0700 (PDT) Date: Wed, 10 Apr 2013 17:52:03 +0900 Message-ID: <87txnen4y4.wl%atzm@stratosphere.co.jp> From: Atzm Watanabe To: netdev@vger.kernel.org Cc: "David S. Miller" , Stephen Hemminger Subject: [PATCH] vxlan: Allow setting unicast address to the group address User-Agent: Wanderlust/2.14.1 (Bad Medicine-pre) Emacs/23.4 Mule/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") X-Gm-Message-State: ALoCoQlrNx6hZWwef9Itf695aH1R9pMhcT5hhTXL7YHhxzkWu948IBb0qa+keg+89GeCzOLbQ6Iv Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch allows setting unicast address to the VXLAN group address. It allows that VXLAN can be used as peer-to-peer tunnel without multicast. Signed-off-by: Atzm Watanabe --- drivers/net/vxlan.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 9a64715..9e105f9 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -106,7 +106,7 @@ struct vxlan_dev { struct hlist_node hlist; struct net_device *dev; __u32 vni; /* virtual network id */ - __be32 gaddr; /* multicast group */ + __be32 gaddr; /* group address */ __be32 saddr; /* source address */ unsigned int link; /* link to multicast over */ __u16 port_min; /* source port range */ @@ -1189,7 +1189,7 @@ static int vxlan_open(struct net_device *dev) struct vxlan_dev *vxlan = netdev_priv(dev); int err; - if (vxlan->gaddr) { + if (IN_MULTICAST(ntohl(vxlan->gaddr))) { err = vxlan_join_group(dev); if (err) return err; @@ -1223,7 +1223,7 @@ static int vxlan_stop(struct net_device *dev) { struct vxlan_dev *vxlan = netdev_priv(dev); - if (vxlan->gaddr) + if (IN_MULTICAST(ntohl(vxlan->gaddr))) vxlan_leave_group(dev); del_timer_sync(&vxlan->age_timer); @@ -1347,14 +1347,6 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[]) return -ERANGE; } - if (data[IFLA_VXLAN_GROUP]) { - __be32 gaddr = nla_get_be32(data[IFLA_VXLAN_GROUP]); - if (!IN_MULTICAST(ntohl(gaddr))) { - pr_debug("group address is not IPv4 multicast\n"); - return -EADDRNOTAVAIL; - } - } - if (data[IFLA_VXLAN_PORT_RANGE]) { const struct ifla_vxlan_port_range *p = nla_data(data[IFLA_VXLAN_PORT_RANGE]);