X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0a7de7458d150b5d4dffc935ba399be265ef0a1a..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/bsd/net/classq/classq.h

diff --git a/bsd/net/classq/classq.h b/bsd/net/classq/classq.h
index 93ded92bc..a3cd15205 100644
--- a/bsd/net/classq/classq.h
+++ b/bsd/net/classq/classq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
+ * Copyright (c) 2007-2018 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -80,6 +80,30 @@ typedef enum classq_pkt_type {
 	QP_MBUF,        /* mbuf packet */
 } classq_pkt_type_t;
 
+/*
+ * Packet
+ */
+typedef struct classq_pkt {
+	union {
+		struct mbuf             *cp_mbuf;       /* mbuf packet */
+	};
+	classq_pkt_type_t       cp_ptype;
+} classq_pkt_t;
+
+#define CLASSQ_PKT_INITIALIZER(_p)      \
+	(classq_pkt_t){ .cp_mbuf = NULL, .cp_ptype = QP_INVALID }
+
+#define CLASSQ_PKT_INIT(_p)    do {    \
+	(_p)->cp_ptype = QP_INVALID;   \
+	(_p)->cp_mbuf = NULL;          \
+} while (0)
+
+#define CLASSQ_PKT_INIT_MBUF(_p, _m)    do {    \
+	(_p)->cp_ptype = QP_MBUF;               \
+	(_p)->cp_mbuf = (_m);                   \
+} while (0)
+
+
 /*
  * Packet Queue types
  */
@@ -164,19 +188,24 @@ typedef struct _class_queue_ {
 #define CLASSQF_ECN     (CLASSQF_ECN4 | CLASSQF_ECN6)
 
 extern u_int32_t classq_verbose;
+#if DEBUG || DEVELOPMENT
+extern uint16_t fq_codel_quantum;
+#endif /* DEBUG || DEVELOPMENT */
 
 SYSCTL_DECL(_net_classq);
 
 extern void _qinit(class_queue_t *, int, int, classq_pkt_type_t);
-extern void _addq(class_queue_t *, void *);
-extern void _addq_multi(class_queue_t *, void *, void *, u_int32_t, u_int32_t);
-extern void *_getq(class_queue_t *);
-extern void *_getq_all(class_queue_t *, void **, u_int32_t *, u_int64_t *);
-extern void *_getq_tail(class_queue_t *);
-extern void *_getq_random(class_queue_t *);
-extern void *_getq_flow(class_queue_t *, u_int32_t);
-extern void *_getq_scidx_lt(class_queue_t *, u_int32_t);
-extern void _removeq(class_queue_t *, void *);
+extern void _addq(class_queue_t *, classq_pkt_t *);
+extern void _addq_multi(class_queue_t *, classq_pkt_t *, classq_pkt_t *,
+    u_int32_t, u_int64_t);
+extern void _getq(class_queue_t *, classq_pkt_t *);
+extern void _getq_all(class_queue_t *, classq_pkt_t *, classq_pkt_t *,
+    u_int32_t *, u_int64_t *);
+extern void _getq_tail(class_queue_t *, classq_pkt_t *);
+extern void _getq_random(class_queue_t *, classq_pkt_t *);
+extern void _getq_flow(class_queue_t *, classq_pkt_t *, u_int32_t);
+extern void _getq_scidx_lt(class_queue_t *, classq_pkt_t *, u_int32_t);
+extern void _removeq(class_queue_t *, classq_pkt_t *);
 extern void _flushq(class_queue_t *);
 extern void _flushq_flow(class_queue_t *, u_int32_t, u_int32_t *, u_int32_t *);