diff -urN linux-2.5.1/Documentation/Configure.help linux/Documentation/Configure.help
--- linux-2.5.1/Documentation/Configure.help	Mon Dec 17 14:31:40 2001
+++ linux/Documentation/Configure.help	Wed Dec 19 02:42:35 2001
@@ -8987,6 +8987,20 @@
 
   If you don't know what to use this for, you don't need it.
 
+Allow Net Devices to contribute to /dev/random
+CONFIG_NET_RANDOM
+  If you say Y here, network device interrupts will contribute to the
+  kernel entropy pool. Normally, block devices and some other devices
+  feed the pool. Some systems, such as those that are headless or diskless,
+  need additional entropy sources.  Some people, however, feel that network
+  devices should not contribute to /dev/random because an external attacker
+  could observe incoming packets in an attempt to learn the entropy pool's
+  state.  If you say N, no network device will contribute entropy.
+
+  If you believe there is a chance of your network packets being observed
+  and you doubt the security of the entropy pool's one-way hash, do not
+  enable this.  If unsure, say N.
+
 Ethertap network tap (OBSOLETE)
 CONFIG_ETHERTAP
   If you say Y here (and have said Y to "Kernel/User network link
diff -urN linux-2.5.1/drivers/net/Config.in linux/drivers/net/Config.in
--- linux-2.5.1/drivers/net/Config.in	Mon Dec 17 14:31:06 2001
+++ linux/drivers/net/Config.in	Wed Dec 19 02:42:35 2001
@@ -9,6 +9,7 @@
 tristate 'Bonding driver support' CONFIG_BONDING
 tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER
 tristate 'Universal TUN/TAP device driver support' CONFIG_TUN
+bool 'Allow Net Devices to contribute to /dev/random' CONFIG_NET_RANDOM
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    if [ "$CONFIG_NETLINK" = "y" ]; then
       tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP
diff -urN linux-2.5.1/include/asm-alpha/signal.h linux/include/asm-alpha/signal.h
--- linux-2.5.1/include/asm-alpha/signal.h	Mon Dec 17 14:30:56 2001
+++ linux/include/asm-alpha/signal.h	Wed Dec 19 02:42:35 2001
@@ -121,8 +121,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x40000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          1	/* for blocking signals */
 #define SIG_UNBLOCK        2	/* for unblocking signals */
 #define SIG_SETMASK        3	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-arm/signal.h linux/include/asm-arm/signal.h
--- linux-2.5.1/include/asm-arm/signal.h	Mon Dec 17 14:31:01 2001
+++ linux/include/asm-arm/signal.h	Wed Dec 19 02:42:35 2001
@@ -126,8 +126,15 @@
 #define SA_SAMPLE_RANDOM	0x10000000
 #define SA_IRQNOMASK		0x08000000
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-cris/signal.h linux/include/asm-cris/signal.h
--- linux-2.5.1/include/asm-cris/signal.h	Mon Dec 17 14:31:04 2001
+++ linux/include/asm-cris/signal.h	Wed Dec 19 02:42:35 2001
@@ -120,8 +120,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-i386/signal.h linux/include/asm-i386/signal.h
--- linux-2.5.1/include/asm-i386/signal.h	Mon Dec 17 14:30:55 2001
+++ linux/include/asm-i386/signal.h	Wed Dec 19 02:42:35 2001
@@ -119,8 +119,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-ia64/signal.h linux/include/asm-ia64/signal.h
--- linux-2.5.1/include/asm-ia64/signal.h	Mon Dec 17 14:31:02 2001
+++ linux/include/asm-ia64/signal.h	Wed Dec 19 02:42:35 2001
@@ -116,6 +116,12 @@
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
 
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
+#endif
+
 #endif /* __KERNEL__ */
 
 #define SIG_BLOCK          0	/* for blocking signals */
diff -urN linux-2.5.1/include/asm-m68k/signal.h linux/include/asm-m68k/signal.h
--- linux-2.5.1/include/asm-m68k/signal.h	Mon Dec 17 14:30:56 2001
+++ linux/include/asm-m68k/signal.h	Wed Dec 19 02:42:35 2001
@@ -116,8 +116,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-mips/signal.h linux/include/asm-mips/signal.h
--- linux-2.5.1/include/asm-mips/signal.h	Mon Dec 17 14:30:55 2001
+++ linux/include/asm-mips/signal.h	Wed Dec 19 02:42:35 2001
@@ -111,6 +111,12 @@
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x02000000
 
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
+#endif
+
 #endif /* __KERNEL__ */
 
 #define SIG_BLOCK	1	/* for blocking signals */
diff -urN linux-2.5.1/include/asm-mips64/signal.h linux/include/asm-mips64/signal.h
--- linux-2.5.1/include/asm-mips64/signal.h	Mon Dec 17 14:31:02 2001
+++ linux/include/asm-mips64/signal.h	Wed Dec 19 02:42:35 2001
@@ -111,6 +111,12 @@
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x02000000
 
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
+#endif
+
 #endif /* __KERNEL__ */
 
 #define SIG_BLOCK	1	/* for blocking signals */
diff -urN linux-2.5.1/include/asm-parisc/signal.h linux/include/asm-parisc/signal.h
--- linux-2.5.1/include/asm-parisc/signal.h	Mon Dec 17 14:31:04 2001
+++ linux/include/asm-parisc/signal.h	Wed Dec 19 02:42:35 2001
@@ -100,6 +100,12 @@
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
 
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
+#endif
+
 #endif /* __KERNEL__ */
 
 #define SIG_BLOCK          0	/* for blocking signals */
diff -urN linux-2.5.1/include/asm-ppc/signal.h linux/include/asm-ppc/signal.h
--- linux-2.5.1/include/asm-ppc/signal.h	Mon Dec 17 14:30:56 2001
+++ linux/include/asm-ppc/signal.h	Wed Dec 19 02:42:35 2001
@@ -114,8 +114,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-s390/signal.h linux/include/asm-s390/signal.h
--- linux-2.5.1/include/asm-s390/signal.h	Mon Dec 17 14:31:02 2001
+++ linux/include/asm-s390/signal.h	Wed Dec 19 02:42:35 2001
@@ -127,8 +127,15 @@
 #define SA_PROBE                SA_ONESHOT
 #define SA_SAMPLE_RANDOM        SA_RESTART
 #define SA_SHIRQ                0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0    /* for blocking signals */
 #define SIG_UNBLOCK        1    /* for unblocking signals */
 #define SIG_SETMASK        2    /* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-s390x/signal.h linux/include/asm-s390x/signal.h
--- linux-2.5.1/include/asm-s390x/signal.h	Mon Dec 17 14:31:04 2001
+++ linux/include/asm-s390x/signal.h	Wed Dec 19 02:42:35 2001
@@ -127,8 +127,15 @@
 #define SA_PROBE                SA_ONESHOT
 #define SA_SAMPLE_RANDOM        SA_RESTART
 #define SA_SHIRQ                0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0    /* for blocking signals */
 #define SIG_UNBLOCK        1    /* for unblocking signals */
 #define SIG_SETMASK        2    /* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-sh/signal.h linux/include/asm-sh/signal.h
--- linux-2.5.1/include/asm-sh/signal.h	Mon Dec 17 14:31:01 2001
+++ linux/include/asm-sh/signal.h	Wed Dec 19 02:42:35 2001
@@ -107,8 +107,15 @@
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
 #define SA_SHIRQ		0x04000000
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK          0	/* for blocking signals */
 #define SIG_UNBLOCK        1	/* for unblocking signals */
 #define SIG_SETMASK        2	/* for setting the signal mask */
diff -urN linux-2.5.1/include/asm-sparc/signal.h linux/include/asm-sparc/signal.h
--- linux-2.5.1/include/asm-sparc/signal.h	Mon Dec 17 14:30:56 2001
+++ linux/include/asm-sparc/signal.h	Wed Dec 19 02:42:35 2001
@@ -176,8 +176,15 @@
 #define SA_PROBE SA_ONESHOT
 #define SA_SAMPLE_RANDOM SA_RESTART
 #define SA_STATIC_ALLOC		0x80
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 /* Type of a signal handler.  */
 #ifdef __KERNEL__
 typedef void (*__sighandler_t)(int, int, struct sigcontext *, char *);
diff -urN linux-2.5.1/include/asm-sparc64/signal.h linux/include/asm-sparc64/signal.h
--- linux-2.5.1/include/asm-sparc64/signal.h	Mon Dec 17 14:30:56 2001
+++ linux/include/asm-sparc64/signal.h	Wed Dec 19 02:42:35 2001
@@ -192,8 +192,15 @@
 #define SA_PROBE SA_ONESHOT
 #define SA_SAMPLE_RANDOM SA_RESTART
 #define SA_STATIC_ALLOC		0x80
+
+#ifdef CONFIG_NET_RANDOM
+#define SA_SAMPLE_NET_RANDOM	SA_SAMPLE_RANDOM
+#else
+#define SA_SAMPLE_NET_RANDOM	0
 #endif
 
+#endif /* __KERNEL__ */
+
 /* Type of a signal handler.  */
 #ifdef __KERNEL__
 typedef void (*__sighandler_t)(int, struct sigcontext *);