Changeset View
Changeset View
Standalone View
Standalone View
sys/net/iflib.c
Show First 20 Lines • Show All 1,462 Lines • ▼ Show 20 Lines | SYSINIT(iflib_record_started, SI_SUB_SMP + 1, SI_ORDER_FIRST, | ||||
iflib_record_started, NULL); | iflib_record_started, NULL); | ||||
#endif | #endif | ||||
static int | static int | ||||
iflib_fast_intr(void *arg) | iflib_fast_intr(void *arg) | ||||
{ | { | ||||
iflib_filter_info_t info = arg; | iflib_filter_info_t info = arg; | ||||
struct grouptask *gtask = info->ifi_task; | struct grouptask *gtask = info->ifi_task; | ||||
int result; | |||||
if (!iflib_started) | if (!iflib_started) | ||||
return (FILTER_HANDLED); | return (FILTER_STRAY); | ||||
DBG_COUNTER_INC(fast_intrs); | DBG_COUNTER_INC(fast_intrs); | ||||
if (info->ifi_filter != NULL && info->ifi_filter(info->ifi_filter_arg) == FILTER_HANDLED) | if (info->ifi_filter != NULL) { | ||||
return (FILTER_HANDLED); | result = info->ifi_filter(info->ifi_filter_arg); | ||||
if ((result & FILTER_SCHEDULE_THREAD) == 0) | |||||
return result; | |||||
marius: "Values in return statements should be enclosed in parentheses" according to style(9),
same for… | |||||
} | |||||
GROUPTASK_ENQUEUE(gtask); | GROUPTASK_ENQUEUE(gtask); | ||||
return (FILTER_HANDLED); | return (FILTER_HANDLED); | ||||
} | } | ||||
static int | static int | ||||
iflib_fast_intr_rxtx(void *arg) | iflib_fast_intr_rxtx(void *arg) | ||||
{ | { | ||||
iflib_filter_info_t info = arg; | iflib_filter_info_t info = arg; | ||||
struct grouptask *gtask = info->ifi_task; | struct grouptask *gtask = info->ifi_task; | ||||
if_ctx_t ctx; | if_ctx_t ctx; | ||||
iflib_rxq_t rxq = (iflib_rxq_t)info->ifi_ctx; | iflib_rxq_t rxq = (iflib_rxq_t)info->ifi_ctx; | ||||
iflib_txq_t txq; | iflib_txq_t txq; | ||||
void *sc; | void *sc; | ||||
int i, cidx; | int i, cidx, result; | ||||
qidx_t txqid; | qidx_t txqid; | ||||
if (!iflib_started) | if (!iflib_started) | ||||
return (FILTER_HANDLED); | return (FILTER_STRAY); | ||||
DBG_COUNTER_INC(fast_intrs); | DBG_COUNTER_INC(fast_intrs); | ||||
if (info->ifi_filter != NULL && info->ifi_filter(info->ifi_filter_arg) == FILTER_HANDLED) | if (info->ifi_filter != NULL) { | ||||
return (FILTER_HANDLED); | result = info->ifi_filter(info->ifi_filter_arg); | ||||
if ((result & FILTER_SCHEDULE_THREAD) == 0) | |||||
return result; | |||||
} | |||||
ctx = rxq->ifr_ctx; | ctx = rxq->ifr_ctx; | ||||
sc = ctx->ifc_softc; | sc = ctx->ifc_softc; | ||||
MPASS(rxq->ifr_ntxqirq); | MPASS(rxq->ifr_ntxqirq); | ||||
for (i = 0; i < rxq->ifr_ntxqirq; i++) { | for (i = 0; i < rxq->ifr_ntxqirq; i++) { | ||||
txqid = rxq->ifr_txqid[i]; | txqid = rxq->ifr_txqid[i]; | ||||
txq = &ctx->ifc_txqs[txqid]; | txq = &ctx->ifc_txqs[txqid]; | ||||
bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map, | bus_dmamap_sync(txq->ift_ifdi->idi_tag, txq->ift_ifdi->idi_map, | ||||
Show All 18 Lines | |||||
} | } | ||||
static int | static int | ||||
iflib_fast_intr_ctx(void *arg) | iflib_fast_intr_ctx(void *arg) | ||||
{ | { | ||||
iflib_filter_info_t info = arg; | iflib_filter_info_t info = arg; | ||||
struct grouptask *gtask = info->ifi_task; | struct grouptask *gtask = info->ifi_task; | ||||
int result; | |||||
if (!iflib_started) | if (!iflib_started) | ||||
return (FILTER_HANDLED); | return (FILTER_STRAY); | ||||
DBG_COUNTER_INC(fast_intrs); | DBG_COUNTER_INC(fast_intrs); | ||||
if (info->ifi_filter != NULL && info->ifi_filter(info->ifi_filter_arg) == FILTER_HANDLED) | if (info->ifi_filter != NULL) { | ||||
return (FILTER_HANDLED); | result = info->ifi_filter(info->ifi_filter_arg); | ||||
if ((result & FILTER_SCHEDULE_THREAD) == 0) | |||||
return result; | |||||
} | |||||
GROUPTASK_ENQUEUE(gtask); | GROUPTASK_ENQUEUE(gtask); | ||||
return (FILTER_HANDLED); | return (FILTER_HANDLED); | ||||
} | } | ||||
static int | static int | ||||
_iflib_irq_alloc(if_ctx_t ctx, if_irq_t irq, int rid, | _iflib_irq_alloc(if_ctx_t ctx, if_irq_t irq, int rid, | ||||
driver_filter_t filter, driver_intr_t handler, void *arg, | driver_filter_t filter, driver_intr_t handler, void *arg, | ||||
▲ Show 20 Lines • Show All 4,991 Lines • Show Last 20 Lines |
"Values in return statements should be enclosed in parentheses" according to style(9),
same for other occurrences of "return result".
Apart from that this patch looks good now, thanks.