Module Name:	src
Committed By:	peter
Date:		Mon Feb 14 21:28:33 UTC 2005

Modified Files:
	src/sys/dist/pf/net: pf_ioctl.c

Log Message:
Merge in a fix from OPENBSD_3_6.
ok yamt@

> MFC:
> Fix by dhartmei@
>
> replace finer-grained spl locking in pfioctl() with a single broad lock
> around the entire body. this resolves the (misleading) panics in
> pf_tag_packet() during heavy ioctl operations (like when using authpf)
> that occur because softclock can interrupt ioctl on i386 since SMP.
> patch from camield@.


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 src/sys/dist/pf/net/pf_ioctl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.