Page MenuHomeFreeBSD
Differential D27481

ldconfig: Retire a.out support
ClosedPublic
Actions

Authored by emaste on Dec 4 2020, 9:38 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 6, 12:36 AM
Unknown Object (File)
Tue, Mar 4, 11:22 PM
Unknown Object (File)
Feb 22 2025, 2:12 PM
Unknown Object (File)
Jan 11 2025, 7:55 PM
Unknown Object (File)
Jan 11 2025, 7:55 PM
Unknown Object (File)
Jan 11 2025, 4:51 PM
Unknown Object (File)
Dec 31 2024, 8:28 PM
Unknown Object (File)
Dec 17 2024, 10:29 PM
View All Files
Subscribers
None

Details

Reviewers
None
Commits
rG50a40d091170: ldconfig: Retire a.out support

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

emaste requested review of this revision.Dec 4 2020, 9:38 PM
emaste created this revision.
emaste added a comment.Dec 4 2020, 10:04 PM

See also D24883

This revision was not accepted when it landed; it landed in state Needs Review.Dec 31 2020, 3:29 PM
Closed by commit rG50a40d091170: ldconfig: Retire a.out support (authored by emaste). · Explain Why
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG50a40d091170: ldconfig: Retire a.out support.

Revision Contents
Changeset List

PathSize
sbin/
ldconfig/
6 lines
10 lines
511 lines

Diff 80342

View Options

sbin/ldconfig/Makefile

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */ static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */
SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW, SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW,
&ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging"); &ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging");
static int ieee80211_ffagemax = -1; /* max time frames held on stage q */ static int ieee80211_ffagemax = -1; /* max time frames held on stage q */
SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW, SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I", &ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I",
"max hold time for fast-frame staging (ms)"); "max hold time for fast-frame staging (ms)");
static void
ff_age_all(void *arg, int npending)
{
struct ieee80211com *ic = arg;
/* XXX cache timer value somewhere (racy) */
ieee80211_ff_age_all(ic, ieee80211_ffagemax + 1);
}
static void
ff_check_cancel_age_timer(struct ieee80211com *ic)
{
struct ieee80211_superg *sg = ic->ic_superg;
IEEE80211_FF_LOCK_ASSERT(ic);
if (sg->ff_stageq[WME_AC_VO].depth == 0 &&
sg->ff_stageq[WME_AC_VI].depth == 0 &&
sg->ff_stageq[WME_AC_BE].depth == 0 &&
sg->ff_stageq[WME_AC_BK].depth == 0) {
struct timeout_task *qtask = &sg->ff_qtimer;
/* NB: may be called from the task itself */
(void) taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL);
}
}
void void
ieee80211_superg_attach(struct ieee80211com *ic) ieee80211_superg_attach(struct ieee80211com *ic)
{ {
struct ieee80211_superg *sg; struct ieee80211_superg *sg;
IEEE80211_FF_LOCK_INIT(ic, ic->ic_name); IEEE80211_FF_LOCK_INIT(ic, ic->ic_name);
sg = (struct ieee80211_superg *) IEEE80211_MALLOC( sg = (struct ieee80211_superg *) IEEE80211_MALLOC(
sizeof(struct ieee80211_superg), M_80211_VAP, sizeof(struct ieee80211_superg), M_80211_VAP,
IEEE80211_M_NOWAIT | IEEE80211_M_ZERO); IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
if (sg == NULL) { if (sg == NULL) {
printf("%s: cannot allocate SuperG state block\n", printf("%s: cannot allocate SuperG state block\n",
__func__); __func__);
return; return;
} }
TIMEOUT_TASK_INIT(ic->ic_tq, &sg->ff_qtimer, 0, ff_age_all, ic);
ic->ic_superg = sg; ic->ic_superg = sg;
/* /*
* Default to not being so aggressive for FF/AMSDU * Default to not being so aggressive for FF/AMSDU
* aging, otherwise we may hold a frame around * aging, otherwise we may hold a frame around
* for way too long before we expire it out. * for way too long before we expire it out.
*/ */
ieee80211_ffagemax = msecs_to_ticks(2); ieee80211_ffagemax = msecs_to_ticks(2);
} }
void void
ieee80211_superg_detach(struct ieee80211com *ic) ieee80211_superg_detach(struct ieee80211com *ic)
{ {
IEEE80211_FF_LOCK_DESTROY(ic);
if (ic->ic_superg != NULL) { if (ic->ic_superg != NULL) {
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
while (taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL) != 0)
taskqueue_drain_timeout(ic->ic_tq, qtask);
IEEE80211_FREE(ic->ic_superg, M_80211_VAP); IEEE80211_FREE(ic->ic_superg, M_80211_VAP);
ic->ic_superg = NULL; ic->ic_superg = NULL;
} }
IEEE80211_FF_LOCK_DESTROY(ic);
} }
void void
ieee80211_superg_vattach(struct ieee80211vap *vap) ieee80211_superg_vattach(struct ieee80211vap *vap)
{ {
struct ieee80211com *ic = vap->iv_ic; struct ieee80211com *ic = vap->iv_ic;
if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */ if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */
▲ Show 20 Lines • Show All 503 Lines • ▼ Show 20 Lines while ((m = sq->head) != NULL && M_AGE_GET(m) < quanta) {
/* clear staging ref to frame */ /* clear staging ref to frame */
ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty")); KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty"));
ni->ni_tx_superg[tid] = NULL; ni->ni_tx_superg[tid] = NULL;
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
sq->depth--; sq->depth--;
} }
if (m == NULL) if (m == NULL) {
sq->tail = NULL; sq->tail = NULL;
else ff_check_cancel_age_timer(ic);
} else
M_AGE_SUB(m, quanta); M_AGE_SUB(m, quanta);
IEEE80211_FF_UNLOCK(ic); IEEE80211_FF_UNLOCK(ic);
IEEE80211_TX_LOCK(ic); IEEE80211_TX_LOCK(ic);
ff_flush(head, m); ff_flush(head, m);
IEEE80211_TX_UNLOCK(ic); IEEE80211_TX_UNLOCK(ic);
} }
static void static void
stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m) stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m)
{ {
int age = ieee80211_ffagemax; int age = ieee80211_ffagemax;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
if (sq->tail != NULL) { if (sq->tail != NULL) {
sq->tail->m_nextpkt = m; sq->tail->m_nextpkt = m;
age -= M_AGE_GET(sq->head); age -= M_AGE_GET(sq->head);
} else } else {
sq->head = m; sq->head = m;
/* Do not restart the timer if task was already scheduled. */
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
taskqueue_enqueue_timeout(ic->ic_tq, qtask, -age);
}
KASSERT(age >= 0, ("age %d", age)); KASSERT(age >= 0, ("age %d", age));
M_AGE_SET(m, age); M_AGE_SET(m, age);
m->m_nextpkt = NULL; m->m_nextpkt = NULL;
sq->tail = m; sq->tail = m;
sq->depth++; sq->depth++;
} }
static void static void
stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged) stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged)
{ {
struct mbuf *m, *mprev; struct mbuf *m, *mprev;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
mprev = NULL; mprev = NULL;
for (m = sq->head; m != NULL; m = m->m_nextpkt) { for (m = sq->head; m != NULL; m = m->m_nextpkt) {
if (m == mstaged) { if (m == mstaged) {
if (mprev == NULL) if (mprev == NULL)
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
else else
mprev->m_nextpkt = m->m_nextpkt; mprev->m_nextpkt = m->m_nextpkt;
if (sq->tail == m) if (sq->tail == m)
sq->tail = mprev; sq->tail = mprev;
sq->depth--; sq->depth--;
ff_check_cancel_age_timer(ic);
return; return;
} }
mprev = m; mprev = m;
} }
printf("%s: packet not found\n", __func__); printf("%s: packet not found\n", __func__);
} }
static uint32_t static uint32_t
▲ Show 20 Lines • Show All 343 Lines • Show Last 20 Lines
View Options

sbin/ldconfig/ldconfig.8

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */ static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */
SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW, SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW,
&ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging"); &ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging");
static int ieee80211_ffagemax = -1; /* max time frames held on stage q */ static int ieee80211_ffagemax = -1; /* max time frames held on stage q */
SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW, SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I", &ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I",
"max hold time for fast-frame staging (ms)"); "max hold time for fast-frame staging (ms)");
static void
ff_age_all(void *arg, int npending)
{
struct ieee80211com *ic = arg;
/* XXX cache timer value somewhere (racy) */
ieee80211_ff_age_all(ic, ieee80211_ffagemax + 1);
}
static void
ff_check_cancel_age_timer(struct ieee80211com *ic)
{
struct ieee80211_superg *sg = ic->ic_superg;
IEEE80211_FF_LOCK_ASSERT(ic);
if (sg->ff_stageq[WME_AC_VO].depth == 0 &&
sg->ff_stageq[WME_AC_VI].depth == 0 &&
sg->ff_stageq[WME_AC_BE].depth == 0 &&
sg->ff_stageq[WME_AC_BK].depth == 0) {
struct timeout_task *qtask = &sg->ff_qtimer;
/* NB: may be called from the task itself */
(void) taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL);
}
}
void void
ieee80211_superg_attach(struct ieee80211com *ic) ieee80211_superg_attach(struct ieee80211com *ic)
{ {
struct ieee80211_superg *sg; struct ieee80211_superg *sg;
IEEE80211_FF_LOCK_INIT(ic, ic->ic_name); IEEE80211_FF_LOCK_INIT(ic, ic->ic_name);
sg = (struct ieee80211_superg *) IEEE80211_MALLOC( sg = (struct ieee80211_superg *) IEEE80211_MALLOC(
sizeof(struct ieee80211_superg), M_80211_VAP, sizeof(struct ieee80211_superg), M_80211_VAP,
IEEE80211_M_NOWAIT | IEEE80211_M_ZERO); IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
if (sg == NULL) { if (sg == NULL) {
printf("%s: cannot allocate SuperG state block\n", printf("%s: cannot allocate SuperG state block\n",
__func__); __func__);
return; return;
} }
TIMEOUT_TASK_INIT(ic->ic_tq, &sg->ff_qtimer, 0, ff_age_all, ic);
ic->ic_superg = sg; ic->ic_superg = sg;
/* /*
* Default to not being so aggressive for FF/AMSDU * Default to not being so aggressive for FF/AMSDU
* aging, otherwise we may hold a frame around * aging, otherwise we may hold a frame around
* for way too long before we expire it out. * for way too long before we expire it out.
*/ */
ieee80211_ffagemax = msecs_to_ticks(2); ieee80211_ffagemax = msecs_to_ticks(2);
} }
void void
ieee80211_superg_detach(struct ieee80211com *ic) ieee80211_superg_detach(struct ieee80211com *ic)
{ {
IEEE80211_FF_LOCK_DESTROY(ic);
if (ic->ic_superg != NULL) { if (ic->ic_superg != NULL) {
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
while (taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL) != 0)
taskqueue_drain_timeout(ic->ic_tq, qtask);
IEEE80211_FREE(ic->ic_superg, M_80211_VAP); IEEE80211_FREE(ic->ic_superg, M_80211_VAP);
ic->ic_superg = NULL; ic->ic_superg = NULL;
} }
IEEE80211_FF_LOCK_DESTROY(ic);
} }
void void
ieee80211_superg_vattach(struct ieee80211vap *vap) ieee80211_superg_vattach(struct ieee80211vap *vap)
{ {
struct ieee80211com *ic = vap->iv_ic; struct ieee80211com *ic = vap->iv_ic;
if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */ if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */
▲ Show 20 Lines • Show All 503 Lines • ▼ Show 20 Lines while ((m = sq->head) != NULL && M_AGE_GET(m) < quanta) {
/* clear staging ref to frame */ /* clear staging ref to frame */
ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty")); KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty"));
ni->ni_tx_superg[tid] = NULL; ni->ni_tx_superg[tid] = NULL;
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
sq->depth--; sq->depth--;
} }
if (m == NULL) if (m == NULL) {
sq->tail = NULL; sq->tail = NULL;
else ff_check_cancel_age_timer(ic);
} else
M_AGE_SUB(m, quanta); M_AGE_SUB(m, quanta);
IEEE80211_FF_UNLOCK(ic); IEEE80211_FF_UNLOCK(ic);
IEEE80211_TX_LOCK(ic); IEEE80211_TX_LOCK(ic);
ff_flush(head, m); ff_flush(head, m);
IEEE80211_TX_UNLOCK(ic); IEEE80211_TX_UNLOCK(ic);
} }
static void static void
stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m) stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m)
{ {
int age = ieee80211_ffagemax; int age = ieee80211_ffagemax;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
if (sq->tail != NULL) { if (sq->tail != NULL) {
sq->tail->m_nextpkt = m; sq->tail->m_nextpkt = m;
age -= M_AGE_GET(sq->head); age -= M_AGE_GET(sq->head);
} else } else {
sq->head = m; sq->head = m;
/* Do not restart the timer if task was already scheduled. */
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
taskqueue_enqueue_timeout(ic->ic_tq, qtask, -age);
}
KASSERT(age >= 0, ("age %d", age)); KASSERT(age >= 0, ("age %d", age));
M_AGE_SET(m, age); M_AGE_SET(m, age);
m->m_nextpkt = NULL; m->m_nextpkt = NULL;
sq->tail = m; sq->tail = m;
sq->depth++; sq->depth++;
} }
static void static void
stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged) stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged)
{ {
struct mbuf *m, *mprev; struct mbuf *m, *mprev;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
mprev = NULL; mprev = NULL;
for (m = sq->head; m != NULL; m = m->m_nextpkt) { for (m = sq->head; m != NULL; m = m->m_nextpkt) {
if (m == mstaged) { if (m == mstaged) {
if (mprev == NULL) if (mprev == NULL)
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
else else
mprev->m_nextpkt = m->m_nextpkt; mprev->m_nextpkt = m->m_nextpkt;
if (sq->tail == m) if (sq->tail == m)
sq->tail = mprev; sq->tail = mprev;
sq->depth--; sq->depth--;
ff_check_cancel_age_timer(ic);
return; return;
} }
mprev = m; mprev = m;
} }
printf("%s: packet not found\n", __func__); printf("%s: packet not found\n", __func__);
} }
static uint32_t static uint32_t
▲ Show 20 Lines • Show All 343 Lines • Show Last 20 Lines
View Options

sbin/ldconfig/ldconfig.c

Show First 20 Lines • Show All 88 Lines • ▼ Show 20 Lines
static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */ static int ieee80211_ffppsmin = 2; /* pps threshold for ff aggregation */
SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW, SYSCTL_INT(_net_wlan, OID_AUTO, ffppsmin, CTLFLAG_RW,
&ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging"); &ieee80211_ffppsmin, 0, "min packet rate before fast-frame staging");
static int ieee80211_ffagemax = -1; /* max time frames held on stage q */ static int ieee80211_ffagemax = -1; /* max time frames held on stage q */
SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW, SYSCTL_PROC(_net_wlan, OID_AUTO, ffagemax, CTLTYPE_INT | CTLFLAG_RW,
&ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I", &ieee80211_ffagemax, 0, ieee80211_sysctl_msecs_ticks, "I",
"max hold time for fast-frame staging (ms)"); "max hold time for fast-frame staging (ms)");
static void
ff_age_all(void *arg, int npending)
{
struct ieee80211com *ic = arg;
/* XXX cache timer value somewhere (racy) */
ieee80211_ff_age_all(ic, ieee80211_ffagemax + 1);
}
static void
ff_check_cancel_age_timer(struct ieee80211com *ic)
{
struct ieee80211_superg *sg = ic->ic_superg;
IEEE80211_FF_LOCK_ASSERT(ic);
if (sg->ff_stageq[WME_AC_VO].depth == 0 &&
sg->ff_stageq[WME_AC_VI].depth == 0 &&
sg->ff_stageq[WME_AC_BE].depth == 0 &&
sg->ff_stageq[WME_AC_BK].depth == 0) {
struct timeout_task *qtask = &sg->ff_qtimer;
/* NB: may be called from the task itself */
(void) taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL);
}
}
void void
ieee80211_superg_attach(struct ieee80211com *ic) ieee80211_superg_attach(struct ieee80211com *ic)
{ {
struct ieee80211_superg *sg; struct ieee80211_superg *sg;
IEEE80211_FF_LOCK_INIT(ic, ic->ic_name); IEEE80211_FF_LOCK_INIT(ic, ic->ic_name);
sg = (struct ieee80211_superg *) IEEE80211_MALLOC( sg = (struct ieee80211_superg *) IEEE80211_MALLOC(
sizeof(struct ieee80211_superg), M_80211_VAP, sizeof(struct ieee80211_superg), M_80211_VAP,
IEEE80211_M_NOWAIT | IEEE80211_M_ZERO); IEEE80211_M_NOWAIT | IEEE80211_M_ZERO);
if (sg == NULL) { if (sg == NULL) {
printf("%s: cannot allocate SuperG state block\n", printf("%s: cannot allocate SuperG state block\n",
__func__); __func__);
return; return;
} }
TIMEOUT_TASK_INIT(ic->ic_tq, &sg->ff_qtimer, 0, ff_age_all, ic);
ic->ic_superg = sg; ic->ic_superg = sg;
/* /*
* Default to not being so aggressive for FF/AMSDU * Default to not being so aggressive for FF/AMSDU
* aging, otherwise we may hold a frame around * aging, otherwise we may hold a frame around
* for way too long before we expire it out. * for way too long before we expire it out.
*/ */
ieee80211_ffagemax = msecs_to_ticks(2); ieee80211_ffagemax = msecs_to_ticks(2);
} }
void void
ieee80211_superg_detach(struct ieee80211com *ic) ieee80211_superg_detach(struct ieee80211com *ic)
{ {
IEEE80211_FF_LOCK_DESTROY(ic);
if (ic->ic_superg != NULL) { if (ic->ic_superg != NULL) {
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
while (taskqueue_cancel_timeout(ic->ic_tq, qtask, NULL) != 0)
taskqueue_drain_timeout(ic->ic_tq, qtask);
IEEE80211_FREE(ic->ic_superg, M_80211_VAP); IEEE80211_FREE(ic->ic_superg, M_80211_VAP);
ic->ic_superg = NULL; ic->ic_superg = NULL;
} }
IEEE80211_FF_LOCK_DESTROY(ic);
} }
void void
ieee80211_superg_vattach(struct ieee80211vap *vap) ieee80211_superg_vattach(struct ieee80211vap *vap)
{ {
struct ieee80211com *ic = vap->iv_ic; struct ieee80211com *ic = vap->iv_ic;
if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */ if (ic->ic_superg == NULL) /* NB: can't do fast-frames w/o state */
▲ Show 20 Lines • Show All 503 Lines • ▼ Show 20 Lines while ((m = sq->head) != NULL && M_AGE_GET(m) < quanta) {
/* clear staging ref to frame */ /* clear staging ref to frame */
ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty")); KASSERT(ni->ni_tx_superg[tid] == m, ("staging queue empty"));
ni->ni_tx_superg[tid] = NULL; ni->ni_tx_superg[tid] = NULL;
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
sq->depth--; sq->depth--;
} }
if (m == NULL) if (m == NULL) {
sq->tail = NULL; sq->tail = NULL;
else ff_check_cancel_age_timer(ic);
} else
M_AGE_SUB(m, quanta); M_AGE_SUB(m, quanta);
IEEE80211_FF_UNLOCK(ic); IEEE80211_FF_UNLOCK(ic);
IEEE80211_TX_LOCK(ic); IEEE80211_TX_LOCK(ic);
ff_flush(head, m); ff_flush(head, m);
IEEE80211_TX_UNLOCK(ic); IEEE80211_TX_UNLOCK(ic);
} }
static void static void
stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m) stageq_add(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *m)
{ {
int age = ieee80211_ffagemax; int age = ieee80211_ffagemax;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
if (sq->tail != NULL) { if (sq->tail != NULL) {
sq->tail->m_nextpkt = m; sq->tail->m_nextpkt = m;
age -= M_AGE_GET(sq->head); age -= M_AGE_GET(sq->head);
} else } else {
sq->head = m; sq->head = m;
/* Do not restart the timer if task was already scheduled. */
struct timeout_task *qtask = &ic->ic_superg->ff_qtimer;
taskqueue_enqueue_timeout(ic->ic_tq, qtask, -age);
}
KASSERT(age >= 0, ("age %d", age)); KASSERT(age >= 0, ("age %d", age));
M_AGE_SET(m, age); M_AGE_SET(m, age);
m->m_nextpkt = NULL; m->m_nextpkt = NULL;
sq->tail = m; sq->tail = m;
sq->depth++; sq->depth++;
} }
static void static void
stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged) stageq_remove(struct ieee80211com *ic, struct ieee80211_stageq *sq, struct mbuf *mstaged)
{ {
struct mbuf *m, *mprev; struct mbuf *m, *mprev;
IEEE80211_FF_LOCK_ASSERT(ic); IEEE80211_FF_LOCK_ASSERT(ic);
mprev = NULL; mprev = NULL;
for (m = sq->head; m != NULL; m = m->m_nextpkt) { for (m = sq->head; m != NULL; m = m->m_nextpkt) {
if (m == mstaged) { if (m == mstaged) {
if (mprev == NULL) if (mprev == NULL)
sq->head = m->m_nextpkt; sq->head = m->m_nextpkt;
else else
mprev->m_nextpkt = m->m_nextpkt; mprev->m_nextpkt = m->m_nextpkt;
if (sq->tail == m) if (sq->tail == m)
sq->tail = mprev; sq->tail = mprev;
sq->depth--; sq->depth--;
ff_check_cancel_age_timer(ic);
return; return;
} }
mprev = m; mprev = m;
} }
printf("%s: packet not found\n", __func__); printf("%s: packet not found\n", __func__);
} }
static uint32_t static uint32_t
▲ Show 20 Lines • Show All 343 Lines • Show Last 20 Lines