summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenning <henning@openbsd.org>2007-06-11 11:18:14 +0000
committerhenning <henning@openbsd.org>2007-06-11 11:18:14 +0000
commit3675199fb6551e08f6cc1699a48eb4656159681e (patch)
treed29e51195a932b6a354af5af440ba38a04915179
parentRemove the definition and use of the USB_GET_SC macro, no binary change. (diff)
downloadwireguard-openbsd-3675199fb6551e08f6cc1699a48eb4656159681e.tar.xz
wireguard-openbsd-3675199fb6551e08f6cc1699a48eb4656159681e.zip
move definitions for the flags in the mbuf header used by pf to mbuf.h
since we include the mbuf header parts for pf unconditionally, we should be able to check them unconditionally as well. ok mcbride markus
-rw-r--r--sys/net/pfvar.h6
-rw-r--r--sys/sys/mbuf.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 64d1bde1c77..07a944cc16e 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.249 2007/06/01 18:44:23 henning Exp $ */
+/* $OpenBSD: pfvar.h,v 1.250 2007/06/11 11:18:14 henning Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1274,10 +1274,6 @@ struct pf_altq {
u_int32_t qid; /* return value */
};
-#define PF_TAG_GENERATED 0x01
-#define PF_TAG_FRAGCACHE 0x02
-#define PF_TAG_TRANSLATE_LOCALHOST 0x04
-
struct pf_tag {
u_int16_t tag; /* tag id */
};
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 3ffe8ff9038..6447a77c1d5 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.h,v 1.88 2007/05/28 17:16:39 henning Exp $ */
+/* $OpenBSD: mbuf.h,v 1.89 2007/06/11 11:18:14 henning Exp $ */
/* $NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $ */
/*
@@ -85,6 +85,11 @@ struct pkthdr_pf {
u_int8_t routed;
};
+/* pkthdr_pf.flags */
+#define PF_TAG_GENERATED 0x01
+#define PF_TAG_FRAGCACHE 0x02
+#define PF_TAG_TRANSLATE_LOCALHOST 0x04
+
/* record/packet header in first mbuf of chain; valid if M_PKTHDR set */
struct pkthdr {
struct ifnet *rcvif; /* rcv interface */