Page MenuHomeFreeBSD
Files F131719281

D8973.diff
No OneTemporary
Actions

D8973.diff
View Options

Index: head/sys/dev/sfxge/sfxge_tx.c
===================================================================
--- head/sys/dev/sfxge/sfxge_tx.c
+++ head/sys/dev/sfxge/sfxge_tx.c
@@ -1785,26 +1785,6 @@
(rc = tso_init(txq)) != 0)
goto fail3;
- if (sfxge_tx_dpl_get_max <= 0) {
- log(LOG_ERR, "%s=%d must be greater than 0",
- SFXGE_PARAM_TX_DPL_GET_MAX, sfxge_tx_dpl_get_max);
- rc = EINVAL;
- goto fail_tx_dpl_get_max;
- }
- if (sfxge_tx_dpl_get_non_tcp_max <= 0) {
- log(LOG_ERR, "%s=%d must be greater than 0",
- SFXGE_PARAM_TX_DPL_GET_NON_TCP_MAX,
- sfxge_tx_dpl_get_non_tcp_max);
- rc = EINVAL;
- goto fail_tx_dpl_get_max;
- }
- if (sfxge_tx_dpl_put_max < 0) {
- log(LOG_ERR, "%s=%d must be greater or equal to 0",
- SFXGE_PARAM_TX_DPL_PUT_MAX, sfxge_tx_dpl_put_max);
- rc = EINVAL;
- goto fail_tx_dpl_put_max;
- }
-
/* Initialize the deferred packet list. */
stdp = &txq->dpl;
stdp->std_put_max = sfxge_tx_dpl_put_max;
@@ -1849,8 +1829,6 @@
fail_txq_stat_init:
fail_dpl_node:
-fail_tx_dpl_put_max:
-fail_tx_dpl_get_max:
fail3:
fail_txq_node:
free(txq->pend_desc, M_SFXGE);
@@ -1951,6 +1929,26 @@
KASSERT(intr->state == SFXGE_INTR_INITIALIZED,
("intr->state != SFXGE_INTR_INITIALIZED"));
+ if (sfxge_tx_dpl_get_max <= 0) {
+ log(LOG_ERR, "%s=%d must be greater than 0",
+ SFXGE_PARAM_TX_DPL_GET_MAX, sfxge_tx_dpl_get_max);
+ rc = EINVAL;
+ goto fail_tx_dpl_get_max;
+ }
+ if (sfxge_tx_dpl_get_non_tcp_max <= 0) {
+ log(LOG_ERR, "%s=%d must be greater than 0",
+ SFXGE_PARAM_TX_DPL_GET_NON_TCP_MAX,
+ sfxge_tx_dpl_get_non_tcp_max);
+ rc = EINVAL;
+ goto fail_tx_dpl_get_non_tcp_max;
+ }
+ if (sfxge_tx_dpl_put_max < 0) {
+ log(LOG_ERR, "%s=%d must be greater or equal to 0",
+ SFXGE_PARAM_TX_DPL_PUT_MAX, sfxge_tx_dpl_put_max);
+ rc = EINVAL;
+ goto fail_tx_dpl_put_max;
+ }
+
sc->txq_count = SFXGE_TXQ_NTYPES - 1 + sc->intr.n_alloc;
sc->tso_fw_assisted = sfxge_tso_fw_assisted;
@@ -2003,5 +2001,8 @@
fail:
fail_txq_node:
sc->txq_count = 0;
+fail_tx_dpl_put_max:
+fail_tx_dpl_get_non_tcp_max:
+fail_tx_dpl_get_max:
return (rc);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 11, 3:06 PM (15 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23581613
Default Alt Text
D8973.diff (2 KB)

Event Timeline