summaryrefslogtreecommitdiff
path: root/cesar/mac/common
diff options
context:
space:
mode:
Diffstat (limited to 'cesar/mac/common')
-rw-r--r--cesar/mac/common/defs.h3
-rw-r--r--cesar/mac/common/mfs.h7
-rw-r--r--cesar/mac/common/src/mfs.c3
3 files changed, 6 insertions, 7 deletions
diff --git a/cesar/mac/common/defs.h b/cesar/mac/common/defs.h
index aca528df18..eb6c79b9a7 100644
--- a/cesar/mac/common/defs.h
+++ b/cesar/mac/common/defs.h
@@ -25,6 +25,9 @@
/** Maximum number of physical PHY blocks per MPDU. */
#define MAC_MAX_PB_PER_MPDU 236
+/** Number of channel access priority. */
+#define MAC_CAP_NB 4
+
/** Link identifiers. */
enum mac_lid_t
{
diff --git a/cesar/mac/common/mfs.h b/cesar/mac/common/mfs.h
index 2c05ae6576..316a1a659b 100644
--- a/cesar/mac/common/mfs.h
+++ b/cesar/mac/common/mfs.h
@@ -15,7 +15,6 @@
#include "mac/common/pb.h"
#include "mac/ca/mfs.h"
-#include "lib/heap.h"
#include "lib/list.h"
#include "mac/common/link_stats.h"
@@ -125,11 +124,9 @@ struct mfs_tx_t
/** Burst count for global links. */
u8 burst_count;
- /** Heap link used by Channel Access. */
- heap_node_t ca_prio_link;
/** List link used by Channel Access for MFS to be held until next beacon
- * period. */
- list_node_t ca_held_link;
+ * period or priority sorted MFS. */
+ list_node_t ca_link;
/** Channel Access MFS state. */
ca_mfs_state_t ca_state;
diff --git a/cesar/mac/common/src/mfs.c b/cesar/mac/common/src/mfs.c
index a684e8949e..2a4fbfe4bd 100644
--- a/cesar/mac/common/src/mfs.c
+++ b/cesar/mac/common/src/mfs.c
@@ -81,8 +81,7 @@ mfs_tx_init (mfs_tx_t *mfs, bool bcast, bool mme, uint lid, uint tei)
mfs_common_init (&mfs->common, true, bcast, mme, lid, tei);
mfs->cfp = false;
mfs->burst_count = 0;
- heap_node_init (&mfs->ca_prio_link);
- list_init_node (&mfs->ca_held_link);
+ list_init_node (&mfs->ca_link);
mfs->ca_state = CA_MFS_STATE_UNKNOWN;
mfs->seg_nb = 0;
mfs->pending_seg_nb = 0;