diff options
-rw-r--r-- | drivers/net/bonding/bond_main.c | 13 | ||||
-rw-r--r-- | drivers/net/bonding/bonding.h | 5 |
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; | |||
557 | static char *xmit_hash_policy = NULL; | 557 | static char *xmit_hash_policy = NULL; |
558 | static int arp_interval = BOND_LINK_ARP_INTERV; | 558 | static int arp_interval = BOND_LINK_ARP_INTERV; |
559 | static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, }; | 559 | static char *arp_ip_target[BOND_MAX_ARP_TARGETS] = { NULL, }; |
560 | struct bond_params bonding_defaults; | ||
560 | 561 | ||
561 | module_param(max_bonds, int, 0); | 562 | module_param(max_bonds, int, 0); |
562 | MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); | 563 | MODULE_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"); | |||
593 | static const char *version = | 594 | static const char *version = |
594 | DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; | 595 | DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n"; |
595 | 596 | ||
596 | static LIST_HEAD(bond_dev_list); | 597 | LIST_HEAD(bond_dev_list); |
597 | 598 | ||
598 | #ifdef CONFIG_PROC_FS | 599 | #ifdef CONFIG_PROC_FS |
599 | static struct proc_dir_entry *bond_proc_dir = NULL; | 600 | static struct proc_dir_entry *bond_proc_dir = NULL; |
@@ -605,18 +606,14 @@ static int bond_mode = BOND_MODE_ROUNDROBIN; | |||
605 | static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2; | 606 | static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2; |
606 | static int lacp_fast = 0; | 607 | static int lacp_fast = 0; |
607 | 608 | ||
608 | struct bond_parm_tbl { | ||
609 | char *modename; | ||
610 | int mode; | ||
611 | }; | ||
612 | 609 | ||
613 | static struct bond_parm_tbl bond_lacp_tbl[] = { | 610 | struct 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 | ||
619 | static struct bond_parm_tbl bond_mode_tbl[] = { | 616 | struct 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 | ||
630 | static struct bond_parm_tbl xmit_hashtype_tbl[] = { | 627 | struct 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 | ||
155 | struct bond_parm_tbl { | ||
156 | char *modename; | ||
157 | int mode; | ||
158 | }; | ||
159 | |||
155 | struct vlan_entry { | 160 | struct vlan_entry { |
156 | struct list_head vlan_list; | 161 | struct list_head vlan_list; |
157 | u32 vlan_ip; | 162 | u32 vlan_ip; |