diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-28 09:12:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 09:12:38 -0500 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/bonding | |
| parent | 257ddbdad13cd3c4f7d03b85af632c508aa8abc9 (diff) | |
| parent | b473946a0853860e13b51c28add5524741117786 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 99a0ff3889ee..6221936e957a 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
| @@ -3650,7 +3650,7 @@ static int bond_open(struct net_device *bond_dev) | |||
| 3650 | */ | 3650 | */ |
| 3651 | if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { | 3651 | if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { |
| 3652 | /* something went wrong - fail the open operation */ | 3652 | /* something went wrong - fail the open operation */ |
| 3653 | return -1; | 3653 | return -ENOMEM; |
| 3654 | } | 3654 | } |
| 3655 | 3655 | ||
| 3656 | INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); | 3656 | INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); |