summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2013-01-02 15:49:18 +0100
committerNicolas Schodet2013-01-07 09:34:39 +0100
commit59f25d0489585fb64c1e742b73eb976b137eb626 (patch)
tree01bdaf925f017c2acf1d8af575db60483da5c816
parent58e547d49496aab61b47c904dd6973a3bcee2132 (diff)
cesar/mac/pbproc: handle received FC before prepared MPDU is canceled
Handling FC is more urgent, MPDU cancel can be made later. Also remove disabled code which were never enabled.
-rw-r--r--cesar/mac/pbproc/src/fsm_tx_data.c15
-rw-r--r--cesar/mac/pbproc/test/pbproc/src/tx_data.c2
2 files changed, 3 insertions, 14 deletions
diff --git a/cesar/mac/pbproc/src/fsm_tx_data.c b/cesar/mac/pbproc/src/fsm_tx_data.c
index dd532410e1..e75dbbdbd5 100644
--- a/cesar/mac/pbproc/src/fsm_tx_data.c
+++ b/cesar/mac/pbproc/src/fsm_tx_data.c
@@ -258,20 +258,9 @@ pbproc_ftda__tx_wait_sackd__rx_fc (pbproc_t *ctx, u32 rx_date,
}
else
{
- /* Not our SACK, may contain our SACKD. */
-#if 0
- if (our sackd)
- {
- if (!ctx->access.cfp)
- ca_backoff_success (ctx->ca);
- }
- else
-#endif
- {
- pbproc_prep_mpdu_cancel_burst (ctx);
- ctx->stats.tx_data_wack_noack++;
- }
pbproc_fhfc_handle_fc (ctx, rx_date, fc_av);
+ pbproc_prep_mpdu_cancel_burst (ctx);
+ ctx->stats.tx_data_wack_noack++;
}
}
diff --git a/cesar/mac/pbproc/test/pbproc/src/tx_data.c b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
index 9070ab982f..cc246c6804 100644
--- a/cesar/mac/pbproc/test/pbproc/src/tx_data.c
+++ b/cesar/mac/pbproc/test/pbproc/src/tx_data.c
@@ -137,13 +137,13 @@ tx_data_test_common_f (test_t t, test_pbproc_t *tp, u32 date, mfs_tx_t *mfs,
scenario_entry_t noack_fc_entries[] = {
SCENARIO_ACTION (phy_rx_fc, .rx_date = date + pre_fc_fl_tck,
.fc_av = (u32 *) &sack_fc),
- SCENARIO_EVENT (ca_access_done),
SCENARIO_EVENT (phy_tx_cancel),
SCENARIO_EVENT (ca_access_hold),
SCENARIO_EVENT (phy_rx_prepare_short),
SCENARIO_EVENT (ca_access_vcs_restart,
.end_date = date + pre_fc_fl_tck + MAC_PREAMBLE_TCK
+ MAC_FC_AV_TCK + MAC_CIFS_TCK),
+ SCENARIO_EVENT (ca_access_done),
SCENARIO_END
};
scenario_entry_t *ack_noack_entries = ack_entries;