aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorHolger Eitzenberger <holger@eitzenberger.org>2008-12-10 02:10:38 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-10 02:10:38 -0500
commite97fd7c6d51d8bf32ce981b853d987cfc6bdfb7f (patch)
tree3da54ca75fb45a24c1fef82b0d4fdd42de47d785 /drivers/net
parent325dcf7a907a43f8832b92ae1c672798b4e60ce2 (diff)
bonding: turn all bond_parm_tbls const
Turn all bond_parm_tbls const. Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bonding/bond_main.c10
-rw-r--r--drivers/net/bonding/bonding.h10
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 581fd1798372..a34c186b08bb 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -162,13 +162,13 @@ static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
162static int lacp_fast = 0; 162static int lacp_fast = 0;
163 163
164 164
165struct bond_parm_tbl bond_lacp_tbl[] = { 165const struct bond_parm_tbl bond_lacp_tbl[] = {
166{ "slow", AD_LACP_SLOW}, 166{ "slow", AD_LACP_SLOW},
167{ "fast", AD_LACP_FAST}, 167{ "fast", AD_LACP_FAST},
168{ NULL, -1}, 168{ NULL, -1},
169}; 169};
170 170
171struct bond_parm_tbl bond_mode_tbl[] = { 171const struct bond_parm_tbl bond_mode_tbl[] = {
172{ "balance-rr", BOND_MODE_ROUNDROBIN}, 172{ "balance-rr", BOND_MODE_ROUNDROBIN},
173{ "active-backup", BOND_MODE_ACTIVEBACKUP}, 173{ "active-backup", BOND_MODE_ACTIVEBACKUP},
174{ "balance-xor", BOND_MODE_XOR}, 174{ "balance-xor", BOND_MODE_XOR},
@@ -179,14 +179,14 @@ struct bond_parm_tbl bond_mode_tbl[] = {
179{ NULL, -1}, 179{ NULL, -1},
180}; 180};
181 181
182struct bond_parm_tbl xmit_hashtype_tbl[] = { 182const struct bond_parm_tbl xmit_hashtype_tbl[] = {
183{ "layer2", BOND_XMIT_POLICY_LAYER2}, 183{ "layer2", BOND_XMIT_POLICY_LAYER2},
184{ "layer3+4", BOND_XMIT_POLICY_LAYER34}, 184{ "layer3+4", BOND_XMIT_POLICY_LAYER34},
185{ "layer2+3", BOND_XMIT_POLICY_LAYER23}, 185{ "layer2+3", BOND_XMIT_POLICY_LAYER23},
186{ NULL, -1}, 186{ NULL, -1},
187}; 187};
188 188
189struct bond_parm_tbl arp_validate_tbl[] = { 189const struct bond_parm_tbl arp_validate_tbl[] = {
190{ "none", BOND_ARP_VALIDATE_NONE}, 190{ "none", BOND_ARP_VALIDATE_NONE},
191{ "active", BOND_ARP_VALIDATE_ACTIVE}, 191{ "active", BOND_ARP_VALIDATE_ACTIVE},
192{ "backup", BOND_ARP_VALIDATE_BACKUP}, 192{ "backup", BOND_ARP_VALIDATE_BACKUP},
@@ -194,7 +194,7 @@ struct bond_parm_tbl arp_validate_tbl[] = {
194{ NULL, -1}, 194{ NULL, -1},
195}; 195};
196 196
197struct bond_parm_tbl fail_over_mac_tbl[] = { 197const struct bond_parm_tbl fail_over_mac_tbl[] = {
198{ "none", BOND_FOM_NONE}, 198{ "none", BOND_FOM_NONE},
199{ "active", BOND_FOM_ACTIVE}, 199{ "active", BOND_FOM_ACTIVE},
200{ "follow", BOND_FOM_FOLLOW}, 200{ "follow", BOND_FOM_FOLLOW},
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 12384aefad23..31ae5b532e5d 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -345,11 +345,11 @@ void bond_unregister_arp(struct bonding *);
345 345
346/* exported from bond_main.c */ 346/* exported from bond_main.c */
347extern struct list_head bond_dev_list; 347extern struct list_head bond_dev_list;
348extern struct bond_parm_tbl bond_lacp_tbl[]; 348extern const struct bond_parm_tbl bond_lacp_tbl[];
349extern struct bond_parm_tbl bond_mode_tbl[]; 349extern const struct bond_parm_tbl bond_mode_tbl[];
350extern struct bond_parm_tbl xmit_hashtype_tbl[]; 350extern const struct bond_parm_tbl xmit_hashtype_tbl[];
351extern struct bond_parm_tbl arp_validate_tbl[]; 351extern const struct bond_parm_tbl arp_validate_tbl[];
352extern struct bond_parm_tbl fail_over_mac_tbl[]; 352extern const struct bond_parm_tbl fail_over_mac_tbl[];
353 353
354#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 354#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
355void bond_send_unsolicited_na(struct bonding *bond); 355void bond_send_unsolicited_na(struct bonding *bond);