|
@@ -2901,7 +2901,6 @@ enum bna_tx_event {
|
|
TX_E_FAIL = 3,
|
|
TX_E_FAIL = 3,
|
|
TX_E_STARTED = 4,
|
|
TX_E_STARTED = 4,
|
|
TX_E_STOPPED = 5,
|
|
TX_E_STOPPED = 5,
|
|
- TX_E_PRIO_CHANGE = 6,
|
|
|
|
TX_E_CLEANUP_DONE = 7,
|
|
TX_E_CLEANUP_DONE = 7,
|
|
TX_E_BW_UPDATE = 8,
|
|
TX_E_BW_UPDATE = 8,
|
|
};
|
|
};
|
|
@@ -2942,9 +2941,6 @@ bna_tx_sm_stopped(struct bna_tx *tx, enum bna_tx_event event)
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
- break;
|
|
|
|
-
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|
|
@@ -2965,28 +2961,23 @@ bna_tx_sm_start_wait(struct bna_tx *tx, enum bna_tx_event event)
|
|
{
|
|
{
|
|
switch (event) {
|
|
switch (event) {
|
|
case TX_E_STOP:
|
|
case TX_E_STOP:
|
|
- tx->flags &= ~(BNA_TX_F_PRIO_CHANGED | BNA_TX_F_BW_UPDATED);
|
|
|
|
|
|
+ tx->flags &= ~BNA_TX_F_BW_UPDATED;
|
|
bfa_fsm_set_state(tx, bna_tx_sm_stop_wait);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_stop_wait);
|
|
break;
|
|
break;
|
|
|
|
|
|
case TX_E_FAIL:
|
|
case TX_E_FAIL:
|
|
- tx->flags &= ~(BNA_TX_F_PRIO_CHANGED | BNA_TX_F_BW_UPDATED);
|
|
|
|
|
|
+ tx->flags &= ~BNA_TX_F_BW_UPDATED;
|
|
bfa_fsm_set_state(tx, bna_tx_sm_stopped);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_stopped);
|
|
break;
|
|
break;
|
|
|
|
|
|
case TX_E_STARTED:
|
|
case TX_E_STARTED:
|
|
- if (tx->flags & (BNA_TX_F_PRIO_CHANGED | BNA_TX_F_BW_UPDATED)) {
|
|
|
|
- tx->flags &= ~(BNA_TX_F_PRIO_CHANGED |
|
|
|
|
- BNA_TX_F_BW_UPDATED);
|
|
|
|
|
|
+ if (tx->flags & BNA_TX_F_BW_UPDATED) {
|
|
|
|
+ tx->flags &= ~BNA_TX_F_BW_UPDATED;
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_stop_wait);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_stop_wait);
|
|
} else
|
|
} else
|
|
bfa_fsm_set_state(tx, bna_tx_sm_started);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_started);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
- tx->flags |= BNA_TX_F_PRIO_CHANGED;
|
|
|
|
- break;
|
|
|
|
-
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
tx->flags |= BNA_TX_F_BW_UPDATED;
|
|
tx->flags |= BNA_TX_F_BW_UPDATED;
|
|
break;
|
|
break;
|
|
@@ -3028,7 +3019,6 @@ bna_tx_sm_started(struct bna_tx *tx, enum bna_tx_event event)
|
|
tx->tx_cleanup_cbfn(tx->bna->bnad, tx);
|
|
tx->tx_cleanup_cbfn(tx->bna->bnad, tx);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_stop_wait);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_stop_wait);
|
|
break;
|
|
break;
|
|
@@ -3061,7 +3051,6 @@ bna_tx_sm_stop_wait(struct bna_tx *tx, enum bna_tx_event event)
|
|
bna_tx_enet_stop(tx);
|
|
bna_tx_enet_stop(tx);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|
|
@@ -3081,7 +3070,6 @@ bna_tx_sm_cleanup_wait(struct bna_tx *tx, enum bna_tx_event event)
|
|
{
|
|
{
|
|
switch (event) {
|
|
switch (event) {
|
|
case TX_E_FAIL:
|
|
case TX_E_FAIL:
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|
|
@@ -3119,7 +3107,6 @@ bna_tx_sm_prio_stop_wait(struct bna_tx *tx, enum bna_tx_event event)
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_cleanup_wait);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_prio_cleanup_wait);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|
|
@@ -3147,7 +3134,6 @@ bna_tx_sm_prio_cleanup_wait(struct bna_tx *tx, enum bna_tx_event event)
|
|
bfa_fsm_set_state(tx, bna_tx_sm_failed);
|
|
bfa_fsm_set_state(tx, bna_tx_sm_failed);
|
|
break;
|
|
break;
|
|
|
|
|
|
- case TX_E_PRIO_CHANGE:
|
|
|
|
case TX_E_BW_UPDATE:
|
|
case TX_E_BW_UPDATE:
|
|
/* No-op */
|
|
/* No-op */
|
|
break;
|
|
break;
|