aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c2
-rw-r--r--drivers/net/bonding/bonding.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 19cd5c1e1bd3..581fd1798372 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4723,7 +4723,7 @@ static void bond_free_all(void)
4723 * some mode names are substrings of other names, and calls from sysfs 4723 * some mode names are substrings of other names, and calls from sysfs
4724 * may have whitespace in the name (trailing newlines, for example). 4724 * may have whitespace in the name (trailing newlines, for example).
4725 */ 4725 */
4726int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl) 4726int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl)
4727{ 4727{
4728 int mode = -1, i, rv; 4728 int mode = -1, i, rv;
4729 char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, }; 4729 char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, };
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 27642f2c4a37..12384aefad23 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -337,7 +337,7 @@ void bond_mii_monitor(struct work_struct *);
337void bond_loadbalance_arp_mon(struct work_struct *); 337void bond_loadbalance_arp_mon(struct work_struct *);
338void bond_activebackup_arp_mon(struct work_struct *); 338void bond_activebackup_arp_mon(struct work_struct *);
339void bond_set_mode_ops(struct bonding *bond, int mode); 339void bond_set_mode_ops(struct bonding *bond, int mode);
340int bond_parse_parm(const char *mode_arg, struct bond_parm_tbl *tbl); 340int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl);
341void bond_select_active_slave(struct bonding *bond); 341void bond_select_active_slave(struct bonding *bond);
342void bond_change_active_slave(struct bonding *bond, struct slave *new_active); 342void bond_change_active_slave(struct bonding *bond, struct slave *new_active);
343void bond_register_arp(struct bonding *); 343void bond_register_arp(struct bonding *);