Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e97fd7c6 authored by Holger Eitzenberger's avatar Holger Eitzenberger Committed by David S. Miller
Browse files

bonding: turn all bond_parm_tbls const 



Turn all bond_parm_tbls const.

Signed-off-by: default avatarHolger Eitzenberger <holger@eitzenberger.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 325dcf7a

drivers/net/bonding/bond_main.c

+5 −5
Original line number Diff line number Diff line
@@ -162,13 +162,13 @@ static int xmit_hashtype= BOND_XMIT_POLICY_LAYER2; 
static int lacp_fast	= 0;





struct bond_parm_tbl bond_lacp_tbl[] = {

const struct bond_parm_tbl bond_lacp_tbl[] = {

{	"slow",		AD_LACP_SLOW},

{	"fast",		AD_LACP_FAST},

{	NULL,		-1},

};



struct bond_parm_tbl bond_mode_tbl[] = {

const struct bond_parm_tbl bond_mode_tbl[] = {

{	"balance-rr",		BOND_MODE_ROUNDROBIN},

{	"active-backup",	BOND_MODE_ACTIVEBACKUP},

{	"balance-xor",		BOND_MODE_XOR},
@@ -179,14 +179,14 @@ struct bond_parm_tbl bond_mode_tbl[] = { 
{	NULL,			-1},

};



struct bond_parm_tbl xmit_hashtype_tbl[] = {

const struct bond_parm_tbl xmit_hashtype_tbl[] = {

{	"layer2",		BOND_XMIT_POLICY_LAYER2},

{	"layer3+4",		BOND_XMIT_POLICY_LAYER34},

{	"layer2+3",		BOND_XMIT_POLICY_LAYER23},

{	NULL,			-1},

};



struct bond_parm_tbl arp_validate_tbl[] = {

const struct bond_parm_tbl arp_validate_tbl[] = {

{	"none",			BOND_ARP_VALIDATE_NONE},

{	"active",		BOND_ARP_VALIDATE_ACTIVE},

{	"backup",		BOND_ARP_VALIDATE_BACKUP},
@@ -194,7 +194,7 @@ struct bond_parm_tbl arp_validate_tbl[] = { 
{	NULL,			-1},

};



struct bond_parm_tbl fail_over_mac_tbl[] = {

const struct bond_parm_tbl fail_over_mac_tbl[] = {

{	"none",			BOND_FOM_NONE},

{	"active",		BOND_FOM_ACTIVE},

{	"follow",		BOND_FOM_FOLLOW},

drivers/net/bonding/bonding.h

+5 −5
Original line number Diff line number Diff line
@@ -345,11 +345,11 @@ void bond_unregister_arp(struct bonding *); 


/* exported from bond_main.c */

extern struct list_head bond_dev_list;

extern struct bond_parm_tbl bond_lacp_tbl[];

extern struct bond_parm_tbl bond_mode_tbl[];

extern struct bond_parm_tbl xmit_hashtype_tbl[];

extern struct bond_parm_tbl arp_validate_tbl[];

extern struct bond_parm_tbl fail_over_mac_tbl[];

extern const struct bond_parm_tbl bond_lacp_tbl[];

extern const struct bond_parm_tbl bond_mode_tbl[];

extern const struct bond_parm_tbl xmit_hashtype_tbl[];

extern const struct bond_parm_tbl arp_validate_tbl[];

extern const struct bond_parm_tbl fail_over_mac_tbl[];



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

void bond_send_unsolicited_na(struct bonding *bond);