When the UML network driver generates random MACs for its devices, it was
possible for a number of UMLs to get the same MACs because the ethernet
initialization was done before the random pool was properly seeded.
This patch moves the initialization later so that it gets better randomness.
Signed-off-by: Jeff Dike <[email protected]>
Index: linux-2.6.18-mm/arch/um/drivers/daemon_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/daemon_kern.c 2006-11-24 14:29:57.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/daemon_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -98,4 +98,4 @@ static int register_daemon(void)
return 0;
}
-__initcall(register_daemon);
+late_initcall(register_daemon);
Index: linux-2.6.18-mm/arch/um/drivers/mcast_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/mcast_kern.c 2006-11-24 14:29:57.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/mcast_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -127,4 +127,4 @@ static int register_mcast(void)
return 0;
}
-__initcall(register_mcast);
+late_initcall(register_mcast);
Index: linux-2.6.18-mm/arch/um/drivers/pcap_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/pcap_kern.c 2006-11-24 14:29:57.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/pcap_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -109,4 +109,4 @@ static int register_pcap(void)
return 0;
}
-__initcall(register_pcap);
+late_initcall(register_pcap);
Index: linux-2.6.18-mm/arch/um/drivers/slip_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/slip_kern.c 2006-11-27 18:55:16.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/slip_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -95,4 +95,4 @@ static int register_slip(void)
return 0;
}
-__initcall(register_slip);
+late_initcall(register_slip);
Index: linux-2.6.18-mm/arch/um/drivers/slirp_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/drivers/slirp_kern.c 2006-11-27 18:55:16.000000000 -0500
+++ linux-2.6.18-mm/arch/um/drivers/slirp_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -119,4 +119,4 @@ static int register_slirp(void)
return 0;
}
-__initcall(register_slirp);
+late_initcall(register_slirp);
Index: linux-2.6.18-mm/arch/um/os-Linux/drivers/ethertap_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/os-Linux/drivers/ethertap_kern.c 2006-11-27 18:55:16.000000000 -0500
+++ linux-2.6.18-mm/arch/um/os-Linux/drivers/ethertap_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -105,4 +105,4 @@ static int register_ethertap(void)
return 0;
}
-__initcall(register_ethertap);
+late_initcall(register_ethertap);
Index: linux-2.6.18-mm/arch/um/os-Linux/drivers/tuntap_kern.c
===================================================================
--- linux-2.6.18-mm.orig/arch/um/os-Linux/drivers/tuntap_kern.c 2006-11-27 18:55:16.000000000 -0500
+++ linux-2.6.18-mm/arch/um/os-Linux/drivers/tuntap_kern.c 2006-12-04 12:08:52.000000000 -0500
@@ -90,4 +90,4 @@ static int register_tuntap(void)
return 0;
}
-__initcall(register_tuntap);
+late_initcall(register_tuntap);