sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

6loWPAN: Remove usage of the now non-existent msdu_length field.

Browse Source
This commit is contained in:
Gregory Nutt 2017-05-06 06:48:06 -06:00
parent 88fb514b42
commit e072069e2d
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sixlowpan/sixlowpan_framelist.c
View File

@ -535,15 +535,11 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
for (iob = qhead; iob != NULL; iob = qhead) for (iob = qhead; iob != NULL; iob = qhead)
{ {
/* Remove the IOB from the list */ /* Remove the IOB containing the frame from the list */
qhead = iob->io_flink; qhead = iob->io_flink;
iob->io_flink = NULL; iob->io_flink = NULL;
/* Update the MSDU length in the metadata */
meta.msdu_length = iob->io_len - iob->io_offset;
/* And submit the frame to the MAC */ /* And submit the frame to the MAC */
ret = sixlowpan_frame_submit(ieee, &meta, iob); ret = sixlowpan_frame_submit(ieee, &meta, iob);
@ -580,10 +576,6 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
sixlowpan_dumpbuffer("Outgoing frame", sixlowpan_dumpbuffer("Outgoing frame",
(FAR const uint8_t *)iob->io_data, iob->io_len); (FAR const uint8_t *)iob->io_data, iob->io_len);
/* Update the MSDU length in the metadata */
meta.msdu_length = iob->io_len - iob->io_offset;
/* And submit the frame to the MAC */ /* And submit the frame to the MAC */
ret = sixlowpan_frame_submit(ieee, &meta, iob); ret = sixlowpan_frame_submit(ieee, &meta, iob);

15
net/sixlowpan/sixlowpan_framer.c
View File

@ -226,25 +226,18 @@ int sixlowpan_meta_data(FAR struct ieee802154_driver_s *ieee,
meta->dest_addr.panid = g_packet_meta.dpanid; meta->dest_addr.panid = g_packet_meta.dpanid;
/* Handle associated with MSDU. Will increment once per packet, not /* Handle associated with MSDU. Will increment once per packet, not
* necesarily per frame: The MSDU handler will be used for each fragment * necesarily per frame: The same MSDU handle will be used for each
* of a disassembled packet. * fragment of a disassembled packet.
*/ */
meta->msdu_handle = ieee->i_msdu_handle++; meta->msdu_handle = ieee->i_msdu_handle++;
/* Number of bytes contained in the MAC Service Data Unit (MSDU) */
meta->msdu_length = paylen;
/* MSDU flags that may be non-zero */
#ifdef CONFIG_IEEE802154_SECURITY #ifdef CONFIG_IEEE802154_SECURITY
# warning CONFIG_IEEE802154_SECURITY not yet supported" # warning CONFIG_IEEE802154_SECURITY not yet supported
#endif #endif
#ifdef CONFIG_IEEE802154_UWB #ifdef CONFIG_IEEE802154_UWB
# warning CONFIG_IEEE802154_UWB not yet supported" # warning CONFIG_IEEE802154_UWB not yet supported
#endif #endif
/* Ranging left zero */ /* Ranging left zero */