From patchwork Thu Jul 17 08:06:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 371009 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 22FB61400E6 for ; Thu, 17 Jul 2014 18:10:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755225AbaGQIJf (ORCPT ); Thu, 17 Jul 2014 04:09:35 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:46916 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754743AbaGQIGe (ORCPT ); Thu, 17 Jul 2014 04:06:34 -0400 Received: by mail-we0-f170.google.com with SMTP id w62so2007332wes.1 for ; Thu, 17 Jul 2014 01:06:33 -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=tk5HeYkYnoCxqN98yj1N0uz7BHsMylRMOjwjvwD2jtg=; b=PhG7CTt1Jx0rrW5g4yM2oLT9/tCSAtUi7a9LuARw5sf9G5B7mQZrOqh192UE9TWKgG F+O4enMNA3t4Wtn3sI2a/iV2ROL/rpb5Dl9GEYJsmHT6kmOdHnORfjwNo/RCCv+90mSB FHxUcaIsWnaTmRdMupXHx2es5yVMkrPUNOHbl+v6lQ5jFxzS2JYAcB/aFn+ibgRQt3T2 GoS0e4QztxeOSxHMq+dA/sXrOuj/eJv2Obrn5gxfnsBVY9a5GxGIldQY0g1kD6Xxx79R C0dXDMi2xZYeHFnG4HmjekmCAlWi+geORWX7BkqNiEihahmDfRMmlzjSj+vlfhtXc4ZC J9JA== X-Gm-Message-State: ALoCoQkgfu0rNRT7gVoqjTRaA4UgvDcD+r3xU/31QXny2gFZZb+FbgThao50AOlAxlofgcS6TJer X-Received: by 10.180.20.206 with SMTP id p14mr20078509wie.26.1405584390206; Thu, 17 Jul 2014 01:06:30 -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 ch5sm4297467wjb.18.2014.07.17.01.06.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Jul 2014 01:06:29 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen , Jay Vosburgh , Veaceslav Falico , Andy Gospodarek Subject: [PATCH net-next v9 5/9] net: bond - make bond_create take name_assign_type Date: Thu, 17 Jul 2014 10:06:06 +0200 Message-Id: <1405584370-30054-6-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405584370-30054-1-git-send-email-teg@jklm.no> References: <1405584370-30054-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Tom Gundersen Cc: Jay Vosburgh Cc: Veaceslav Falico Cc: Andy Gospodarek --- drivers/net/bonding/bond_main.c | 7 ++++--- drivers/net/bonding/bond_sysfs.c | 2 +- drivers/net/bonding/bonding.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index d643807..1769745 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4421,7 +4421,7 @@ unsigned int bond_get_num_tx_queues(void) * Caller must NOT hold rtnl_lock; we need to release it here before we * set up our sysfs entries. */ -int bond_create(struct net *net, const char *name) +int bond_create(struct net *net, const char *name, unsigned char name_assign_type) { struct net_device *bond_dev; int res; @@ -4429,7 +4429,8 @@ int bond_create(struct net *net, const char *name) rtnl_lock(); bond_dev = alloc_netdev_mq(sizeof(struct bonding), - name ? name : "bond%d", NET_NAME_UNKNOWN, + name ? name : "bond%d", + name ? name_assign_type : NET_NAME_ENUM, bond_setup, tx_queues); if (!bond_dev) { pr_err("%s: eek! can't alloc netdev!\n", name); @@ -4509,7 +4510,7 @@ static int __init bonding_init(void) bond_create_debugfs(); for (i = 0; i < max_bonds; i++) { - res = bond_create(&init_net, NULL); + res = bond_create(&init_net, NULL, NET_NAME_UNKNOWN); if (res) goto err; } diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 98db8ed..7ac498c 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -111,7 +111,7 @@ static ssize_t bonding_store_bonds(struct class *cls, if (command[0] == '+') { pr_info("%s is being created...\n", ifname); - rv = bond_create(bn->net, ifname); + rv = bond_create(bn->net, ifname, NET_NAME_USER); if (rv) { if (rv == -EEXIST) pr_info("%s already exists\n", ifname); diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index b2e548e..95b5e70 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -496,7 +496,7 @@ struct bond_net { int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); void bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); -int bond_create(struct net *net, const char *name); +int bond_create(struct net *net, const char *name, unsigned char name_assign_type); int bond_create_sysfs(struct bond_net *net); void bond_destroy_sysfs(struct bond_net *net); void bond_prepare_sysfs_group(struct bonding *bond);