Skip to content

Commit

Permalink
Merge pull request #10822 from miri64/nrfmin/fix/proto-type
Browse files Browse the repository at this point in the history
nrfmin: fix type for NETOPT_PROTO
  • Loading branch information
miri64 authored Jan 18, 2019
2 parents 4e5de1b + 4e53f0f commit 49a05ad
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions cpu/nrf5x_common/radio/nrfmin/nrfmin.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,9 +490,9 @@ static int nrfmin_get(netdev_t *dev, netopt_t opt, void *val, size_t max_len)
return sizeof(uint16_t);
#ifdef MODULE_GNRC_SIXLOWPAN
case NETOPT_PROTO:
assert(max_len >= sizeof(uint16_t));
*((uint16_t *)val) = GNRC_NETTYPE_SIXLOWPAN;
return sizeof(uint16_t);
assert(max_len == sizeof(gnrc_nettype_t));
*((gnrc_nettype_t *)val) = GNRC_NETTYPE_SIXLOWPAN;
return sizeof(gnrc_nettype_t);
#endif
case NETOPT_DEVICE_TYPE:
assert(max_len >= sizeof(uint16_t));
Expand Down

0 comments on commit 49a05ad

Please sign in to comment.