Message ID | 1412469884-27308-1-git-send-email-maheshb@google.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
After 8 revisions, I want to see some ACKs before applying these two changes :) -- 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
On 06/10/14 06:58, David Miller wrote: > > After 8 revisions, I want to see some ACKs before applying these > two changes :) > -- > 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 > On my side all comments have been taken care of, I don't know if it's appropriate to also ack the patches as I've already given a reviewed-by to the first and my sob to the second :-) Nik -- 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
From: Mahesh Bandewar <maheshb@google.com> Date: Sat, 4 Oct 2014 17:44:44 -0700 > 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> Applied. -- 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 57917e63b4e6..5b022da9cad2 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 &&