aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c13
-rw-r--r--drivers/net/bonding/bonding.h5
2 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 3e9b47d9f21b..7139d6e6bdb3 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -557,6 +557,7 @@ static char *lacp_rate = NULL;
557static char *xmit_hash_policy = NULL; 557static char *xmit_hash_policy = NULL;
558static int arp_interval = BOND_LINK_ARP_INTERV; 558static int arp_interval = BOND_LINK_ARP_INTERV;
559static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, }; 559static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, };
560struct bond_params bonding_defaults;
560 561
561module_param(max_bonds, int, 0); 562module_param(max_bonds, int, 0);
562MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); 563MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
@@ -593,7 +594,7 @@ MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
593static const char *version = 594static const char *version =
594 DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; 595 DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
595 596
596static LIST_HEAD(bond_dev_list); 597LIST_HEAD(bond_dev_list);
597 598
598#ifdef CONFIG_PROC_FS 599#ifdef CONFIG_PROC_FS
599static struct proc_dir_entry *bond_proc_dir = NULL; 600static struct proc_dir_entry *bond_proc_dir = NULL;
@@ -605,18 +606,14 @@ static int bond_mode = BOND_MODE_ROUNDROBIN;
605static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2; 606static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
606static int lacp_fast = 0; 607static int lacp_fast = 0;
607 608
608struct bond_parm_tbl {
609 char *modename;
610 int mode;
611};
612 609
613static struct bond_parm_tbl bond_lacp_tbl[] = { 610struct bond_parm_tbl bond_lacp_tbl[] = {
614{ "slow", AD_LACP_SLOW}, 611{ "slow", AD_LACP_SLOW},
615{ "fast", AD_LACP_FAST}, 612{ "fast", AD_LACP_FAST},
616{ NULL, -1}, 613{ NULL, -1},
617}; 614};
618 615
619static struct bond_parm_tbl bond_mode_tbl[] = { 616struct bond_parm_tbl bond_mode_tbl[] = {
620{ "balance-rr", BOND_MODE_ROUNDROBIN}, 617{ "balance-rr", BOND_MODE_ROUNDROBIN},
621{ "active-backup", BOND_MODE_ACTIVEBACKUP}, 618{ "active-backup", BOND_MODE_ACTIVEBACKUP},
622{ "balance-xor", BOND_MODE_XOR}, 619{ "balance-xor", BOND_MODE_XOR},
@@ -627,7 +624,7 @@ static struct bond_parm_tbl bond_mode_tbl[] = {
627{ NULL, -1}, 624{ NULL, -1},
628}; 625};
629 626
630static struct bond_parm_tbl xmit_hashtype_tbl[] = { 627struct bond_parm_tbl xmit_hashtype_tbl[] = {
631{ "layer2", BOND_XMIT_POLICY_LAYER2}, 628{ "layer2", BOND_XMIT_POLICY_LAYER2},
632{ "layer3+4", BOND_XMIT_POLICY_LAYER34}, 629{ "layer3+4", BOND_XMIT_POLICY_LAYER34},
633{ NULL, -1}, 630{ NULL, -1},
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 1433e91db0f7..c8a873fe76c5 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -152,6 +152,11 @@ struct bond_params {
152 u32 arp_targets[BOND_MAX_ARP_TARGETS]; 152 u32 arp_targets[BOND_MAX_ARP_TARGETS];
153}; 153};
154 154
155struct bond_parm_tbl {
156 char *modename;
157 int mode;
158};
159
155struct vlan_entry { 160struct vlan_entry {
156 struct list_head vlan_list; 161 struct list_head vlan_list;
157 u32 vlan_ip; 162 u32 vlan_ip;