diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-16 17:09:34 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-16 17:09:34 -0400 |
commit | 1a98c69af1ecd97bfd1f4e4539924a9192434e36 (patch) | |
tree | a243defcf921ea174f8e43fce11d06830a6a9c36 /drivers/net/bonding | |
parent | 7a575f6b907ea5d207d2b5010293c189616eae34 (diff) | |
parent | b6603fe574af289dbe9eb9fb4c540bca04f5a053 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 041036e31aa3..1ff676caa9cd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -4037,7 +4037,7 @@ static int bond_check_params(struct bond_params *params) | |||
4037 | } | 4037 | } |
4038 | 4038 | ||
4039 | if (ad_select) { | 4039 | if (ad_select) { |
4040 | bond_opt_initstr(&newval, lacp_rate); | 4040 | bond_opt_initstr(&newval, ad_select); |
4041 | valptr = bond_opt_parse(bond_opt_get(BOND_OPT_AD_SELECT), | 4041 | valptr = bond_opt_parse(bond_opt_get(BOND_OPT_AD_SELECT), |
4042 | &newval); | 4042 | &newval); |
4043 | if (!valptr) { | 4043 | if (!valptr) { |