diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/net/bonding/bond_main.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 72df399c4ab3..55bbb8b8200c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -4416,6 +4416,7 @@ static int bond_check_params(struct bond_params *params) | |||
| 4416 | params->all_slaves_active = all_slaves_active; | 4416 | params->all_slaves_active = all_slaves_active; |
| 4417 | params->resend_igmp = resend_igmp; | 4417 | params->resend_igmp = resend_igmp; |
| 4418 | params->min_links = min_links; | 4418 | params->min_links = min_links; |
| 4419 | params->lp_interval = BOND_ALB_DEFAULT_LP_INTERVAL; | ||
| 4419 | 4420 | ||
| 4420 | if (primary) { | 4421 | if (primary) { |
| 4421 | strncpy(params->primary, primary, IFNAMSIZ); | 4422 | strncpy(params->primary, primary, IFNAMSIZ); |