aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bonding.h
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2013-11-05 07:51:41 -0500
committerDavid S. Miller <davem@davemloft.net>2013-11-07 15:10:21 -0500
commit73958329ea1fe0dc149b51e5d8703015f65a03e0 (patch)
tree149b655cfa917f9239f68dfe0ad3bb55d7ad8a90 /drivers/net/bonding/bonding.h
parent6fb392b1a63ae36c31f62bc3fc8630b49d602b62 (diff)
bonding: extend round-robin mode with packets_per_slave
This patch aims to extend round-robin mode with a new option called packets_per_slave which can have the following values and effects: 0 - choose a random slave 1 (default) - standard round-robin, 1 packet per slave >1 - round-robin when >1 packets have been transmitted per slave The allowed values are between 0 and 65535. This patch also fixes the comment style in bond_xmit_roundrobin(). Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Acked-by: Veaceslav Falico <vfalico@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bonding.h')
-rw-r--r--drivers/net/bonding/bonding.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 046a60535e04..77a07a12e77f 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -156,6 +156,7 @@ struct bond_params {
156 int all_slaves_active; 156 int all_slaves_active;
157 int resend_igmp; 157 int resend_igmp;
158 int lp_interval; 158 int lp_interval;
159 int packets_per_slave;
159}; 160};
160 161
161struct bond_parm_tbl { 162struct bond_parm_tbl {
@@ -222,7 +223,7 @@ struct bonding {
222 char proc_file_name[IFNAMSIZ]; 223 char proc_file_name[IFNAMSIZ];
223#endif /* CONFIG_PROC_FS */ 224#endif /* CONFIG_PROC_FS */
224 struct list_head bond_list; 225 struct list_head bond_list;
225 u16 rr_tx_counter; 226 u32 rr_tx_counter;
226 struct ad_bond_info ad_info; 227 struct ad_bond_info ad_info;
227 struct alb_bond_info alb_info; 228 struct alb_bond_info alb_info;
228 struct bond_params params; 229 struct bond_params params;