diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-19 17:14:41 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-19 17:14:41 +0000 |
commit | 3269fc6455b4bd8297844dde38271fce80b01c60 (patch) | |
tree | 6f22aaf3effe683efabc3652df62957945098fba /sys/net/pf_norm.c | |
parent | 69b06212da880d85a6eb230152c1080423517f91 (diff) |
unifdef INET in net code as a precursor to removing the pretend option.
long live the one true internet.
ok henning mikeb
Diffstat (limited to 'sys/net/pf_norm.c')
-rw-r--r-- | sys/net/pf_norm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index 2ec32c0700e..0f97a746453 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.171 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.172 2014/12/19 17:14:40 tedu Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -905,13 +905,11 @@ pf_normalize_tcp_init(struct pf_pdesc *pd, struct pf_state_peer *src, bzero(src->scrub, sizeof(*src->scrub)); switch (pd->af) { -#ifdef INET case AF_INET: { struct ip *h = mtod(pd->m, struct ip *); src->scrub->pfss_ttl = h->ip_ttl; break; } -#endif /* INET */ #ifdef INET6 case AF_INET6: { struct ip6_hdr *h = mtod(pd->m, struct ip6_hdr *); @@ -1006,7 +1004,6 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, u_short *reason, * firewall state code. */ switch (pd->af) { -#ifdef INET case AF_INET: { if (src->scrub) { struct ip *h = mtod(pd->m, struct ip *); @@ -1016,7 +1013,6 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, u_short *reason, } break; } -#endif /* INET */ #ifdef INET6 case AF_INET6: { if (src->scrub) { |