From patchwork Thu Jul 10 08:17:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368511 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 795B7140119 for ; Thu, 10 Jul 2014 18:22:22 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752336AbaGJITA (ORCPT ); Thu, 10 Jul 2014 04:19:00 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:38304 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752268AbaGJISy (ORCPT ); Thu, 10 Jul 2014 04:18:54 -0400 Received: by mail-lb0-f178.google.com with SMTP id 10so5781367lbg.37 for ; Thu, 10 Jul 2014 01:18:53 -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=IlaX5xL4gvCg6oOlu5zlpHxTUGY7rcWmjS33MoVak8M=; b=PCOhc4e1Ovl7QkRspmByDtupZRBUMFa8G03errRin24XB3QWAkPJL7exxRHuGntCpN mz9dv+kpVMSwezD984yeaR6GFMFS+5cwu2iWOla4gBs+mDb6QJ9ht5cIDlfL8VcWSHQ5 QlLxahUrTCJs4onqQPpaboEfzET+GEb1G035Ome4ibvrz7nS8ECxn2rLNMQbFsB7UA90 gnkNqJ0RtCKQJt6R9USvu/OxayLMgbe3xugizgi5urE7SdaDSdCtxnnv+H619yPDZZhU cVXJe18/jrVddZIzkVxcWT7Vmd9T5U4v4ZaBo7mww2Co5pa/D9xMCcosNgekjQJUOB8c yvpQ== X-Gm-Message-State: ALoCoQmeAgSYK4ypJB4De8gkLQf+Ttf78VfF6mbW1o5G89OGpfSYTtfV/lialY9slw7lLmfi57KX X-Received: by 10.112.150.65 with SMTP id ug1mr2816586lbb.46.1404980333630; Thu, 10 Jul 2014 01:18:53 -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.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:52 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen , Tom Tucker , Steve Wise , Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma@vger.kernel.org Subject: [PATCH v7 25/33] net: infiniband - steal ifname label Date: Thu, 10 Jul 2014 10:17:30 +0200 Message-Id: <1404980258-30853-26-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 Use the same assign type, as the name we are basing our new name on. Signed-off-by: Tom Gundersen Cc: Tom Tucker Cc: Steve Wise Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma@vger.kernel.org --- drivers/infiniband/hw/amso1100/c2_provider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c index 2d5cbf4..fc44460 100644 --- a/drivers/infiniband/hw/amso1100/c2_provider.c +++ b/drivers/infiniband/hw/amso1100/c2_provider.c @@ -734,7 +734,7 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev) /* change ethxxx to iwxxx */ strcpy(name, "iw"); strcat(name, &c2dev->netdev->name[3]); - netdev = alloc_netdev(0, name, NET_NAME_UNKNOWN, setup); + netdev = alloc_netdev(0, name, c2dev->netdev->name_assign_type, setup); if (!netdev) { printk(KERN_ERR PFX "%s - etherdev alloc failed", __func__);