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

Resolve conflicts from the import.

This commit is contained in:
veego 1998-07-12 15:11:50 +00:00
parent dd81fd7d91
commit e3d44c6e25
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: ipl.h,v 1.11 1998/05/29 20:32:01 veego Exp $ */
/* $NetBSD: ipl.h,v 1.12 1998/07/12 15:11:50 veego Exp $ */
/*
* Copyright (C) 1993-1997 by Darren Reed.
@ -13,6 +13,6 @@
#ifndef __IPL_H__
#define __IPL_H__
#define IPL_VERSION "IP Filter v3.2.7"
#define IPL_VERSION "IP Filter v3.2.9"
#endif

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

@ -1,4 +1,4 @@
/* $NetBSD: mln_ipl.c,v 1.18 1998/03/01 02:25:22 fvdl Exp $ */
/* $NetBSD: mln_ipl.c,v 1.19 1998/07/12 15:11:50 veego Exp $ */
/*
* Copyright (C) 1993-1997 by Darren Reed.
@ -54,7 +54,6 @@
#define vn_lock(v,f) VOP_LOCK(v)
#endif
#if !defined(VOP_LEASE) && defined(LEASE_CHECK)
#define VOP_LEASE LEASE_CHECK
#endif