Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 09:18:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rwlock

Browse Source
This commit is contained in:
Gregory Nutt
2017-04-07 15:49:03 -06:00
parent 2b1ca79b4b f264e6aec2
commit 7aff0f77d9
8 changed files with 264 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/net/sixlowpan.h
+7 -1
View File
@@ -80,7 +80,7 @@
#define SIXLOWPAN_DISPATCH_FRAG1 0xc0 /* 11000xxx */
#define SIXLOWPAN_DISPATCH_FRAGN 0xe0 /* 11100xxx */
#define SIXLOWPAN_DISPATCH_FRAG_MASK 0xf1 /* 11111000 */
#define SIXLOWPAN_DISPATCH_FRAG_MASK 0xf8 /* 11111000 */
/* HC1 encoding */
@@ -398,6 +398,12 @@ struct ieee802154_driver_s
uint16_t i_reasstag;
/* i_boffset. Offset to the beginning of data in d_buf. As each fragment
* is received, data is placed at an appriate offset added to this.
*/
uint16_t i_boffset;
/* The source MAC address of the fragments being merged */
struct rimeaddr_s i_fragsrc;