From patchwork Tue Jul 15 10:15:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veaceslav Falico X-Patchwork-Id: 369947 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 513B8140110 for ; Tue, 15 Jul 2014 20:20:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758230AbaGOKUJ (ORCPT ); Tue, 15 Jul 2014 06:20:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30198 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758107AbaGOKUH (ORCPT ); Tue, 15 Jul 2014 06:20:07 -0400 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 (8.14.4/8.14.4) with ESMTP id s6FAK5tT004865 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 15 Jul 2014 06:20:05 -0400 Received: from darkmag.usersys.redhat.com (dhcp-27-102.brq.redhat.com [10.34.27.102]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6FAK0gQ030616; Tue, 15 Jul 2014 06:20:04 -0400 From: Veaceslav Falico To: netdev@vger.kernel.org Cc: Veaceslav Falico , Jay Vosburgh , Andy Gospodarek Subject: [PATCH net-next 2/2] bonding: make hard-coded defines configurable at build Date: Tue, 15 Jul 2014 12:15:41 +0200 Message-Id: <1405419341-31510-3-git-send-email-vfalico@gmail.com> In-Reply-To: <1405419341-31510-1-git-send-email-vfalico@gmail.com> References: <1405419341-31510-1-git-send-email-vfalico@gmail.com> 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 CC: Jay Vosburgh CC: Andy Gospodarek Signed-off-by: Veaceslav Falico --- drivers/net/bonding/Kconfig | 16 ++++++++++++++++ drivers/net/bonding/bonding.h | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/Kconfig b/drivers/net/bonding/Kconfig index 7b1a0fa..28fb3af 100644 --- a/drivers/net/bonding/Kconfig +++ b/drivers/net/bonding/Kconfig @@ -15,3 +15,19 @@ menuconfig BONDING To compile this driver as a module, choose M here: the module will be called bonding. + +if BONDING + +config BOND_MAX_VLAN_ENCAP + int "Maximum number of stacked vlans on top of bonding" + default "2" + +config BOND_MAX_ARP_TARGETS + int "Maximum number of ip targets arp monitor supports" + default "16" + +config BOND_DEFAULT_MIIMON + int "Default miimon monitoring frequency in milliseconds" + default "100" + +endif diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 0b4d9cd..119ce68 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -36,10 +36,10 @@ #define bond_version DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n" -#define BOND_MAX_VLAN_ENCAP 2 -#define BOND_MAX_ARP_TARGETS 16 +#define BOND_MAX_VLAN_ENCAP CONFIG_BOND_MAX_VLAN_ENCAP +#define BOND_MAX_ARP_TARGETS CONFIG_BOND_MAX_ARP_TARGETS -#define BOND_DEFAULT_MIIMON 100 +#define BOND_DEFAULT_MIIMON CONFIG_BOND_DEFAULT_MIIMON /* * Less bad way to call ioctl from within the kernel; this needs to be