summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/net/if_pfsync.c5
-rw-r--r--sys/net/pf.c6
-rw-r--r--sys/net/pfvar.h6
3 files changed, 7 insertions, 10 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 66ca0b191c3..44b998d6751 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.188 2012/06/30 00:16:15 mikeb Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.189 2012/07/26 12:25:31 mikeb Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -589,8 +589,7 @@ pfsync_state_import(struct pfsync_state *sp, int flags)
st->direction = sp->direction;
st->log = sp->log;
st->timeout = sp->timeout;
- /* XXX replace state_flags post 5.0 */
- st->state_flags = sp->state_flags | ntohs(sp->all_state_flags);
+ st->state_flags = ntohs(sp->state_flags);
st->max_mss = ntohs(sp->max_mss);
st->min_ttl = sp->min_ttl;
st->set_tos = sp->set_tos;
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 47a2e510cef..783f8897034 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.808 2012/07/10 17:33:48 bluhm Exp $ */
+/* $OpenBSD: pf.c,v 1.809 2012/07/26 12:25:31 mikeb Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1113,9 +1113,7 @@ pf_state_export(struct pfsync_state *sp, struct pf_state *st)
sp->direction = st->direction;
sp->log = st->log;
sp->timeout = st->timeout;
- /* XXX replace state_flags post 5.0 */
- sp->state_flags = st->state_flags;
- sp->all_state_flags = htons(st->state_flags);
+ sp->state_flags = htons(st->state_flags);
if (!SLIST_EMPTY(&st->src_nodes))
sp->sync_flags |= PFSYNC_FLAG_SRCNODE;
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 3580ec40809..8ea5fa2eb20 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.366 2012/07/13 11:14:04 henning Exp $ */
+/* $OpenBSD: pfvar.h,v 1.367 2012/07/26 12:25:31 mikeb Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -906,13 +906,13 @@ struct pfsync_state {
u_int8_t proto;
u_int8_t direction;
u_int8_t log;
- u_int8_t state_flags; /* XXX remove after 5.0 */
+ u_int8_t pad0;
u_int8_t timeout;
u_int8_t sync_flags;
u_int8_t updates;
u_int8_t min_ttl;
u_int8_t set_tos;
- u_int16_t all_state_flags;
+ u_int16_t state_flags;
u_int8_t pad[2];
} __packed;