Update some changes from last merge that are needed on this branch.

This commit is contained in:
Gregory Nutt
2017-04-29 10:26:02 -06:00
parent 3482172a16
commit 80bca0736d
+1 -1
View File
@@ -452,7 +452,7 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
g_pktattrs[PACKETBUF_ATTR_MAC_SEQNO] = 0; g_pktattrs[PACKETBUF_ATTR_MAC_SEQNO] = 0;
verify = sixlowpan_framecreate(ieee, iob, ieee->i_panid); verify = sixlowpan_framecreate(ieee, iob, dest_panid);
DEBUGASSERT(verify == framer_hdrlen); DEBUGASSERT(verify == framer_hdrlen);
UNUSED(verify); UNUSED(verify);