From: David S. Miller Date: Thu, 22 May 2014 19:46:38 +0000 (-0400) Subject: Merge branch 'bonding' X-Git-Tag: v4.14-rc1~7383^2~163 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff1f9747dd95a5e4da78f723763843f2e21c88ed;p=platform%2Fkernel%2Flinux-rpi.git 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 CC: Andy Gospodarek CC: netdev@vger.kernel.org Signed-off-by: Veaceslav Falico Signed-off-by: David S. Miller --- ff1f9747dd95a5e4da78f723763843f2e21c88ed