diff --git a/[refs] b/[refs] index b77bf5329200..391b3f363be8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 907cdda5205b012eec7513f66713749b293188c9 +refs/heads/master: 283f2fe87e980d8af5ad8aa63751e7e3258ee05a diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index fe2a754238a9..2d01f18f303a 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3757,11 +3757,10 @@ int netdev_set_master(struct net_device *slave, struct net_device *master) slave->master = master; - synchronize_net(); - - if (old) + if (old) { + synchronize_net(); dev_put(old); - + } if (master) slave->flags |= IFF_SLAVE; else