Module Name: src
Committed By: rmind
Date: Sun Aug 25 16:38:21 UTC 2019
Modified Files:
src/sys/net/npf: npf.h
src/sys/sys: mbuf.h
Log Message:
Move PACKET_TAG_NPF where it belongs to.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/net/npf/npf.h
cvs rdiff -u -r1.219 -r1.220 src/sys/sys/mbuf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.61 src/sys/net/npf/npf.h:1.62
--- src/sys/net/npf/npf.h:1.61 Wed Aug 21 21:45:47 2019
+++ src/sys/net/npf/npf.h Sun Aug 25 16:38:20 2019
@@ -253,8 +253,9 @@ bool npf_autounload_p(void);
#define NPF_LAYER_2 2
#define NPF_LAYER_3 3
-/* XXX mbuf.h: just for now. */
-#define PACKET_TAG_NPF 10
+/*
+ * Flags passed via nbuf tags.
+ */
#define NPF_NTAG_PASS 0x0001
/*
Index: src/sys/sys/mbuf.h
diff -u src/sys/sys/mbuf.h:1.219 src/sys/sys/mbuf.h:1.220
--- src/sys/sys/mbuf.h:1.219 Thu Jan 17 02:47:15 2019
+++ src/sys/sys/mbuf.h Sun Aug 25 16:38:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mbuf.h,v 1.219 2019/01/17 02:47:15 knakahara Exp $ */
+/* $NetBSD: mbuf.h,v 1.220 2019/08/25 16:38:20 rmind Exp $ */
/*
* Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
@@ -799,6 +799,7 @@ int m_tag_copy_chain(struct mbuf *, stru
/* Packet tag types */
#define PACKET_TAG_NONE 0 /* Nothing */
#define PACKET_TAG_SO 4 /* sending socket pointer */
+#define PACKET_TAG_NPF 10 /* packet filter */
#define PACKET_TAG_PF 11 /* packet filter */
#define PACKET_TAG_ALTQ_QID 12 /* ALTQ queue id */
#define PACKET_TAG_IPSEC_OUT_DONE 18
