aboutsummaryrefslogtreecommitdiff
path: root/sys/net/altq/altq_subr.c
diff options
context:
space:
mode:
authorEric van Gyzen <vangyzen@FreeBSD.org>2018-12-04 23:46:43 +0000
committerEric van Gyzen <vangyzen@FreeBSD.org>2018-12-04 23:46:43 +0000
commit325fab802e1f40c992141f945d0788c0edfdb1a4 (patch)
treeef413342b6ceb7c51ac62a0d2ac701cc84c6d061 /sys/net/altq/altq_subr.c
parentab8998c2577388bb69ce0e35b85f388b7513a6eb (diff)
downloadsrc-325fab802e1f40c992141f945d0788c0edfdb1a4.tar.gz
src-325fab802e1f40c992141f945d0788c0edfdb1a4.zip
altq: remove ALTQ3_COMPAT code
This code has apparently never compiled on FreeBSD since its introduction in 2004 (r130365). It has certainly not compiled since 2006, when r164033 added #elsif [sic] preprocessor directives. The code was left in the tree to reduce the diff from upstream (KAME). Since that upstream is no longer relevant, remove the long-dead code. This commit is the direct result of: unifdef -m -UALTQ3_COMPAT sys/net/altq/* A later commit will do some manual cleanup. I do not plan to MFC this. If that would help you, go for it.
Notes
Notes: svn path=/head/; revision=341507
Diffstat (limited to 'sys/net/altq/altq_subr.c')
-rw-r--r--sys/net/altq/altq_subr.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/sys/net/altq/altq_subr.c b/sys/net/altq/altq_subr.c
index bce83efcd3a7..af919d5f499d 100644
--- a/sys/net/altq/altq_subr.c
+++ b/sys/net/altq/altq_subr.c
@@ -62,9 +62,6 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <net/altq/altq.h>
-#ifdef ALTQ3_COMPAT
-#include <net/altq/altq_conf.h>
-#endif
/* machine dependent clock related includes */
#include <sys/bus.h>
@@ -155,22 +152,6 @@ altq_attach(ifq, type, discipline, enqueue, dequeue, request, clfier, classify)
return ENXIO;
}
-#ifdef ALTQ3_COMPAT
- /*
- * pfaltq can override the existing discipline, but altq3 cannot.
- * check these if clfier is not NULL (which implies altq3).
- */
- if (clfier != NULL) {
- if (ALTQ_IS_ENABLED(ifq)) {
- IFQ_UNLOCK(ifq);
- return EBUSY;
- }
- if (ALTQ_IS_ATTACHED(ifq)) {
- IFQ_UNLOCK(ifq);
- return EEXIST;
- }
- }
-#endif
ifq->altq_type = type;
ifq->altq_disc = discipline;
ifq->altq_enqueue = enqueue;
@@ -179,11 +160,6 @@ altq_attach(ifq, type, discipline, enqueue, dequeue, request, clfier, classify)
ifq->altq_clfier = clfier;
ifq->altq_classify = classify;
ifq->altq_flags &= (ALTQF_CANTCHANGE|ALTQF_ENABLED);
-#ifdef ALTQ3_COMPAT
-#ifdef ALTQ_KLD
- altq_module_incref(type);
-#endif
-#endif
IFQ_UNLOCK(ifq);
return 0;
}
@@ -206,11 +182,6 @@ altq_detach(ifq)
IFQ_UNLOCK(ifq);
return (0);
}
-#ifdef ALTQ3_COMPAT
-#ifdef ALTQ_KLD
- altq_module_declref(ifq->altq_type);
-#endif
-#endif
ifq->altq_type = ALTQT_NONE;
ifq->altq_disc = NULL;