diff options
| author | Darren Reed <darrenr@FreeBSD.org> | 2000-07-19 13:56:18 +0000 |
|---|---|---|
| committer | Darren Reed <darrenr@FreeBSD.org> | 2000-07-19 13:56:18 +0000 |
| commit | c0230397c7f9abd15e5a7954426a9c6eef3fa918 (patch) | |
| tree | 193576e73399f790755d9923e203252c9200afcd /contrib/ipfilter/ip_fil.h | |
| parent | 83a94a22b3c40585b74dc450ccc8a1d337aedc64 (diff) | |
| download | src-c0230397c7f9abd15e5a7954426a9c6eef3fa918.tar.gz src-c0230397c7f9abd15e5a7954426a9c6eef3fa918.zip | |
fix conflicts
Notes
Notes:
svn path=/head/; revision=63520
Diffstat (limited to 'contrib/ipfilter/ip_fil.h')
| -rw-r--r-- | contrib/ipfilter/ip_fil.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/ipfilter/ip_fil.h b/contrib/ipfilter/ip_fil.h index ec8ad7ffcb68..487fe90904b8 100644 --- a/contrib/ipfilter/ip_fil.h +++ b/contrib/ipfilter/ip_fil.h @@ -519,8 +519,8 @@ extern int iplioctl __P((dev_t, int, int *, int, cred_t *, int *)); extern int iplopen __P((dev_t *, int, int, cred_t *)); extern int iplclose __P((dev_t, int, int, cred_t *)); extern int ipfsync __P((void)); -extern int ipfr_fastroute __P((qif_t *, ip_t *, mblk_t *, mblk_t **, - fr_info_t *, frdest_t *)); +extern int ipfr_fastroute __P((ip_t *, mblk_t *, mblk_t **, + fr_info_t *, frdest_t *)); extern void copyin_mblk __P((mblk_t *, size_t, size_t, char *)); extern void copyout_mblk __P((mblk_t *, size_t, size_t, char *)); extern int fr_qin __P((queue_t *, mblk_t *)); |