diff options
author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-05-07 05:51:13 +0000 |
---|---|---|
committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2008-05-07 05:51:13 +0000 |
commit | 2a4b30b87039ac2f778756d352f7935d8317f8cd (patch) | |
tree | 838fe3d2c9b7eccb32786f4725455f2d83f295c2 /sys/net/netisr.h | |
parent | 8370a3080477e7b676b11cf6420090354ccc2e6a (diff) |
Prevent virtual interfaces from adding to the random pool.
Also move the sampling into ether_input() where it can happen
at the interrupt and not within splnet() processing, which might
be less random. Discussed with mickey.
OK markus@, mcbride@
Diffstat (limited to 'sys/net/netisr.h')
-rw-r--r-- | sys/net/netisr.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/net/netisr.h b/sys/net/netisr.h index 1ee79a8e39b..2b75c7d7ead 100644 --- a/sys/net/netisr.h +++ b/sys/net/netisr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: netisr.h,v 1.31 2008/04/23 10:55:14 norby Exp $ */ +/* $OpenBSD: netisr.h,v 1.32 2008/05/07 05:51:12 mpf Exp $ */ /* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */ /* @@ -52,7 +52,7 @@ * interrupt used for scheduling the network code to calls * on the lowest level routine of each protocol. */ -#define NETISR_RND 1 +#define NETISR_RND_DONE 1 #define NETISR_IP 2 /* same as AF_INET */ #define NETISR_TX 3 /* for if_snd processing */ #define NETISR_ATALK 16 /* same as AF_APPLETALK */ @@ -70,7 +70,6 @@ #ifdef _KERNEL extern int netisr; /* scheduling bits for network */ -void netrndintr(void); void nettxintr(void); void arpintr(void); void ipintr(void); @@ -87,7 +86,7 @@ void mplsintr(void); #include <machine/atomic.h> #define schednetisr(anisr) \ do { \ - atomic_setbits_int(&netisr, (1 << (anisr)) | (1 << NETISR_RND));\ + atomic_setbits_int(&netisr, (1 << (anisr))); \ setsoftnet(); \ } while (0) #endif |