From patchwork Wed Jul 16 22:43:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 370897 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 E34AA1400AF for ; Thu, 17 Jul 2014 08:44:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbaGPWos (ORCPT ); Wed, 16 Jul 2014 18:44:48 -0400 Received: from mail-la0-f49.google.com ([209.85.215.49]:46468 "EHLO mail-la0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752400AbaGPWoq (ORCPT ); Wed, 16 Jul 2014 18:44:46 -0400 Received: by mail-la0-f49.google.com with SMTP id hz20so1130552lab.36 for ; Wed, 16 Jul 2014 15:44:45 -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=g5XMDudsgJ6y6vQ4qcDld/JgbFHsyfRbbTkB5aGze68=; b=iEplpdPoFWs40p3HCN4m/kiVyAZ43qLL+E0Rt+tH6F7s6H49Sl4KclbVThv/dO4ZA7 02sI05FWZf2julcg/hGRaNZWz32d30sbiEzTqLpkN6adSFDhlzM5V11suUiKmMyanGb2 KozfXXDJZ9qHJutj5T62RrBhAdd8KjB8C3iyvGl83HysuDT5kRHZ++u/1yyC2+RKlMar KkPiSkZDm2muTMP25x8fRL6ehigPFabgwOKJzSJm2xI/Njd+erkYYpr68gcZP7avDKre 1JW8RYO7yYN8D/iqcAnrBxDQ27GSvv6oY9DJ4GLFu5XBUrzUG7g7a490cPrjzbhpjmlp DnAg== X-Gm-Message-State: ALoCoQkN43Y09ReHetE63yUH/OlCoyY6t6OZe6uSoXtuj9jdW6KaDGjakm5kyfkJIoI4mDRcKdJv X-Received: by 10.152.27.194 with SMTP id v2mr16522255lag.57.1405550685318; Wed, 16 Jul 2014 15:44:45 -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 jf10sm14720lac.26.2014.07.16.15.44.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 15:44:44 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Patrick McHardy Subject: [PATCH v8] net: vlan - set name assign type Date: Thu, 17 Jul 2014 00:43:11 +0200 Message-Id: <1405550594-11786-4-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405550594-11786-1-git-send-email-teg@jklm.no> References: <1405550594-11786-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 --- This patch goes on top of net-next. 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;