diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -598,6 +598,25 @@ #endif /* PF_INET6_ONLY */ #endif /* PF_INET_INET6 */ +#ifdef _KERNEL +#ifdef INET6 +static void inline +pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) +{ + switch (af) { +#ifdef INET + case AF_INET: + memcpy(&dst->v4, &src->v4, sizeof(dst->v4)); + break; +#endif /* INET */ + case AF_INET6: + memcpy(&dst->v6, &src->v6, sizeof(dst->v6)); + break; + } +} +#endif /* INET6 */ +#endif + /* * XXX callers not FIB-aware in our version of pf yet. * OpenBSD fixed it later it seems, 2010/05/07 13:33:16 claudio. diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -798,23 +798,6 @@ s->src.state = newstate; } -#ifdef INET6 -void -pf_addrcpy(struct pf_addr *dst, const struct pf_addr *src, sa_family_t af) -{ - switch (af) { -#ifdef INET - case AF_INET: - memcpy(&dst->v4, &src->v4, sizeof(dst->v4)); - break; -#endif /* INET */ - case AF_INET6: - memcpy(&dst->v6, &src->v6, sizeof(dst->v6)); - break; - } -} -#endif /* INET6 */ - static void pf_init_threshold(struct pf_threshold *threshold, u_int32_t limit, u_int32_t seconds)