diff options
| author | Mahesh Bandewar <maheshb@google.com> | 2014-10-04 17:44:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-06 17:13:07 -0400 |
| commit | d7021325a2ea5aaf4458097341c988f9dc93491f (patch) | |
| tree | 91b4f16185ebc7ec1c76aebeebde0ea6244f45e7 /drivers/net/bonding | |
| parent | 4e62ccd901062c532673f4fda16c484de2c3c8fc (diff) | |
bonding: display xmit_hash_policy for non-dynamic-tlb mode
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/<bonding-interface).
Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_procfs.c | 3 | ||||
| -rw-r--r-- | 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 bb09d0442aa..a3948f8d1e5 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 57917e63b4e..5b022da9cad 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -274,6 +274,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 && |