diff --git a/sys/lkm/netinet/if_ipl/mln_ipl.c b/sys/lkm/netinet/if_ipl/mln_ipl.c index 3be7402f8af1..a8aa71aa1442 100644 --- a/sys/lkm/netinet/if_ipl/mln_ipl.c +++ b/sys/lkm/netinet/if_ipl/mln_ipl.c @@ -68,7 +68,7 @@ extern int lkmenodev(), lkmexists(), lkmdispatch(); -extern int iplattach(), iplopen(), iplclose(), iplioctl(), ipldetach(); +extern int ipfilterattach(), iplopen(), iplclose(), iplioctl(), ipfilterdetach(); #ifdef NETBSD_PF #include #endif @@ -191,7 +191,7 @@ static int ipl_unload() { int error; - error = ipldetach(); + error = ipfilterdetach(); #ifdef NETBSD_PF pfil_remove_hook((void *)fr_check, PFIL_IN|PFIL_OUT); #endif @@ -207,7 +207,7 @@ static int ipl_load() struct vattr vattr; int error, fmode = S_IFCHR|0600; - error = iplattach(); + error = ipfilterattach(); #ifdef NETBSD_PF pfil_add_hook((void *)fr_check, PFIL_IN|PFIL_OUT); #endif diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c index e705c69488cf..dffa8bc43962 100644 --- a/sys/netinet/ip_fil.c +++ b/sys/netinet/ip_fil.c @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil.c,v 1.3 1997/01/07 10:51:01 mrg Exp $ */ +/* $NetBSD: ip_fil.c,v 1.4 1997/01/08 21:45:39 veego Exp $ */ /* * (C)opyright 1993,1994,1995 by Darren Reed. @@ -86,8 +86,8 @@ static void frzerostats __P((caddr_t data)); int iplioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); int iplopen __P((dev_t, int, int, struct proc *)); int iplclose __P((dev_t, int, int, struct proc *)); -int iplattach __P((void)); -int ipldetach __P((void)); +int ipfilterattach __P((void)); +int ipfilterdetach __P((void)); # ifdef IPFILTER_LOG int iplread __P((dev_t, struct uio *, int)); # else @@ -134,7 +134,7 @@ char *s; #endif /* IPFILTER_LKM */ -int iplattach() +int ipfilterattach() { int s; @@ -157,7 +157,7 @@ int iplattach() } -int ipldetach() +int ipfilterdetach() { int s, i = FR_INQUE|FR_OUTQUE; @@ -282,9 +282,9 @@ int mode; else { IRCOPY(data, (caddr_t)&enable, sizeof(enable)); if (enable) - error = iplattach(); + error = ipfilterattach(); else - error = ipldetach(); + error = ipfilterdetach(); } break; } @@ -736,7 +736,7 @@ struct tcpiphdr *ti; #ifndef IPFILTER_LKM void iplinit() { - (void) iplattach(); + (void) ipfilterattach(); ip_init(); } #endif