]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
bonding: fix enslavement error unwinds
authorJay Vosburgh <fubar@us.ibm.com>
Sat, 3 May 2008 01:06:02 +0000 (18:06 -0700)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 6 May 2008 16:01:32 +0000 (12:01 -0400)
commit569f0c4d909c7f73de634abcdc36344cb72de36a
treee8fead8972dd34fde23e0931bffa17e9dbdb8bfb
parentae68c39819ddf30549652962768a50edae5eec6f
bonding: fix enslavement error unwinds

As part of:

commit c2edacf80e155ef54ae4774379d461b60896bc2e
Author: Jay Vosburgh <fubar@us.ibm.com>
Date:   Mon Jul 9 10:42:47 2007 -0700

    bonding / ipv6: no addrconf for slaves separately from master

two steps were rearranged in the enslavement process: netdev_set_master
is now before the call to dev_open to open the slave.

This patch updates the error cases and unwind process at the
end of bond_enslave to match the new order.  Without this patch, it is
possible for the enslavement to fail, but leave the slave with IFF_SLAVE
set in its flags.

Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/bonding/bond_main.c