From patchwork Thu Jul 10 08:17:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368525 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 2206E14009C for ; Thu, 10 Jul 2014 18:30:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752324AbaGJIaY (ORCPT ); Thu, 10 Jul 2014 04:30:24 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:60961 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752154AbaGJIS2 (ORCPT ); Thu, 10 Jul 2014 04:18:28 -0400 Received: by mail-la0-f50.google.com with SMTP id pv20so5908616lab.9 for ; Thu, 10 Jul 2014 01:18:27 -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=zYSetAcwlKZUG0k29XDkkwnEBV/xQRlgh2It38n9y2s=; b=YidhYCiT7ZaQvY5UTXHnSjT98YENSUHTlPlu+M2NnHzEdMnoQmhU7jHoSgKnrcme/o yXutlmyF96fLKGQ1onCOPt8BysCrToN4mh86i2K1mrUbGFEh70tEvbN/q6GBZwYAR8LZ V9ozvUZIyBo8ue3e3whUmTfzEcxkgePmnH4FF/OLYaZQnBMWCxofgTXEiodqOfwwoSXI o0ELZBQ6sJ6t69gGW+Pxf5QvZ3fwkv5mJxsbwR6UExviR+Q5BXJ0fXgYnJQgLkoB/vpN 8GZivvYwJhgJZrPU1glo4RevwmgdzHeWH5Y1qeNAKQkh8AotpFsVVNMHdlzLWt1ZiOle FXjw== X-Gm-Message-State: ALoCoQnt/iK1+EczkAa8MdJUQeui7zNYeZpALhDhXSkGLUK0mVd9cMRJ3RC94xSqgBu4VSbXlkD9 X-Received: by 10.112.202.167 with SMTP id kj7mr194126lbc.91.1404980307130; Thu, 10 Jul 2014 01:18:27 -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.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:26 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH v7 13/33] net: mrt - set name assign type Date: Thu, 10 Jul 2014 10:17:18 +0200 Message-Id: <1404980258-30853-14-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 We have one device per routing table, so the naming is predictable. Signed-off-by: Tom Gundersen Cc: Alexey Kuznetsov Cc: James Morris Cc: Hideaki YOSHIFUJI Cc: Patrick McHardy --- net/ipv4/ipmr.c | 2 +- net/ipv6/ip6mr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index c803458..a0658a2 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -500,7 +500,7 @@ static struct net_device *ipmr_reg_vif(struct net *net, struct mr_table *mrt) else sprintf(name, "pimreg%u", mrt->id); - dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, reg_vif_setup); + dev = alloc_netdev(0, name, NET_NAME_PREDICTABLE, reg_vif_setup); if (dev == NULL) return NULL; diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index f9a3fd3..cb25ff0 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -744,7 +744,7 @@ static struct net_device *ip6mr_reg_vif(struct net *net, struct mr6_table *mrt) else sprintf(name, "pim6reg%u", mrt->id); - dev = alloc_netdev(0, name, NET_NAME_UNKNOWN, reg_vif_setup); + dev = alloc_netdev(0, name, NET_NAME_PREDICTABLE, reg_vif_setup); if (dev == NULL) return NULL;