diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-06-15 01:45:19 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-06-15 01:45:19 +0000 |
| commit | de92edb6b40acca5f92bbd5dd5fc05f52923f0cd (patch) | |
| tree | 893aca9ae1367e7ea2d586dce0f636c5e22a8598 /sys/contrib | |
| parent | 0d395ced064ef2b8552aa3cac8df26f23da67356 (diff) | |
| download | FreeBSD-src-de92edb6b40acca5f92bbd5dd5fc05f52923f0cd.zip FreeBSD-src-de92edb6b40acca5f92bbd5dd5fc05f52923f0cd.tar.gz | |
Transform tbr_dequeue into a function pointer in order to build drivers with
ALTQ enabled versions of IFQ_* macros by default, as requested by serveral
others. This is a follow-up to the quick fix I committed yesterday which
turned off the ALTQ checks for non-ALTQ kernels.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 6 | ||||
| -rw-r--r-- | sys/contrib/altq/altq/if_altq.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 435f7ab..b673d3c 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -91,6 +91,7 @@ */ static void tbr_timeout(void *); int (*altq_input)(struct mbuf *, int) = NULL; +static struct mbuf *tbr_dequeue(struct ifaltq *, int); static int tbr_timer = 0; /* token bucket regulator timer */ static struct callout tbr_callout = CALLOUT_INITIALIZER; @@ -312,7 +313,7 @@ altq_assert(file, line, failedexpr) #define TBR_SCALE(x) ((int64_t)(x) << TBR_SHIFT) #define TBR_UNSCALE(x) ((x) >> TBR_SHIFT) -struct mbuf * +static struct mbuf * tbr_dequeue(ifq, op) struct ifaltq *ifq; int op; @@ -370,6 +371,9 @@ tbr_set(ifq, profile) struct tb_profile *profile; { struct tb_regulator *tbr, *otbr; + + if (tbr_dequeue_ptr == NULL) + tbr_dequeue_ptr = tbr_dequeue; if (machclk_freq == 0) init_machclk(); diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/contrib/altq/altq/if_altq.h index 8e60587..0676e40 100644 --- a/sys/contrib/altq/altq/if_altq.h +++ b/sys/contrib/altq/altq/if_altq.h @@ -181,9 +181,9 @@ extern int altq_attach(struct ifaltq *, int, void *, extern int altq_detach(struct ifaltq *); extern int altq_enable(struct ifaltq *); extern int altq_disable(struct ifaltq *); -extern struct mbuf *tbr_dequeue(struct ifaltq *, int); +extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int); extern int (*altq_input)(struct mbuf *, int); -#if 1 /* ALTQ3_CLFIER_COMPAT */ +#if 0 /* ALTQ3_CLFIER_COMPAT */ void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *); #endif #endif /* _KERNEL */ |
