On Wed, Feb 24, 2010 at 08:30:05AM +0100, Henning Brauer wrote:
> * Dan Harnett <[email protected]> [2010-02-23 21:19]:
> >
> > Probably wrong, but this fixes it.
>
> i would not call that wrong.
>
> i don't understand how this ever worked and I don't understand what
> broke it. the only commit in that timeframe that could cause this is
> ryan's pool removal and that doesn't touch anything near that
> codepath. puzzled.
Ryan's commit actually removed a very similar line.
$ cd /usr/src/sys/net
$ cvs diff -D 2010/01/11 -D 2010/01/12 pf_table.c
Index: pf_table.c
===================================================================
RCS file: /home/cvs/openbsd/src/sys/net/pf_table.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- pf_table.c 24 Nov 2008 13:22:09 -0000 1.80
+++ pf_table.c 12 Jan 2010 03:20:51 -0000 1.81
[... snip! ...]
@@ -1087,7 +1111,6 @@ pfr_walktree(struct radix_node *rn, void
as.pfras_a.pfra_fback = PFR_FB_NOCOUNT;
}
splx(s);
- as.pfras_tzero = ke->pfrke_tzero;
if (COPYOUT(&as, w->pfrw_astats, sizeof(as), flags))
return (EFAULT);
[... snip! ...]