Эх сурвалжийг харах

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>
Mahesh Bandewar 11 жил өмнө
parent
commit
d7021325a2

+ 1 - 2
drivers/net/bonding/bond_procfs.c

@@ -73,8 +73,7 @@ static void bond_info_show_master(struct seq_file *seq)
 
 
 	seq_printf(seq, "\n");
 	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,
 		optval = bond_opt_get_val(BOND_OPT_XMIT_HASH,
 					  bond->params.xmit_policy);
 					  bond->params.xmit_policy);
 		seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",
 		seq_printf(seq, "Transmit Hash Policy: %s (%d)\n",

+ 7 - 0
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);
 	       (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)
 static inline bool bond_mode_uses_arp(int mode)
 {
 {
 	return mode != BOND_MODE_8023AD && mode != BOND_MODE_TLB &&
 	return mode != BOND_MODE_8023AD && mode != BOND_MODE_TLB &&