| Message ID | 1411077194-20069-1-git-send-email-maheshb@google.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 09/18/2014 11:53 PM, Mahesh Bandewar wrote: > 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> > --- > v1 > Rebase > v2 > Added bond_mode_uses_xmit_hash() inline function > v3 > Rebase > v4 > Rebase > > drivers/net/bonding/bond_procfs.c | 3 +-- > drivers/net/bonding/bonding.h | 7 +++++++ > 2 files changed, 8 insertions(+), 2 deletions(-) > Reviewed-by: Nikolay Aleksandrov <nikolay@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 6140bf0264a4..98dc0d7ad731 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -271,6 +271,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 &&
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> --- v1 Rebase v2 Added bond_mode_uses_xmit_hash() inline function v3 Rebase v4 Rebase drivers/net/bonding/bond_procfs.c | 3 +-- drivers/net/bonding/bonding.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-)