summaryrefslogtreecommitdiffstats
path: root/sys/net
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1999-05-31 11:29:30 +0000
committerphk <phk@FreeBSD.org>1999-05-31 11:29:30 +0000
commit6a5dc97620c08ad609e1b3c3c042f150feb46dd3 (patch)
tree6cfc9338ae83f67fd38a853cd0782713c73cad13 /sys/net
parent881e2636833297a207a791fabd8befc818b1b3fb (diff)
downloadFreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.zip
FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.tar.gz
Simplify cdevsw registration.
The cdevsw_add() function now finds the major number(s) in the struct cdevsw passed to it. cdevsw_add_generic() is no longer needed, cdevsw_add() does the same thing. cdevsw_add() will print an message if the d_maj field looks bogus. Remove nblkdev and nchrdev variables. Most places they were used bogusly. Instead check a dev_t for validity by seeing if devsw() or bdevsw() returns NULL. Move bdevsw() and devsw() functions to kern/kern_conf.c Bump __FreeBSD_version to 400006 This commit removes: 72 bogus makedev() calls 26 bogus SYSINIT functions if_xe.c bogusly accessed cdevsw[], author/maintainer please fix. I4b and vinum not changed. Patches emailed to authors. LINT probably broken until they catch up.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bpf.c6
-rw-r--r--sys/net/if_tun.c4
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 40d3609..a564935 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -37,7 +37,7 @@
*
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
*
- * $Id: bpf.c,v 1.49 1999/04/28 11:37:30 phk Exp $
+ * $Id: bpf.c,v 1.50 1999/05/30 16:53:04 phk Exp $
*/
#include "bpfilter.h"
@@ -1306,14 +1306,12 @@ static void
bpf_drvinit(unused)
void *unused;
{
- dev_t dev;
#ifdef DEVFS
int i;
#endif
if( ! bpf_devsw_installed ) {
- dev = makedev(CDEV_MAJOR, 0);
- cdevsw_add(&dev,&bpf_cdevsw, NULL);
+ cdevsw_add(&bpf_cdevsw);
bpf_devsw_installed = 1;
#ifdef DEVFS
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 071e628..caff2d4 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -121,12 +121,10 @@ tunattach(dummy)
{
register int i;
struct ifnet *ifp;
- dev_t dev;
if ( tun_devsw_installed )
return;
- dev = makedev(CDEV_MAJOR, 0);
- cdevsw_add(&dev, &tun_cdevsw, NULL);
+ cdevsw_add(&tun_cdevsw);
tun_devsw_installed = 1;
for ( i = 0; i < NTUN; i++ ) {
#ifdef DEVFS
OpenPOWER on IntegriCloud