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: 4521891 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2936F9F26C for ; Thu, 10 Jul 2014 08:22:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2FCBA2025B for ; Thu, 10 Jul 2014 08:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 63B5A2021B for ; Thu, 10 Jul 2014 08:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752334AbaGJITA (ORCPT ); Thu, 10 Jul 2014 04:19:00 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:50548 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752301AbaGJISz (ORCPT ); Thu, 10 Jul 2014 04:18:55 -0400 Received: by mail-lb0-f177.google.com with SMTP id u10so5664288lbd.8 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=NCK5r/ZiOn8JR7AYzVdY93K91UhnHM6wUYYMpkx0IC/hsi2w2cemyMwEFDEBDE+JXr HSeX4sQaY+3ZIFD9V1eMteK52DlHxUDIxLwX5A6vvwxoIr4krMPws8sHunVzfmMbFQQd /bjtiUdwdCB4y2AqEVwZDVvkLOeRBGFivci2oAnobfUZte960ILHvFyXljNTgG0XjMwi x4bmaU+VWVAKsoTolMEodMbOF0IFP7ipuhf6hQPvdPk5cjJoe5FPJCN6XXuPQpB3Mcfi QUAN7nru72iuPMDdIF2HTJV/r2DQ3GCsdREzFreB4PaE7OQNTFwCT0X51DJ46/t8SBWP uvXA== X-Gm-Message-State: ALoCoQnZ8JWdxjf7uif/HJToF+1RG994WCo6WmyK4gk1Fmy2me+rD/ke0l+fKMRtfitZ/+zPFZj1 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: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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__);