diff options
| author | David S. Miller | 2010-01-28 15:12:38 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-01-28 15:12:38 +0100 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /drivers/net/bonding | |
| parent | netdev: remove HAVE_ leftovers (diff) | |
| parent | bonding: bond_open error return value (diff) | |
| download | kernel-qcow2-linux-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.gz kernel-qcow2-linux-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.xz kernel-qcow2-linux-05ba712d7eb156009753e18e5116cabd869cc6e2.zip | |
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) */ if (bond_alb_initialize(bond, (bond->params.mode == BOND_MODE_ALB))) { /* something went wrong - fail the open operation */ - return -1; + return -ENOMEM; } INIT_DELAYED_WORK(&bond->alb_work, bond_alb_monitor); |