6loWPAN: Some fixed to get a clean compile after last big changes to the radio IOCTLs.

This commit is contained in:
Gregory Nutt
2017-05-05 10:00:18 -06:00
parent 37d8e4fa79
commit 95bacb6a34
4 changed files with 19 additions and 11 deletions
+8 -1
View File
@@ -134,7 +134,9 @@
* Public Types
****************************************************************************/
/* IPv^ TCP/UDP Definitions *************************************************/
/* IPv6 TCP/UDP/ICMPv6 Definitions ******************************************/
#ifdef CONFIG_NET_TCP
/* IPv6 + TCP header. Cast compatible based on IPv6 protocol field. */
struct ipv6tcp_hdr_s
@@ -142,7 +144,9 @@ struct ipv6tcp_hdr_s
struct ipv6_hdr_s ipv6;
struct tcp_hdr_s tcp;
};
#endif
#ifdef CONFIG_NET_UDP
/* IPv6 + UDP header */
struct ipv6udp_hdr_s
@@ -150,7 +154,9 @@ struct ipv6udp_hdr_s
struct ipv6_hdr_s ipv6;
struct udp_hdr_s udp;
};
#endif
#ifdef CONFIG_NET_ICMPv6
/* IPv6 + ICMPv6 header */
struct ipv6icmp_hdr_s
@@ -158,6 +164,7 @@ struct ipv6icmp_hdr_s
struct ipv6_hdr_s ipv6;
struct icmpv6_iphdr_s icmp;
};
#endif
/* In order to provide a customizable IEEE 802.15.4 MAC header, a structure
* of meta data is passed to the MAC network driver, struct
+2 -1
View File
@@ -57,6 +57,7 @@
#include <debug.h>
#include <nuttx/net/sixlowpan.h>
#include <nuttx/wireless/ieee802154/ieee802154_mac.h>
#include "sixlowpan/sixlowpan_internal.h"
@@ -193,7 +194,7 @@ int sixlowpan_src_panid(FAR struct ieee802154_driver_s *ieee,
return ret;
}
*panid = arg.u.getreq.attr_value->panid;
*panid = arg.u.getreq.attr_value.mac.panid;
return OK;
}