diff options
-rw-r--r-- | drivers/net/bonding/bond_main.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 6141667c5fb7..17b4dd94da90 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -113,9 +113,11 @@ MODULE_PARM_DESC(max_bonds, "Max number of bonded devices"); | |||
113 | module_param(tx_queues, int, 0); | 113 | module_param(tx_queues, int, 0); |
114 | MODULE_PARM_DESC(tx_queues, "Max number of transmit queues (default = 16)"); | 114 | MODULE_PARM_DESC(tx_queues, "Max number of transmit queues (default = 16)"); |
115 | module_param_named(num_grat_arp, num_peer_notif, int, 0644); | 115 | module_param_named(num_grat_arp, num_peer_notif, int, 0644); |
116 | MODULE_PARM_DESC(num_grat_arp, "Number of peer notifications to send on failover event (alias of num_unsol_na)"); | 116 | MODULE_PARM_DESC(num_grat_arp, "Number of peer notifications to send on " |
117 | "failover event (alias of num_unsol_na)"); | ||
117 | module_param_named(num_unsol_na, num_peer_notif, int, 0644); | 118 | module_param_named(num_unsol_na, num_peer_notif, int, 0644); |
118 | MODULE_PARM_DESC(num_unsol_na, "Number of peer notifications to send on failover event (alias of num_grat_arp)"); | 119 | MODULE_PARM_DESC(num_unsol_na, "Number of peer notifications to send on " |
120 | "failover event (alias of num_grat_arp)"); | ||
119 | module_param(miimon, int, 0); | 121 | module_param(miimon, int, 0); |
120 | MODULE_PARM_DESC(miimon, "Link check interval in milliseconds"); | 122 | MODULE_PARM_DESC(miimon, "Link check interval in milliseconds"); |
121 | module_param(updelay, int, 0); | 123 | module_param(updelay, int, 0); |
@@ -127,7 +129,7 @@ module_param(use_carrier, int, 0); | |||
127 | MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; " | 129 | MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; " |
128 | "0 for off, 1 for on (default)"); | 130 | "0 for off, 1 for on (default)"); |
129 | module_param(mode, charp, 0); | 131 | module_param(mode, charp, 0); |
130 | MODULE_PARM_DESC(mode, "Mode of operation : 0 for balance-rr, " | 132 | MODULE_PARM_DESC(mode, "Mode of operation; 0 for balance-rr, " |
131 | "1 for active-backup, 2 for balance-xor, " | 133 | "1 for active-backup, 2 for balance-xor, " |
132 | "3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, " | 134 | "3 for broadcast, 4 for 802.3ad, 5 for balance-tlb, " |
133 | "6 for balance-alb"); | 135 | "6 for balance-alb"); |
@@ -142,27 +144,35 @@ MODULE_PARM_DESC(primary_reselect, "Reselect primary slave " | |||
142 | "2 for only on active slave " | 144 | "2 for only on active slave " |
143 | "failure"); | 145 | "failure"); |
144 | module_param(lacp_rate, charp, 0); | 146 | module_param(lacp_rate, charp, 0); |
145 | MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner " | 147 | MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner; " |
146 | "(slow/fast)"); | 148 | "0 for slow, 1 for fast"); |
147 | module_param(ad_select, charp, 0); | 149 | module_param(ad_select, charp, 0); |
148 | MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic: stable (0, default), bandwidth (1), count (2)"); | 150 | MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic; " |
151 | "0 for stable (default), 1 for bandwidth, " | ||
152 | "2 for count"); | ||
149 | module_param(xmit_hash_policy, charp, 0); | 153 | module_param(xmit_hash_policy, charp, 0); |
150 | MODULE_PARM_DESC(xmit_hash_policy, "XOR hashing method: 0 for layer 2 (default)" | 154 | MODULE_PARM_DESC(xmit_hash_policy, "balance-xor and 802.3ad hashing method; " |
151 | ", 1 for layer 3+4"); | 155 | "0 for layer 2 (default), 1 for layer 3+4, " |
156 | "2 for layer 2+3"); | ||
152 | module_param(arp_interval, int, 0); | 157 | module_param(arp_interval, int, 0); |
153 | MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds"); | 158 | MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds"); |
154 | module_param_array(arp_ip_target, charp, NULL, 0); | 159 | module_param_array(arp_ip_target, charp, NULL, 0); |
155 | MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form"); | 160 | MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form"); |
156 | module_param(arp_validate, charp, 0); | 161 | module_param(arp_validate, charp, 0); |
157 | MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes: none (default), active, backup or all"); | 162 | MODULE_PARM_DESC(arp_validate, "validate src/dst of ARP probes; " |
163 | "0 for none (default), 1 for active, " | ||
164 | "2 for backup, 3 for all"); | ||
158 | module_param(fail_over_mac, charp, 0); | 165 | module_param(fail_over_mac, charp, 0); |
159 | MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to the same MAC. none (default), active or follow"); | 166 | MODULE_PARM_DESC(fail_over_mac, "For active-backup, do not set all slaves to " |
167 | "the same MAC; 0 for none (default), " | ||
168 | "1 for active, 2 for follow"); | ||
160 | module_param(all_slaves_active, int, 0); | 169 | module_param(all_slaves_active, int, 0); |
161 | MODULE_PARM_DESC(all_slaves_active, "Keep all frames received on an interface" | 170 | MODULE_PARM_DESC(all_slaves_active, "Keep all frames received on an interface" |
162 | "by setting active flag for all slaves. " | 171 | "by setting active flag for all slaves; " |
163 | "0 for never (default), 1 for always."); | 172 | "0 for never (default), 1 for always."); |
164 | module_param(resend_igmp, int, 0); | 173 | module_param(resend_igmp, int, 0); |
165 | MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on link failure"); | 174 | MODULE_PARM_DESC(resend_igmp, "Number of IGMP membership reports to send on " |
175 | "link failure"); | ||
166 | 176 | ||
167 | /*----------------------------- Global variables ----------------------------*/ | 177 | /*----------------------------- Global variables ----------------------------*/ |
168 | 178 | ||