From patchwork Thu Jul 10 08:17:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368514 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 DA7371400A8 for ; Thu, 10 Jul 2014 18:23:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbaGJIX2 (ORCPT ); Thu, 10 Jul 2014 04:23:28 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:39630 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbaGJISw (ORCPT ); Thu, 10 Jul 2014 04:18:52 -0400 Received: by mail-la0-f41.google.com with SMTP id hz20so5848117lab.14 for ; Thu, 10 Jul 2014 01:18:51 -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=kCftIisk86nt180cWg7wbtk94P67BhmQcub4jjqsQgM=; b=Pwolcyoi0a0Xs2z25hVeNaICkU5aXza/yYCLCurjoz+v1sMY3avK+jdVS6CAO/tf1M QpIJ5MXFF+lHKsIEVIHhYyZ0gr16Mt14MsCsT29OlrchxM9JcswQsVFRzLebcsa1hUwc 7PBBGFkTd2Zfqhgi7WpDgbwFyZ6e1H1asyEv2URsJd3cK6YClOxJWWfqsi1BnSmrjAcc cWkzFAYkP8zHC9g2f8yR3Ydo/Fz1Xp7th6rbVfrhzc+vSH3Cp3L7VmTdaAQfjy3uJeZz bHLGWpzeTCVQOnk6McAjvUbjVIpv+iCYVmRJleqILae+J2LKsvZ3JPwyvjTAPa3zTWLX 3spA== X-Gm-Message-State: ALoCoQmBwRmiQ+j3bRtSiVxr5N/4p68LgWM3UWHABZd+8NXyhulz+F34WfkiY3AkCcJtymQhWI4f X-Received: by 10.112.202.167 with SMTP id kj7mr197034lbc.91.1404980331438; Thu, 10 Jul 2014 01:18:51 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:50 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Patrick McHardy Subject: [PATCH v7 24/33] net: vlan - set name assign type Date: Thu, 10 Jul 2014 10:17:29 +0200 Message-Id: <1404980258-30853-25-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-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..2fa26b6 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -215,6 +215,7 @@ static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) struct net *net = dev_net(real_dev); struct vlan_net *vn = net_generic(net, vlan_net_id); char name[IFNAMSIZ]; + unsigned char name_assign_type; int err; if (vlan_id >= VLAN_VID_MASK) @@ -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;