1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00

Merge pull request #9353 from miri64/gnrc_sixlowpan/opt/rm-pad

gnrc_sixlowpan: fix order of gnrc_sixlowpan_msg_frag_t
This commit is contained in:
Cenk Gündoğan 2018-06-18 10:59:27 +02:00 committed by GitHub
commit e08fd546cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -73,11 +73,11 @@ typedef struct {
* @brief Definition of 6LoWPAN fragmentation type. * @brief Definition of 6LoWPAN fragmentation type.
*/ */
typedef struct { typedef struct {
kernel_pid_t pid; /**< PID of the interface */
gnrc_pktsnip_t *pkt; /**< Pointer to the IPv6 packet to be fragmented */ gnrc_pktsnip_t *pkt; /**< Pointer to the IPv6 packet to be fragmented */
size_t datagram_size; /**< Length of just the IPv6 packet to be fragmented */ size_t datagram_size; /**< Length of just the IPv6 packet to be fragmented */
uint16_t offset; /**< Offset of the Nth fragment from the beginning of the uint16_t offset; /**< Offset of the Nth fragment from the beginning of the
* payload datagram */ * payload datagram */
kernel_pid_t pid; /**< PID of the interface */
} gnrc_sixlowpan_msg_frag_t; } gnrc_sixlowpan_msg_frag_t;
/** /**

View File

@ -35,7 +35,7 @@
static kernel_pid_t _pid = KERNEL_PID_UNDEF; static kernel_pid_t _pid = KERNEL_PID_UNDEF;
#ifdef MODULE_GNRC_SIXLOWPAN_FRAG #ifdef MODULE_GNRC_SIXLOWPAN_FRAG
static gnrc_sixlowpan_msg_frag_t fragment_msg = {KERNEL_PID_UNDEF, NULL, 0, 0}; static gnrc_sixlowpan_msg_frag_t fragment_msg = {NULL, 0, 0, KERNEL_PID_UNDEF};
#endif #endif
#if ENABLE_DEBUG #if ENABLE_DEBUG