Merge tag 'driver-core-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-kernels.git] / net / ipv4 / ipconfig.c

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index f53a0f2453aff1480227900fd6b071f3e62e3df8..e90bc0aa85c77070d67e5d64271a0721cb95dae8 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1434,6 +1434,7 @@ __be32 __init root_nfs_parse_addr(char *name)
 static int __init wait_for_devices(void)
 {
        int i;
+       bool try_init_devs = true;
 
        for (i = 0; i < DEVICE_WAIT_MAX; i++) {
                struct net_device *dev;
@@ -1452,6 +1453,11 @@ static int __init wait_for_devices(void)
                rtnl_unlock();
                if (found)
                        return 0;
+               if (try_init_devs &&
+                   (ROOT_DEV == Root_NFS || ROOT_DEV == Root_CIFS)) {
+                       try_init_devs = false;
+                       wait_for_init_devices_probe();
+               }
                ssleep(1);
        }
        return -ENODEV;