Merge 4.4.194 into android-4.4-p

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index 5740f43..f443398 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6837,6 +6837,8 @@ int register_netdevice(struct net_device *dev)
        ret = notifier_to_errno(ret);
        if (ret) {
                rollback_registered(dev);
+               rcu_barrier();
+
                dev->reg_state = NETREG_UNREGISTERED;
        }
        /*