Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.

This commit is contained in:
mrg 1997-10-30 15:39:56 +00:00
parent b7a9acd4a5
commit 3f0ebb2220
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/lkm/netinet/if_ipl/ipl.h
View File

@ -1,7 +1,7 @@
/* $NetBSD: ipl.h,v 1.7 1997/09/21 18:03:58 veego Exp $ */
/* $NetBSD: ipl.h,v 1.8 1997/10/30 15:39:56 mrg Exp $ */
/*
* (C)opyright 1993-1997 by Darren Reed.
* Copyright (C) 1993-1997 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@ -13,6 +13,6 @@
#ifndef __IPL_H__
#define __IPL_H__
#define IPL_VERSION "IP Filter v3.2beta5"
#define IPL_VERSION "IP Filter v3.2"
#endif

19
sys/lkm/netinet/if_ipl/mln_ipl.c
View File

@ -1,7 +1,7 @@
/* $NetBSD: mln_ipl.c,v 1.16 1997/09/21 18:04:00 veego Exp $ */
/* $NetBSD: mln_ipl.c,v 1.17 1997/10/30 15:39:56 mrg Exp $ */
/*
* (C)opyright 1993,1994,1995 by Darren Reed.
* Copyright (C) 1993-1997 by Darren Reed.
*
* Redistribution and use in source and binary forms are permitted
* provided that this notice is preserved and due credit is given
@ -59,14 +59,14 @@
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
#ifdef NETBSD_PF
#include <net/pfil.h>
#endif
extern int lkmenodev __P((void));
#if NetBSD >= 199706
int if_ipl_lkmentry __P((struct lkm_table *, int, int));
#else
int xxxinit __P((struct lkm_table *, int, int));
#endif
static int ipl_unload __P((void));
static int ipl_load __P((void));
static int ipl_remove __P((void));
@ -115,8 +115,11 @@ extern struct cdevsw cdevsw[];
extern int nchrdev;
int
if_ipl_lkmentry(lkmtp, cmd, ver)
#if NetBSD >= 199706
int if_ipl_lkmentry(lkmtp, cmd, ver)
#else
int xxxinit(lkmtp, cmd, ver)
#endif
struct lkm_table *lkmtp;
int cmd, ver;
{