From 86057eba5b6bf04f8dcf9453dee86cd1f53b409c Mon Sep 17 00:00:00 2001 From: Holger Eitzenberger Date: Tue, 9 Dec 2008 23:10:17 -0800 Subject: [PATCH] --- yaml --- r: 122571 b: refs/heads/master c: 325dcf7a907a43f8832b92ae1c672798b4e60ce2 h: refs/heads/master i: 122569: 3831a0dcfa7128b2d93d657f3e82354895d973d2 122567: 2001d48188eb9b576db1293c490798e33fa4aa14 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- trunk/drivers/net/bonding/bonding.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a217f30d04e4..5921043a2439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d78755237f0892c8d313a7f7b1774443a7308b11 +refs/heads/master: 325dcf7a907a43f8832b92ae1c672798b4e60ce2 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 19cd5c1e1bd3..581fd1798372 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -4723,7 +4723,7 @@ static void bond_free_all(void) * some mode names are substrings of other names, and calls from sysfs * may have whitespace in the name (trailing newlines, for example). */ -int bond_parse_parm(const char *buf, struct bond_parm_tbl *tbl) +int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl) { int mode = -1, i, rv; char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, }; diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index 27642f2c4a37..12384aefad23 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/drivers/net/bonding/bonding.h @@ -337,7 +337,7 @@ void bond_mii_monitor(struct work_struct *); void bond_loadbalance_arp_mon(struct work_struct *); void bond_activebackup_arp_mon(struct work_struct *); void bond_set_mode_ops(struct bonding *bond, int mode); -int bond_parse_parm(const char *mode_arg, struct bond_parm_tbl *tbl); +int bond_parse_parm(const char *mode_arg, const struct bond_parm_tbl *tbl); void bond_select_active_slave(struct bonding *bond); void bond_change_active_slave(struct bonding *bond, struct slave *new_active); void bond_register_arp(struct bonding *);