Hello, I'm sorry I was not clear enough in my earlier email.
On Mon, Jan 04, 2021 at 03:56:45PM +0100, Alexander Bluhm wrote: > On Mon, Jan 04, 2021 at 03:26:15PM +0100, Alexandr Nedvedicky wrote: > > you refactoring diff requires a minor finishing touch to keep the > > stuff compiling: > > Did I commit something that does not compile? I just made cvs > update on another machine. There it worked. all diffs you commit compile, there are no doubts in this. I was talking about change sent here: https://marc.info/?l=openbsd-tech&m=160976516119388&w=2 diff above contains chunk here, which removes rt_kif. ----8<-------8<-------8<-------8<-------8<------------8<---- Index: net/pfvar.h =================================================================== RCS file: /cvs/src/sys/net/pfvar.h,v retrieving revision 1.497 diff -u -p -r1.497 pfvar.h --- net/pfvar.h 14 Oct 2020 19:22:14 -0000 1.497 +++ net/pfvar.h 4 Jan 2021 12:52:02 -0000 @@ -762,7 +762,6 @@ struct pf_state { struct pf_sn_head src_nodes; struct pf_state_key *key[2]; /* addresses stack and wire */ struct pfi_kif *kif; - struct pfi_kif *rt_kif; u_int64_t packets[2]; u_int64_t bytes[2]; int32_t creation; ----8<-------8<-------8<-------8<-------8<------------8<---- > > The rt_kif in pf_state still exists. The diff below should not > be necessary. Maybe you forgot to clean pfvar.h. > so either rt_kif must stay for a while, or your new diff (rebased on top of stuff committed already) must be expanded by the nit pick I've sent. to put it clear: I'm concerned the diff posted here: https://marc.info/?l=openbsd-tech&m=160976516119388&w=2 is not complete and should not be committed as is. thanks and regards sashan > > > ----8<-------8<-------8<-------8<-------8<------------8<---- > > diff --git a/sys/net/pf.c b/sys/net/pf.c > > index b8766df1686..3f9f5b13add 100644 > > --- a/sys/net/pf.c > > +++ b/sys/net/pf.c > > @@ -3428,16 +3428,13 @@ pf_set_rt_ifp(struct pf_state *s, struct pf_addr > > *saddr, sa_family_t af, > > struct pf_rule *r = s->rule.ptr; > > int rv; > > > > - s->rt_kif = NULL; > > if (!r->rt) > > return (0); > > > > rv = pf_map_addr(af, r, saddr, &s->rt_addr, NULL, sns, > > &r->route, PF_SN_ROUTE); > > - if (rv == 0) { > > - s->rt_kif = r->route.kif; > > + if (rv == 0) > > s->natrule.ptr = r; > > - } > > > > return (rv); > > } > > ----8<-------8<-------8<-------8<-------8<------------8<---- > > > > > > thanks and > > regards > > sashan >