summaryrefslogtreecommitdiff
path: root/cesar/mac
diff options
context:
space:
mode:
authorlaranjeiro2010-07-07 15:30:55 +0000
committerlaranjeiro2010-07-07 15:30:55 +0000
commit77246f314683d3e9d376ea063564ed30ba4c6970 (patch)
treee637d2e8c224447f5d4293f2e873377df6a1f48d /cesar/mac
parent150c23236ff4b03e3cd20794a3ebd2a4555c7cd9 (diff)
cesar/mac/sar: remove empty lines
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@7281 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'cesar/mac')
-rw-r--r--cesar/mac/sar/src/sar.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/cesar/mac/sar/src/sar.c b/cesar/mac/sar/src/sar.c
index 23eeee0a30..d7c12f40b8 100644
--- a/cesar/mac/sar/src/sar.c
+++ b/cesar/mac/sar/src/sar.c
@@ -18,10 +18,8 @@
#include "mac/common/timings.h"
#include "mac/common/ntb.h"
#include "mac/common/store.h"
-
#include "mac/common/mfs.h"
#include "mac/pbproc/pbproc.h"
-
#include "mac/sar/sar.h"
#include "mac/sar/inc/sar_context.h"
#include "mac/sar/inc/sar.h"
@@ -779,11 +777,9 @@ sar_msdu_add__send_frame (sar_t *ctx, u8 *buffer, u16 length, mfs_tx_t *mfs,
msdu.mfs = mfs;
msdu.buffer_address = buffer;
msdu.user_data = user_data;
-
msdu.arrival_ntb = arrival_time_ntb;
SAR_TRACE (TX, phy_date (), buffer, length, mfs->common.tei,
mfs->common.lid, arrival_time_ntb);
-
/* Lock DSR because this function can be called in DSR or task context. */
arch_dsr_lock ();
sar_segmentation_run (ctx, &msdu);
@@ -1128,18 +1124,14 @@ sar_reassembly_run (sar_t *ctx, sar_mpdu_t *rx)
}
else
{
-
if (MAC_TEI_IS_STA(rx->rx.params.tei))
sar_rx_mfs_cmd_apply (ctx, &rx->rx.params);
-
sar_rx_mpdu_process (ctx, rx);
-
if (rx->rx.mfs)
{
sar_expiration_mfs_update_ntb (ctx, rx->rx.mfs, rx->arrival_ntb);
sar_mac_frame_reconstitute (ctx, &rx->rx.mfs->rx, &ctx->data_ctx);
}
-
if (rx->rx.mfs_mme)
{
sar_expiration_mfs_update_ntb (ctx, rx->rx.mfs_mme,
@@ -1169,7 +1161,6 @@ sar_rx_mpdu_process (sar_t *ctx, sar_mpdu_t * rx)
{
pb_t *rx_head;
pb_t *pb_new;
-
mfs_rx_t *mfs_current = NULL;
pb_t *pb_current = NULL;
bool mme = false;
@@ -1253,7 +1244,6 @@ sar_rx_mpdu_process (sar_t *ctx, sar_mpdu_t * rx)
}
}
}
-
/* The MFS may not exists (case of the lid ones). */
if (mfs_current)
{
@@ -1880,7 +1870,6 @@ sar_tx_msdu_expiration (sar_t *ctx, sar_msdu_t * msdu)
{
dbg_assert (msdu);
dbg_assert (ctx);
-
if (lesseq_mod2p32 (
msdu->arrival_ntb + msdu->mfs->common.expiration_delay_tck,
mac_ntb()))