diff options
| author | cube <cube@pkgsrc.org> | 2005-02-15 21:23:07 +0000 |
|---|---|---|
| committer | cube <cube@pkgsrc.org> | 2005-02-15 21:23:07 +0000 |
| commit | 9143bd659e6c47a96d100f7931a3882a84bc0680 (patch) | |
| tree | cc77f3403663bf4411ae10590c32453ebbc1e523 /net/netbsd-tap | |
| parent | 7919071dc9c717d16abc0fc798d5158a969f51b0 (diff) | |
| download | pkgsrc-9143bd659e6c47a96d100f7931a3882a84bc0680.tar.gz | |
Adapt to 2.99.16. Bump version.
Diffstat (limited to 'net/netbsd-tap')
| -rw-r--r-- | net/netbsd-tap/Makefile | 4 | ||||
| -rw-r--r-- | net/netbsd-tap/files/if_tap.c | 7 | ||||
| -rw-r--r-- | net/netbsd-tap/files/if_tap_stub.c | 10 | ||||
| -rw-r--r-- | net/netbsd-tap/files/if_tap_stub.h | 7 |
4 files changed, 17 insertions, 11 deletions
diff --git a/net/netbsd-tap/Makefile b/net/netbsd-tap/Makefile index 217473f5824..c54d49d2a1f 100644 --- a/net/netbsd-tap/Makefile +++ b/net/netbsd-tap/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/01/20 18:02:38 cube Exp $ +# $NetBSD: Makefile,v 1.2 2005/02/15 21:23:07 cube Exp $ -DISTNAME= netbsd-tap-20050120 +DISTNAME= netbsd-tap-20050215 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/netbsd-tap/files/if_tap.c b/net/netbsd-tap/files/if_tap.c index 5b8e6aaaa0a..a8579748cef 100644 --- a/net/netbsd-tap/files/if_tap.c +++ b/net/netbsd-tap/files/if_tap.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $ */ +/* $NetBSD: if_tap.c,v 1.3 2005/02/15 21:23:07 cube Exp $ */ /* * Copyright (c) 2003, 2004 The NetBSD Foundation. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.2 2005/01/25 10:26:52 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.3 2005/02/15 21:23:07 cube Exp $"); #if defined(_KERNEL_OPT) #include "bpfilter.h" @@ -730,7 +730,8 @@ tap_dev_cloner(struct proc *p) sc->sc_flags |= TAP_INUSE; - return tap_fdclone(p, fp, fd, &tap_fileops, (void *)(intptr_t)sc->sc_dev.dv_unit); + return tap_fdclone(p, fp, fd, FREAD|FWRITE, &tap_fileops, + (void *)(intptr_t)sc->sc_dev.dv_unit); } /* diff --git a/net/netbsd-tap/files/if_tap_stub.c b/net/netbsd-tap/files/if_tap_stub.c index 0987b40a23a..04cc7c19f8c 100644 --- a/net/netbsd-tap/files/if_tap_stub.c +++ b/net/netbsd-tap/files/if_tap_stub.c @@ -1,7 +1,7 @@ -/* $NetBSD: if_tap_stub.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $ */ +/* $NetBSD: if_tap_stub.c,v 1.2 2005/02/15 21:23:08 cube Exp $ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_tap_stub.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tap_stub.c,v 1.2 2005/02/15 21:23:08 cube Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -15,10 +15,10 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap_stub.c,v 1.1.1.1 2005/01/20 18:02:40 cube Exp /* 2.99.10 is gray area. Oh, well. */ #if __NetBSD_Version__ < 299001100 int -tap_fdclone(struct proc *p, struct file *fp, int fd, struct fileops *fops, - void *data) +tap_fdclone(struct proc *p, struct file *fp, int flags, int fd, + struct fileops *fops, void *data) { - fp->f_flag = FREAD | FWRITE; + fp->f_flag = flags; fp->f_type = DTYPE_MISC; fp->f_ops = fops; fp->f_data = data; diff --git a/net/netbsd-tap/files/if_tap_stub.h b/net/netbsd-tap/files/if_tap_stub.h index fb24f4ad689..610c13e9a87 100644 --- a/net/netbsd-tap/files/if_tap_stub.h +++ b/net/netbsd-tap/files/if_tap_stub.h @@ -1,9 +1,14 @@ #if __NetBSD_Version__ < 299001100 -int tap_fdclone(struct proc *, struct file *, int, struct fileops *, void *); +int tap_fdclone(struct proc *, struct file *, int, int, struct fileops *, void *); int tap_fnullop_fcntl(struct file *, u_int, void *, struct proc *); int tap_fbadop_stat(struct file *, struct stat *, struct proc *); #else +/* 2.99.15 is gray area. Oh, well. */ +# if __NetBSD_Version__ < 299001600 +#define tap_fdclone(p,fp,fl,fd,fops,data) fdclone(p,fp,fd,fops,data) +# else #define tap_fdclone fdclone +# endif #define tap_fnullop_fcntl fnullop_fcntl #define tap_fbadop_stat fbadop_stat #endif |