xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2014-02-19 01:24:22 -05:00
parent f7b12606b5 960dfc4eb2
commit 1e8d6421cf
540 changed files with 5421 additions and 3601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/core/rtnetlink.c
View File

@@ -1968,16 +1968,21 @@ replay:
dev->ifindex = ifm->ifi_index;
if (ops->newlink)
if (ops->newlink) {
err = ops->newlink(net, dev, tb, data);
else
/* Drivers should call free_netdev() in ->destructor
* and unregister it on failure so that device could be
* finally freed in rtnl_unlock.
*/
if (err < 0)
goto out;
} else {
err = register_netdevice(dev);
if (err < 0) {
free_netdev(dev);
goto out;
if (err < 0) {
free_netdev(dev);
goto out;
}
}
err = rtnl_configure_link(dev, ifm);
if (err < 0)
unregister_netdevice(dev);