From 34d9c67deff7c898b52645a08bd6d072255c2332 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Wed, 5 Jul 2017 12:22:22 +0200
Subject: [PATCH] xbee: provide NETOPT_PROTO
Fixes #6973.
The current 6Lo-ND implementation relies on `NETOPT_PROTO` being
returned for an IEEE 802.15.4 device. This isn't ideal, since it mixes
GNRC into device code (and the next iteration of NDP will do it
better), but for now this is the only way to fix #6973.
---
drivers/xbee/xbee.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/xbee/xbee.c b/drivers/xbee/xbee.c
index 78c6dfb63b..7f59ab81be 100644
--- a/drivers/xbee/xbee.c
+++ b/drivers/xbee/xbee.c
@@ -29,6 +29,9 @@
#include "net/eui64.h"
#include "net/netdev.h"
#include "net/ieee802154.h"
+#ifdef MODULE_GNRC
+#include "net/gnrc.h"
+#endif
#define ENABLE_DEBUG (0)
#include "debug.h"
@@ -769,6 +772,14 @@ static int xbee_get(netdev_t *ndev, netopt_t opt, void *value, size_t max_len)
return sizeof(uint16_t);
case NETOPT_NID:
return _get_panid(dev, (uint8_t *)value, max_len);
+#ifdef MODULE_GNRC
+ case NETOPT_PROTO:
+ if (max_len != sizeof(gnrc_nettype_t)) {
+ return -EOVERFLOW;
+ }
+ *((gnrc_nettype_t *)value) = XBEE_DEFAULT_PROTOCOL;
+ return sizeof(gnrc_nettype_t);
+#endif
default:
return -ENOTSUP;
}
--
GitLab