From patchwork Thu Sep 11 04:16:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?TWFoZXNoIEJhbmRld2FyICjgpK7gpLngpYfgpLYg4KSs4KSC4KSh4KWH4KS14KS+4KSwKQ==?= X-Patchwork-Id: 388042 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 B76EC14011D for ; Thu, 11 Sep 2014 14:16:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751010AbaIKEQa (ORCPT ); Thu, 11 Sep 2014 00:16:30 -0400 Received: from mail-yh0-f73.google.com ([209.85.213.73]:59380 "EHLO mail-yh0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750753AbaIKEQ3 (ORCPT ); Thu, 11 Sep 2014 00:16:29 -0400 Received: by mail-yh0-f73.google.com with SMTP id a41so542824yho.0 for ; Wed, 10 Sep 2014 21:16:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=J6z7pjhsi31rRI4zA6PQN1buSvx0TanZuYEWKU47OlY=; b=eyyMwFaHVh6LfJMi6miB8ZWHc/C0NN0xMbNhgWV8cnTetDyklUauQkjr7nIGoPvZcR ehxXu09mt/EnCEkpOdOs8euE7ZgMO30277GVdP3xinRlmIwkp8h7ObxHeQsQSWAJKr+d DN5nPvDUgkuYO8px/taKVuetXS+bqmxWyJJJe5vHVtTUmShYEV7xWJJDLN7YXk6s0orj 4ktNELd8tBPnqgvmlkAYlyozzqMHEPxQ7uq6TcuexRdb7q1ZoaTflSEqJe5j1gH8fi5O sSQ8HSLMdXbw9b9sVNKJW4fygQlGf/4KRslc0rKHNWWOyrAgE3E79IoAJJt/dlfh7MG3 028g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=J6z7pjhsi31rRI4zA6PQN1buSvx0TanZuYEWKU47OlY=; b=SqBj9+ROY2ojLcgBB4S4vVjVy+SBEBcWtTQuZHMEuAEHQNmyGC8QzY3zJ+5WCuOrtK DPOa/yS7yT5IARUpWMoqf74ELQP1xecaFkvglgzg+fc0AqFGU2HYip1Gcnzp6yZbMQgN 9NOL2PPSya1KIdmO49fsRPtc1sVkVpHcSn32NJwuZV1jTYwXr/n1+AMWBDSC9tCILsUY jxN3iJg3gCNVIphe561eY4lwy4ZwDyEitImaKSN40zxdamYmOTHJaeKf7nDbrAv/oLdy ay9IBR3PhxqMNMHAG0sAkmnSkr1fE/ZxGZ6WDGRsuhKdysrwbaOmFNW+RqLWH8lMXqL6 5wXA== X-Gm-Message-State: ALoCoQkX27vWoAUePX529gv6rmRSpfH0Q9HkoqjwL7ffMpElrDYu+QEI1t/d8IIAOu0zsnnzGafv X-Received: by 10.224.147.77 with SMTP id k13mr19342090qav.6.1410408988313; Wed, 10 Sep 2014 21:16:28 -0700 (PDT) Received: from corpmail-nozzle1-1.hot.corp.google.com ([100.108.1.104]) by gmr-mx.google.com with ESMTPS id n24si1516100yha.6.2014.09.10.21.16.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Sep 2014 21:16:28 -0700 (PDT) Received: from coldfire.mtv.corp.google.com ([172.17.131.114]) by corpmail-nozzle1-1.hot.corp.google.com with ESMTP id 7N5As7BM.1; Wed, 10 Sep 2014 21:16:28 -0700 Received: by coldfire.mtv.corp.google.com (Postfix, from userid 109155) id 62E7316015E; Wed, 10 Sep 2014 21:16:27 -0700 (PDT) From: Mahesh Bandewar To: Jay Vosburgh , Veaceslav Falico , Andy Gospodarek , David Miller Cc: netdev , Mahesh Bandewar , Eric Dumazet , Maciej Zenczykowski Subject: [PATCH net-next v3 1/2] bonding: display xmit_hash_policy for non-dynamic-tlb mode Date: Wed, 10 Sep 2014 21:16:25 -0700 Message-Id: <1410408985-5480-1-git-send-email-maheshb@google.com> X-Mailer: git-send-email 2.1.0.rc2.206.gedb03e5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It's a trivial fix to display xmit_hash_policy for this new TLB mode since it uses transmit-hash-poilicy as part of bonding-master info (/proc/net/bonding/ --- v1 Rebase v2 Added bond_mode_uses_xmit_hash() inline function v3 Rebase drivers/net/bonding/bond_procfs.c | 3 +-- drivers/net/bonding/bonding.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c index bb09d0442aa8..a3948f8d1e53 100644 --- a/drivers/net/bonding/bond_procfs.c +++ b/drivers/net/bonding/bond_procfs.c @@ -73,8 +73,7 @@ static void bond_info_show_master(struct seq_file *seq) seq_printf(seq, "\n"); - if (BOND_MODE(bond) == BOND_MODE_XOR || - BOND_MODE(bond) == BOND_MODE_8023AD) { + if (bond_mode_uses_xmit_hash(bond)) { optval = bond_opt_get_val(BOND_OPT_XMIT_HASH, bond->params.xmit_policy); seq_printf(seq, "Transmit Hash Policy: %s (%d)\n", diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 78c461abaa09..8375133dd347 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -270,6 +270,13 @@ static inline bool bond_is_nondyn_tlb(const struct bonding *bond) (bond->params.tlb_dynamic_lb == 0); } +static inline bool bond_mode_uses_xmit_hash(const struct bonding *bond) +{ + return (BOND_MODE(bond) == BOND_MODE_8023AD || + BOND_MODE(bond) == BOND_MODE_XOR || + bond_is_nondyn_tlb(bond)); +} + static inline bool bond_mode_uses_arp(int mode) { return mode != BOND_MODE_8023AD && mode != BOND_MODE_TLB &&