diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bpf.c | 15 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 16 |
2 files changed, 4 insertions, 27 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ecccbcf..0416b51 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -41,7 +41,6 @@ */ #include "bpf.h" -#include "opt_devfs.h" #ifndef __GNUC__ #define inline @@ -79,11 +78,6 @@ #include <sys/kernel.h> #include <sys/sysctl.h> -#ifdef DEVFS -#include <sys/eventhandler.h> -#include <fs/devfs/devfs.h> -#endif - MALLOC_DEFINE(M_BPF, "BPF", "BPF data"); #if NBPF > 0 @@ -1363,7 +1357,6 @@ bpfdetach(ifp) static void bpf_drvinit __P((void *unused)); -#ifdef DEVFS static void bpf_clone __P((void *arg, char *name, int namelen, dev_t *dev)); static void @@ -1377,24 +1370,20 @@ bpf_clone(arg, name, namelen, dev) if (*dev != NODEV) return; - if (devfs_stdclone(name, NULL, "bpf", &u) != 1) + if (dev_stdclone(name, NULL, "bpf", &u) != 1) return; /* XXX: minor encoding if u > 255 */ *dev = make_dev(&bpf_cdevsw, u, 0, 0, 0600, "bpf%d", u); return; } -#endif static void bpf_drvinit(unused) void *unused; { -#ifdef DEVFS - EVENTHANDLER_REGISTER(devfs_clone, bpf_clone, 0, 1000); -#else + EVENTHANDLER_REGISTER(dev_clone, bpf_clone, 0, 1000); cdevsw_add(&bpf_cdevsw); -#endif } SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL) diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index da865f0..8079566 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -17,7 +17,6 @@ */ #include "opt_inet.h" -#include "opt_devfs.h" #include <sys/param.h> #include <sys/proc.h> @@ -51,11 +50,6 @@ #include <net/if_tunvar.h> #include <net/if_tun.h> -#ifdef DEVFS -#include <sys/eventhandler.h> -#include <fs/devfs/devfs.h> -#endif - static MALLOC_DEFINE(M_TUN, "tun", "Tunnel Interface"); static void tunattach __P((void *)); @@ -97,7 +91,6 @@ static struct cdevsw tun_cdevsw = { /* bmaj */ -1 }; -#ifdef DEVFS static void tun_clone __P((void *arg, char *name, int namelen, dev_t *dev)); static void @@ -111,26 +104,21 @@ tun_clone(arg, name, namelen, dev) if (*dev != NODEV) return; - if (devfs_stdclone(name, NULL, "tun", &u) != 1) + if (dev_stdclone(name, NULL, "tun", &u) != 1) return; /* XXX: minor encoding if u > 255 */ *dev = make_dev(&tun_cdevsw, u, UID_UUCP, GID_DIALER, 0600, "tun%d", u); } -#endif - static void tunattach(dummy) void *dummy; { -#ifdef DEVFS - EVENTHANDLER_REGISTER(devfs_clone, tun_clone, 0, 1000); -#else + EVENTHANDLER_REGISTER(dev_clone, tun_clone, 0, 1000); cdevsw_add(&tun_cdevsw); -#endif } static void |
