From patchwork Wed Feb 22 01:08:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 730851 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 3vSfQ55l23z9s7F for ; Wed, 22 Feb 2017 12:08:45 +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="GhmwgMwy"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753602AbdBVBIi (ORCPT ); Tue, 21 Feb 2017 20:08:38 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35005 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753531AbdBVBIb (ORCPT ); Tue, 21 Feb 2017 20:08:31 -0500 Received: by mail-pg0-f66.google.com with SMTP id 1so13642962pgz.2 for ; Tue, 21 Feb 2017 17:08:31 -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=V++Sr/SSJYjBRaCx4xLAc0aT46sZTn9trz5UiLGewtA=; b=GhmwgMwyx4d6UF0MpJXK9eIxEmItQyJwXbWTO/jEyCdBvMsnFxB8Ep5Iqc2aar17WF /gwmoOVuqgFvI2/2sXW7enJiCLf7PZN0u3GkwQ0h3mVhIq0cnsWOh11IbLt7Kju4n/4r /anrcexzNT4or3gGyBj0zGS2OurD7YIlRG3+VijFypz6WpzifbsCJWwVPkbOhX9nCwpC Ij9eaFvtXyGFySPcwuDS31Pi5v/1Ha/CLyepyTtEid9pd5t9QZVieW8u2mHdYKzwPbg3 ceRFQQyw+z1TYRr00sNKXcRi9wTXOFjDOIjy5eM6thKV4qK+qsv6prbgIHDj07E1K/Ih bb1g== 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=V++Sr/SSJYjBRaCx4xLAc0aT46sZTn9trz5UiLGewtA=; b=NqHIQUooXHeyr1ZPVMSsQJ5vwmkUwpC/5rv82YNnhoS70FiPmBgRKYAv/kWLCDubF/ 8m9zw5Eguri8xDTubg8/+m5CeEY7Q+3oox4ByjSE//ib/2XWfh1E9maUIlmoZo8DWico pApbKqK97lBRxSEJhysggXbMxhQeMOTHKGY4npsXFtgnOxMcluMGSX3nhcqoALzxIzox c+dhLnHLAjmaL+K/lxAqgIs2gBP6yTW/6dYB2+KaTraSHjRaqRKspO4o8bVImd49vcEz JJGLRHAtHJc8PK0V7m9K+DGsmj6Z8YXwXAWORPdUgEdxk7woGkqPXN+EhFAfbn8Zc5zo mYKQ== X-Gm-Message-State: AMke39l0FGyZYyEv83a0TTL9DffTrYx5BFW8Bgj5bn/sH/dAs5l0KEQQrMguretloXWP6Q== X-Received: by 10.98.103.195 with SMTP id t64mr36786029pfj.106.1487725711020; Tue, 21 Feb 2017 17:08:31 -0800 (PST) Received: from localhost ([2620:0:1000:3012:2026:4ec6:c66e:5600]) by smtp.gmail.com with ESMTPSA id p66sm43076142pfb.88.2017.02.21.17.08.30 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 21 Feb 2017 17:08:30 -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/4] bonding: remove hardcoded value Date: Tue, 21 Feb 2017 17:08:28 -0800 Message-Id: <20170222010828.9887-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-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 b7a344ffc1de..06ac1783bfdd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4253,6 +4253,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) { @@ -4565,6 +4566,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); @@ -4592,7 +4604,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;