From patchwork Tue Jan 12 11:57:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 566522 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 EAFB214032F for ; Tue, 12 Jan 2016 22:58:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761289AbcALL57 (ORCPT ); Tue, 12 Jan 2016 06:57:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52520 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752211AbcALL56 (ORCPT ); Tue, 12 Jan 2016 06:57:58 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 07717C0BF2D7; Tue, 12 Jan 2016 11:57:58 +0000 (UTC) Received: from belphegor.brq.redhat.com (dhcp-0-167.brq.redhat.com [10.34.0.167]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0CBvrhX019536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 12 Jan 2016 06:57:56 -0500 From: Lubomir Rintel To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Lubomir Rintel Subject: [PATCH 2/3] dummy: make device count build-time configurable Date: Tue, 12 Jan 2016 12:57:33 +0100 Message-Id: <1452599853-27399-1-git-send-email-lkundrak@v3.sk> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The devices can be created at run-time for quite some time already and the load-time device creation collides with attempts to create the device of the same name: # rmmod dummy # ip link add dummy0 type dummy RTNETLINK answers: File exists This is pretty much the same situation as was with the block loop devices which was solved by adding a build-time configuration that the distributions could use as they deem fit while keeping the default for compatibility. Let's do that here as well. Signed-off-by: Lubomir Rintel --- drivers/net/Kconfig | 15 +++++++++++++++ drivers/net/dummy.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 63535b4..f94af69 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -71,6 +71,21 @@ config DUMMY To compile this driver as a module, choose M here: the module will be called dummy. +config DUMMY_COUNT + int "Number of dummy devices to pre-create at init time" + depends on DUMMY + default 1 + help + Static number of dummy devices to be unconditionally pre-created + at init time. + + This default value can be overwritten on the kernel command + line or with module-parameter dummy.numdummies. + + The historic default is 1. If a mid-2007 version of iproute2 + is used (v2.6.23 or later), it can be set to 0, since needed + dummy devices can be dynamically allocated via rtnetlink. + config EQUALIZER tristate "EQL (serial line load balancing) support" ---help--- diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index 69fc840..e4506c9 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c @@ -41,7 +41,7 @@ #define DRV_NAME "dummy" #define DRV_VERSION "1.0" -static int numdummies = 1; +static int numdummies = CONFIG_DUMMY_COUNT; /* fake multicast ability */ static void set_multicast_list(struct net_device *dev)