summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaranjeiro2008-02-19 14:13:16 +0000
committerlaranjeiro2008-02-19 14:13:16 +0000
commiteaf8667ca9df5db6692890b833b61e4a8e2d9be3 (patch)
tree5e0bc16ec6745e80abaec9f1b326b59e09aba02f
parentdfd13ff397f5bca48ed8954d85a82a0be75a388c (diff)
Replace the SAR_MSDU_PAYLOAD by the ETH_PACKET defined in the common/defs directory.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1430 017c9cb6-072f-447c-8318-d5b54f68fe89
-rw-r--r--mac/sar/inc/sar_mf.h8
-rw-r--r--mac/sar/src/sar_mf.c4
2 files changed, 5 insertions, 7 deletions
diff --git a/mac/sar/inc/sar_mf.h b/mac/sar/inc/sar_mf.h
index 45e539540c..b9980b20fe 100644
--- a/mac/sar/inc/sar_mf.h
+++ b/mac/sar/inc/sar_mf.h
@@ -15,17 +15,15 @@
*/
#include "mac/pbproc/pbproc.h"
+#include "common/defs/ethernet.h"
#define SAR_MF_MFH_SIZE 2
#define SAR_MF_ATS_SIZE 4
#define SAR_MF_ICV_SIZE 4
-// See homeplug av specification page 663.
-#define SAR_MSDU_PAYLOAD_MAX_SIZE 1518
-#define SAR_MSDU_PAYLOAD_MIN_SIZE 60
-#define SAR_MF_MAX_SIZE (SAR_MF_MFH_SIZE + SAR_MF_ATS_SIZE + SAR_MSDU_PAYLOAD_MAX_SIZE + SAR_MF_ICV_SIZE)
-#define SAR_MF_MIN_SIZE (SAR_MF_MFH_SIZE + SAR_MF_ATS_SIZE + SAR_MSDU_PAYLOAD_MIN_SIZE + SAR_MF_ICV_SIZE)
+#define SAR_MF_MAX_SIZE (SAR_MF_MFH_SIZE + SAR_MF_ATS_SIZE + ETH_PACKET_MAX_SIZE + SAR_MF_ICV_SIZE)
+#define SAR_MF_MIN_SIZE (SAR_MF_MFH_SIZE + SAR_MF_ATS_SIZE + ETH_PACKET_MIN_SIZE + SAR_MF_ICV_SIZE)
//#define SAR_MAX_MF_POSITION_MANAGE_EXPIRATION (BLK_SIZE - 6)
diff --git a/mac/sar/src/sar_mf.c b/mac/sar/src/sar_mf.c
index 6cc4db97ad..55f593be63 100644
--- a/mac/sar/src/sar_mf.c
+++ b/mac/sar/src/sar_mf.c
@@ -92,8 +92,8 @@ uint mf_get_length (pb_t *pb, uint offset, bool payload_only)
length = length >> 2;
}
- if (length < SAR_MSDU_PAYLOAD_MIN_SIZE || length
- > SAR_MSDU_PAYLOAD_MAX_SIZE)
+ if (length < ETH_PACKET_MIN_SIZE || length
+ > ETH_PACKET_MAX_SIZE)
return 0;
else if (payload_only)
return length + 1;