From patchwork Thu Jul 17 08:06:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 371007 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 09E5F1400D6 for ; Thu, 17 Jul 2014 18:09:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755492AbaGQIHm (ORCPT ); Thu, 17 Jul 2014 04:07:42 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:42365 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755409AbaGQIGl (ORCPT ); Thu, 17 Jul 2014 04:06:41 -0400 Received: by mail-wi0-f174.google.com with SMTP id d1so7366414wiv.7 for ; Thu, 17 Jul 2014 01:06:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OFZLnMG0gdSzkLbwto/ZCefasN80qiiNeiP/ShQTyaU=; b=LAjAAQWKssP9cpQK+HeuOG0OdroVl6+m3j1zIZW2HQwzUsTNIO3CsaKFzKPrXRH3tR xFkNbN5S9uM0mbxrURCphnfHQeHvJw53i99D7s2j53qYnewy9YLXXavJiE/MCZYAvQ/1 3llfSEPBK+B3+IpmMPH3LkgTuzYQEs9FNyXT/3b6hsaNGu4bJwhw9+dzSJwLRIoAL3+G ZKBYYWSjn663Fm9j6xdrCAj+IGKNzRV9YMDZa8AF35zl/VGOI5iUw8GwxsH9yXJjzgYM TbSPqAvJCSyGynkh4491+WA3fPdCgzymsKFRNvyHe1sakS4HkKAXsPo9FdcNA2zf5W5g XMkQ== X-Gm-Message-State: ALoCoQkGUd7FUQK6gK3NDpodb8JJPtuckE0ZBNjKe8+cjZ51qsvynFOyWfJtncdsfwlXUKx9FxPl X-Received: by 10.194.177.168 with SMTP id cr8mr1337931wjc.134.1405584393689; Thu, 17 Jul 2014 01:06:33 -0700 (PDT) Received: from tomegun-x240.localdomain (cm-84.208.72.173.getinternet.no. [84.208.72.173]) by mx.google.com with ESMTPSA id ch5sm4297467wjb.18.2014.07.17.01.06.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 01:06:32 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Patrick McHardy Subject: [PATCH net-next v9 7/9] net: vlan - set name assign type Date: Thu, 17 Jul 2014 10:06:08 +0200 Message-Id: <1405584370-30054-8-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405584370-30054-1-git-send-email-teg@jklm.no> References: <1405584370-30054-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When deriving the name from the real device, inherit the assign type, otherwise set PREDICTABLE as the name will be uniquely determined by the VLANID. Signed-off-by: Tom Gundersen Cc: Patrick McHardy --- net/8021q/vlan.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index cba9c21..cf88f7b 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -212,6 +212,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) { struct net_device *new_dev; struct vlan_dev_priv *vlan; + unsigned char name_assign_type; struct net *net = dev_net(real_dev); struct vlan_net *vn = net_generic(net, vlan_net_id); char name[IFNAMSIZ]; @@ -229,18 +230,21 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) case VLAN_NAME_TYPE_RAW_PLUS_VID: /* name will look like: eth1.0005 */ snprintf(name, IFNAMSIZ, "%s.%.4i", real_dev->name, vlan_id); + name_assign_type = real_dev->name_assign_type; break; case VLAN_NAME_TYPE_PLUS_VID_NO_PAD: /* Put our vlan.VID in the name. * Name will look like: vlan5 */ snprintf(name, IFNAMSIZ, "vlan%i", vlan_id); + name_assign_type = NET_NAME_PREDICTABLE; break; case VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD: /* Put our vlan.VID in the name. * Name will look like: eth0.5 */ snprintf(name, IFNAMSIZ, "%s.%i", real_dev->name, vlan_id); + name_assign_type = real_dev->name_assign_type; break; case VLAN_NAME_TYPE_PLUS_VID: /* Put our vlan.VID in the name. @@ -248,10 +252,11 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) */ default: snprintf(name, IFNAMSIZ, "vlan%.4i", vlan_id); + name_assign_type = NET_NAME_PREDICTABLE; } new_dev = alloc_netdev(sizeof(struct vlan_dev_priv), name, - NET_NAME_UNKNOWN, vlan_setup); + name_assign_type, vlan_setup); if (new_dev == NULL) return -ENOBUFS;