no more cbq_opts - CBQ is gone, ok mpi phessler benno

diff --git a/sbin/pfctl/pfctl_parser.h b/sbin/pfctl/pfctl_parser.h
index ec8af3c..89d9fc4 100644 (file)
--- a/sbin/pfctl/pfctl_parser.h
+++ b/sbin/pfctl/pfctl_parser.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pfctl_parser.h,v 1.104 2014/10/27 21:51:32 mikeb Exp $ */
+/*     $OpenBSD: pfctl_parser.h,v 1.105 2016/07/18 19:11:18 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -155,7 +155,6 @@ struct node_hfsc_opts {
 struct node_queue_opt {
        int                      qtype;
        union {
-               struct cbq_opts         cbq_opts;
                struct priq_opts        priq_opts;
                struct node_hfsc_opts   hfsc_opts;
        }                        data;

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 3ae2799..e48b348 100644 (file)
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pfvar.h,v 1.432 2016/07/18 13:17:44 bluhm Exp $ */
+/*     $OpenBSD: pfvar.h,v 1.433 2016/07/18 19:11:18 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1381,18 +1381,6 @@ struct pf_queuespec {
        u_int32_t                        parent_qid;
 };
 
-struct cbq_opts {
-       u_int           minburst;
-       u_int           maxburst;
-       u_int           pktsize;
-       u_int           maxpktsize;
-       u_int           ns_per_byte;
-       u_int           maxidle;
-       int             minidle;
-       u_int           offtime;
-       int             flags;
-};
-
 struct priq_opts {
        int             flags;
 };