Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

bonding: turn all bond_parm_tbls const

Browse Source 
Turn all bond_parm_tbls const.

Signed-off-by: Holger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Holger Eitzenberger 2008-12-09 23:10:38 -08:00 committed by David S. Miller
parent 325dcf7a90
commit e97fd7c6d5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/bonding/bond_main.c
View File

@ -162,13 +162,13 @@ static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2;
static int lacp_fast = 0; static int lacp_fast = 0;
struct bond_parm_tbl bond_lacp_tbl[] = { const struct bond_parm_tbl bond_lacp_tbl[] = {
{ "slow", AD_LACP_SLOW}, { "slow", AD_LACP_SLOW},
{ "fast", AD_LACP_FAST}, { "fast", AD_LACP_FAST},
{ NULL, -1}, { NULL, -1},
}; };
struct bond_parm_tbl bond_mode_tbl[] = { const struct bond_parm_tbl bond_mode_tbl[] = {
{ "balance-rr", BOND_MODE_ROUNDROBIN}, { "balance-rr", BOND_MODE_ROUNDROBIN},
{ "active-backup", BOND_MODE_ACTIVEBACKUP}, { "active-backup", BOND_MODE_ACTIVEBACKUP},
{ "balance-xor", BOND_MODE_XOR}, { "balance-xor", BOND_MODE_XOR},
@ -179,14 +179,14 @@ struct bond_parm_tbl bond_mode_tbl[] = {
{ NULL, -1}, { NULL, -1},
}; };
struct bond_parm_tbl xmit_hashtype_tbl[] = { const struct bond_parm_tbl xmit_hashtype_tbl[] = {
{ "layer2", BOND_XMIT_POLICY_LAYER2}, { "layer2", BOND_XMIT_POLICY_LAYER2},
{ "layer3+4", BOND_XMIT_POLICY_LAYER34}, { "layer3+4", BOND_XMIT_POLICY_LAYER34},
{ "layer2+3", BOND_XMIT_POLICY_LAYER23}, { "layer2+3", BOND_XMIT_POLICY_LAYER23},
{ NULL, -1}, { NULL, -1},
}; };
struct bond_parm_tbl arp_validate_tbl[] = { const struct bond_parm_tbl arp_validate_tbl[] = {
{ "none", BOND_ARP_VALIDATE_NONE}, { "none", BOND_ARP_VALIDATE_NONE},
{ "active", BOND_ARP_VALIDATE_ACTIVE}, { "active", BOND_ARP_VALIDATE_ACTIVE},
{ "backup", BOND_ARP_VALIDATE_BACKUP}, { "backup", BOND_ARP_VALIDATE_BACKUP},
@ -194,7 +194,7 @@ struct bond_parm_tbl arp_validate_tbl[] = {
{ NULL, -1}, { NULL, -1},
}; };
struct bond_parm_tbl fail_over_mac_tbl[] = { const struct bond_parm_tbl fail_over_mac_tbl[] = {
{ "none", BOND_FOM_NONE}, { "none", BOND_FOM_NONE},
{ "active", BOND_FOM_ACTIVE}, { "active", BOND_FOM_ACTIVE},
{ "follow", BOND_FOM_FOLLOW}, { "follow", BOND_FOM_FOLLOW},

10
drivers/net/bonding/bonding.h
View File

@ -345,11 +345,11 @@ void bond_unregister_arp(struct bonding *);
/* exported from bond_main.c */ /* exported from bond_main.c */
extern struct list_head bond_dev_list; extern struct list_head bond_dev_list;
extern struct bond_parm_tbl bond_lacp_tbl[]; extern const struct bond_parm_tbl bond_lacp_tbl[];
extern struct bond_parm_tbl bond_mode_tbl[]; extern const struct bond_parm_tbl bond_mode_tbl[];
extern struct bond_parm_tbl xmit_hashtype_tbl[]; extern const struct bond_parm_tbl xmit_hashtype_tbl[];
extern struct bond_parm_tbl arp_validate_tbl[]; extern const struct bond_parm_tbl arp_validate_tbl[];
extern struct bond_parm_tbl fail_over_mac_tbl[]; extern const struct bond_parm_tbl fail_over_mac_tbl[];
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
void bond_send_unsolicited_na(struct bonding *bond); void bond_send_unsolicited_na(struct bonding *bond);