From 94a3fb13d602d914a1aecdd3d78d2778b880bcd1 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Mon, 25 Jan 2010 23:34:15 +0000 Subject: [PATCH] --- yaml --- r: 180197 b: refs/heads/master c: b473946a0853860e13b51c28add5524741117786 h: refs/heads/master i: 180195: c5e08f1570ef0c4fc1b8f48108256027b0f6b44c v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3349d8d9e0e8..8be65fa86eb1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ce1cc52d2e76b6a6b9d0b52b70eb181497efa50 +refs/heads/master: b473946a0853860e13b51c28add5524741117786 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 3f0071cfe56b..efa0e41bf3ec 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -3639,7 +3639,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);