From patchwork Wed Mar 8 18:55:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 736683 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 3vdjcQ3xSgz9s9c for ; Thu, 9 Mar 2017 06:04:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bandewar-net.20150623.gappssmtp.com header.i=@bandewar-net.20150623.gappssmtp.com header.b="m6Ci1/HJ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754043AbdCHTEB (ORCPT ); Wed, 8 Mar 2017 14:04:01 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34700 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600AbdCHTEA (ORCPT ); Wed, 8 Mar 2017 14:04:00 -0500 Received: by mail-pf0-f195.google.com with SMTP id o126so4664004pfb.1 for ; Wed, 08 Mar 2017 11:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bandewar-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=eV4avKGsWRYnbcrnO9hJWVbpiRDsTG7P0/DJDP1V6wg=; b=m6Ci1/HJvwEh2Ht7A7lG9nSKtFHWqeYkKdCNm+/BiOV7DrvRmDx8rkkyEBSK9sySTp f0eAiVkXbfDqM8BEr8kq0J+d7xkTydVR1/9BN1kbpFf1NiYWrLzY9tRQfzjwLPhKkYQj h4ltxnTp7Yil+bLNnzeQKdy1B9XZoVUeHixUZk0yphkcRlDZBnP5MsdUdsvuosFcKTbk 7QKr3JgPfkCSo8N4nbsFIWqiX/lxqnJI+1j+qm4QkRCjTGQmdYiSgYpkrkk+DKj0Pzcj TaMLRddC1AVxoZ/XwF5hf6sE735l0Ru1wgQKYIzuIttSLpMI2CY+c/CpDfrlTPVmLGLM fWOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eV4avKGsWRYnbcrnO9hJWVbpiRDsTG7P0/DJDP1V6wg=; b=RmR3H4fwZSECYNvEua84J9dbWgDMJEliMyVpnElaslmivtH1vNcFnqsb9TyQiUBy4n /OIlciymyVLJfRgCjSuPnkEmPKGicX9FLiqDvnA6x289Z24yy8dntiU6ZOw+WoQeTDUx yMfl6vbrZY8ALaGPdd20bgWgs3BjthECReY6+NmZ7+1bnkm2NGPx9e8n616m/lInsY81 ooIrpSvRoW1u53hqliXeVbRGt9H5BAE2+1t4VszhqG4dYlI9KZPK9qtTFdZUzHRVnixq yb4T0L270RjnXagZtw2RZlc2GfCBtC+WuIrCveY9RU6Y6PWjOpsBxFrZRXiFnFjXhxMt 0Csw== X-Gm-Message-State: AMke39kTcAOd34yM5R2mv3nEZZgwNcup5ERmHV1smEaVoatoz8KIfSSmHESFvuDI9Um/pg== X-Received: by 10.84.192.107 with SMTP id b98mr11007052pld.160.1488999358844; Wed, 08 Mar 2017 10:55:58 -0800 (PST) Received: from localhost ([2620:0:1000:3012:6431:729d:e1ee:a6dc]) by smtp.gmail.com with ESMTPSA id z68sm7723277pgz.11.2017.03.08.10.55.58 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 08 Mar 2017 10:55:58 -0800 (PST) From: Mahesh Bandewar To: Jay Vosburgh , Andy Gospodarek , Veaceslav Falico , Nikolay Aleksandrov , David Miller , Eric Dumazet Cc: netdev , Mahesh Bandewar , Mahesh Bandewar Subject: [PATCH next 3/5] bonding: remove hardcoded value Date: Wed, 8 Mar 2017 10:55:56 -0800 Message-Id: <20170308185556.23069-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.12.0.246.ga2ecc84866-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mahesh Bandewar Eliminate hard-coded value and use the default that is set. Signed-off-by: Mahesh Bandewar --- drivers/net/bonding/bond_main.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 1329110ed85f..0f9f5ceae80e 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4254,6 +4254,7 @@ static int bond_check_params(struct bond_params *params) int arp_all_targets_value; u16 ad_actor_sys_prio = 0; u16 ad_user_port_key = 0; + int tlb_dynamic_lb = 0; /* Convert string parameters. */ if (mode) { @@ -4566,6 +4567,17 @@ static int bond_check_params(struct bond_params *params) } ad_user_port_key = valptr->value; + if (bond_mode == BOND_MODE_TLB) { + bond_opt_initstr(&newval, "default"); + valptr = bond_opt_parse(bond_opt_get(BOND_OPT_TLB_DYNAMIC_LB), + &newval); + if (!valptr) { + pr_err("Error: No tlb_dynamic_lb default value"); + return -EINVAL; + } + tlb_dynamic_lb = valptr->value; + } + if (lp_interval == 0) { pr_warn("Warning: ip_interval must be between 1 and %d, so it was reset to %d\n", INT_MAX, BOND_ALB_DEFAULT_LP_INTERVAL); @@ -4593,7 +4605,7 @@ static int bond_check_params(struct bond_params *params) params->min_links = min_links; params->lp_interval = lp_interval; params->packets_per_slave = packets_per_slave; - params->tlb_dynamic_lb = 1; /* Default value */ + params->tlb_dynamic_lb = tlb_dynamic_lb; params->ad_actor_sys_prio = ad_actor_sys_prio; eth_zero_addr(params->ad_actor_system); params->ad_user_port_key = ad_user_port_key;