From c024a1f5690672584b8e02f98ee09435f819698a Mon Sep 17 00:00:00 2001
From: Anthony Merlino <anthony@vergeaero.com>
Date: Mon, 19 Aug 2019 22:24:32 +0000
Subject: [PATCH] Merged in antmerlino/nuttx/xbee-prefix (pull request #1009)

drivers/ieee802154/xbee: Add configuration option for setting the default prefix to use when bringing up the network and setting the IP address.

# Conflicts:
#	drivers/wireless/ieee802154/xbee/xbee_netdev.c

Approved-by: Gregory Nutt <gnutt@nuttx.org>
---
 drivers/wireless/ieee802154/xbee/Kconfig | 24 ++++++++++++++++++++++++
 net/sixlowpan/Kconfig                    |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/drivers/wireless/ieee802154/xbee/Kconfig b/drivers/wireless/ieee802154/xbee/Kconfig
index 31670397aa..2ac741ff66 100644
--- a/drivers/wireless/ieee802154/xbee/Kconfig
+++ b/drivers/wireless/ieee802154/xbee/Kconfig
@@ -5,6 +5,30 @@
 
 if IEEE802154_XBEE
 
+config XBEE_DEFAULT_PREFIX_0
+	hex "IPv6 Prefix 0"
+	default 0xfe80
+	---help---
+		First section of IPv6 Prefix
+
+config XBEE_DEFAULT_PREFIX_1
+	hex "IPv6 Prefix 1"
+	default 0x0000
+	---help---
+		Second section of IPv6 Prefix
+
+config XBEE_DEFAULT_PREFIX_2
+	hex "IPv6 Prefix 2"
+	default 0x0000
+	---help---
+		Third section of IPv6 Prefix
+
+config XBEE_DEFAULT_PREFIX_3
+	hex "IPv6 Prefix 3"
+	default 0x0000
+	---help---
+		Fourth section of IPv6 Prefix
+
 config IEEE802154_XBEE_FREQUENCY
 	int "SPI Frequency for XBee Radio"
 	default 2000000
diff --git a/net/sixlowpan/Kconfig b/net/sixlowpan/Kconfig
index 557db19b6d..1651479ce5 100644
--- a/net/sixlowpan/Kconfig
+++ b/net/sixlowpan/Kconfig
@@ -130,7 +130,7 @@ config NET_6LOWPAN_MAXADDRCONTEXT_PREFIX_0_6
 		Prefix 6 for address context 0 (assumes CONFIG_NET_6LOWPAN_MAXADDRCONTEXT >= 0)
 
 config NET_6LOWPAN_MAXADDRCONTEXT_PREFIX_0_7
-	hex "Address context 0 Prefix 6"
+	hex "Address context 0 Prefix 7"
 	default 0xaa
 	---help---
 		Prefix 7 for address context 0 (assumes CONFIG_NET_6LOWPAN_MAXADDRCONTEXT >= 0)