From patchwork Wed Mar 8 18:56:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 736682 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 3vdjcM0chKz9s9c for ; Thu, 9 Mar 2017 06:04:03 +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="Nlc7u54t"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754046AbdCHTEC (ORCPT ); Wed, 8 Mar 2017 14:04:02 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:35063 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753880AbdCHTEA (ORCPT ); Wed, 8 Mar 2017 14:04:00 -0500 Received: by mail-pg0-f65.google.com with SMTP id 187so4221268pgb.2 for ; Wed, 08 Mar 2017 11:03:38 -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=3qri+Xqt06pfnHJe32fdKR2LUpVm77P5rgexbFvVrIE=; b=Nlc7u54t/Fyr0IY/OC7vqRSt6yLEyZqaPjg8a/VcluG/cOHsqTyEz9Lq1pGv2nyUG9 heX1CPN2sBrpN+rjYidToVW7FOGA8iHKj1OXmBOi/cbSSSocR/mRfr6Di/dwtmGSK2jF HHySj6xd6if8lLlTnr9sgABYgD7wzt4HaFMrRuTLHYJJnSfxQwQR/Cu1kAnnLJCXjxRs 8s/9Grkugpz0wneLLkB73GRHXYCmW4N7+d24uiqyuJor+SGD/jt914elxmNdCEhTO4gz g34Utvr8uKzGjah92+LKvMQckmQV8B6blT8y0CTfzBCW7XDZVC+1raHdABrdWhYnP8xL YrbA== 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=3qri+Xqt06pfnHJe32fdKR2LUpVm77P5rgexbFvVrIE=; b=dpKE00qYGZlAJe0h9VC3E4ngOez3uWyd+jH5zn8nxno67ikH5avmWXOM4aItkcwjPB W5hGwBAFUJ58ojVNO/W4Yy0L1CFPILqOCm9o3pV5DPiRc1W88Fxd29yeCsvM/hs73sYx BTHLe/dW0HE23JjQtRdntps3bWOxwYImFgHyqG/Y1JhZLvbCIIfjvX9h/kuiCExLZTkF HuHrZKv4gLNBSFRu5d2pVEr/XWkbz8B+42sFrGLcsxesAiN50ehmkY29xmec4zYoiyiZ 8d71RdWchxLbZjc3SxVCgvpA9q1ZIHgqjtkfaea/xocHShY89dYNUZ2Gd1jyAMQJaCWc 4Iow== X-Gm-Message-State: AMke39mUuaGTVPdfxDBDNvSTMbEHdGq2ARYLLwLNx4DPzPFw7dwcRBbSEyinAFCn8Ul84Q== X-Received: by 10.99.160.17 with SMTP id r17mr8615775pge.39.1488999364118; Wed, 08 Mar 2017 10:56:04 -0800 (PST) Received: from localhost ([2620:0:1000:3012:6431:729d:e1ee:a6dc]) by smtp.gmail.com with ESMTPSA id z4sm7671587pge.49.2017.03.08.10.56.03 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 08 Mar 2017 10:56:03 -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 5/5] bonding: reduce scope of some global variables Date: Wed, 8 Mar 2017 10:56:02 -0800 Message-Id: <20170308185602.23203-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 Many of the bond param variables are declared global while it's not really necessary for these variables to be global. So moving them to the location these are used. Signed-off-by: Mahesh Bandewar --- drivers/net/bonding/bond_main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0f9f5ceae80e..ba934020dfaa 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -201,12 +201,6 @@ atomic_t netpoll_block_tx = ATOMIC_INIT(0); unsigned int bond_net_id __read_mostly; -static __be32 arp_target[BOND_MAX_ARP_TARGETS]; -static int arp_ip_count; -static int bond_mode = BOND_MODE_ROUNDROBIN; -static int xmit_hashtype = BOND_XMIT_POLICY_LAYER2; -static int lacp_fast; - /*-------------------------- Forward declarations ---------------------------*/ static int bond_init(struct net_device *bond_dev); @@ -4254,6 +4248,11 @@ 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; + __be32 arp_target[BOND_MAX_ARP_TARGETS]; + int arp_ip_count; + int bond_mode = BOND_MODE_ROUNDROBIN; + int xmit_hashtype = BOND_XMIT_POLICY_LAYER2; + int lacp_fast = 0; int tlb_dynamic_lb = 0; /* Convert string parameters. */