]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'bonding'
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:46:38 +0000 (15:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:46:38 +0000 (15:46 -0400)
commit51dee7be2a5d764055d77a1d4057b9a78273bd44
tree8fac08b65e226b156f8cfe3089fb8dfbae4cc323
parent2a859fff63dd808a09d7037616aca0c13e8e641b
parentf2677be63d0a3d7370d24ce83b25027226f3b94e
Merge branch 'bonding'

Veaceslav Falico says:

====================
bonding: fix enslaving a dev without mtu setting support

With the introduction of bond_free_slave() we need to have slave->bond
populated before calling it, however if the dev_mtu_set(slave, mtu) fails,
we call bond_free_slave() before actually setting slave->bond, and thus
we'll panic.

Fix this by populating slave->bond (and ->dev, it seems appropriate) as
early as possible.

Also, remove a harmful check for NULL in bond_get_bond_by_slave(), as it's
only hiding the real problem and making it harder to debug.
====================

CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: netdev@vger.kernel.org
Signed-off-by: Veaceslav Falico <vfalico@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>