manifest: update openthread

Regular OpenThread upmerge to bring in a fix for a possible infinite loop and support for DNS service subtypes. Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>
zephyrproject-rtos · Jul 7, 2021 · bf3c6e7 · bf3c6e7
1 parent ad0e3a4
commit bf3c6e7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 19 deletions.
diff --git a/samples/net/lwm2m_client/overlay-ot.conf b/samples/net/lwm2m_client/overlay-ot.conf
@@ -27,7 +27,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
 CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
 
 CONFIG_OPENTHREAD_CHANNEL=26
-CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
+CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"

diff --git a/samples/net/sockets/echo_client/overlay-ot.conf b/samples/net/sockets/echo_client/overlay-ot.conf
@@ -24,7 +24,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
 CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
 
 CONFIG_OPENTHREAD_CHANNEL=26
-CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
+CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"

diff --git a/samples/net/sockets/echo_server/overlay-ot.conf b/samples/net/sockets/echo_server/overlay-ot.conf
@@ -24,7 +24,7 @@ CONFIG_OPENTHREAD_L2_DEBUG=y
 CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
 
 CONFIG_OPENTHREAD_CHANNEL=26
-CONFIG_OPENTHREAD_MASTERKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
+CONFIG_OPENTHREAD_NETWORKKEY="00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::2"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::1"

diff --git a/subsys/net/l2/openthread/Kconfig.features b/subsys/net/l2/openthread/Kconfig.features
@@ -183,8 +183,11 @@ config OPENTHREAD_OTNS
 config OPENTHREAD_FULL_LOGS
 	bool "Enable OpenThread full logs"
 
-config OPENTHREAD_LINK_METRICS
-	bool "Enable Link Metrics support"
+config OPENTHREAD_LINK_METRICS_INITIATOR
+	bool "Enable Link Metrics initiator"
+
+config OPENTHREAD_LINK_METRICS_SUBJECT
+	bool "Enable Link Metrics subject"
 
 config OPENTHREAD_SRP_CLIENT
 	bool "Enable SRP Client support"

diff --git a/subsys/net/l2/openthread/Kconfig.thread b/subsys/net/l2/openthread/Kconfig.thread
@@ -24,10 +24,10 @@ config OPENTHREAD_XPANID
 	  Extended PAN ID for OpenThread with
 	  format "de:ad:00:be:ef:00:ca:fe"
 
-config OPENTHREAD_MASTERKEY
-	string "Default Thread Master Key"
+config OPENTHREAD_NETWORKKEY
+	string "Default Thread Network Key"
 	help
-	  Master Key for OpenThread with format
+	  Network Key for OpenThread with format
 	  "00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff"
 
 config OPENTHREAD_JOINER_AUTOSTART

diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
@@ -70,10 +70,10 @@ LOG_MODULE_REGISTER(net_l2_openthread, CONFIG_OPENTHREAD_L2_LOG_LEVEL);
 #define OT_XPANID ""
 #endif
 
-#if defined(CONFIG_OPENTHREAD_MASTERKEY)
-#define OT_MASTERKEY CONFIG_OPENTHREAD_MASTERKEY
+#if defined(CONFIG_OPENTHREAD_NETWORKKEY)
+#define OT_NETWORKKEY CONFIG_OPENTHREAD_NETWORKKEY
 #else
-#define OT_MASTERKEY ""
+#define OT_NETWORKKEY ""
 #endif
 
 #if defined(CONFIG_OPENTHREAD_JOINER_PSKD)
@@ -395,18 +395,18 @@ int openthread_start(struct openthread_context *ot_context)
 		NET_DBG("Loading OpenThread default configuration.");
 
 		otExtendedPanId xpanid;
-		otMasterKey     masterkey;
+		otNetworkKey    networkKey;
 
 		otThreadSetNetworkName(ot_instance, OT_NETWORK_NAME);
 		otLinkSetChannel(ot_instance, OT_CHANNEL);
 		otLinkSetPanId(ot_instance, OT_PANID);
 		net_bytes_from_str(xpanid.m8, 8, (char *)OT_XPANID);
 		otThreadSetExtendedPanId(ot_instance, &xpanid);
 
-		if (strlen(OT_MASTERKEY)) {
-			net_bytes_from_str(masterkey.m8, OT_MASTER_KEY_SIZE,
-					   (char *)OT_MASTERKEY);
-			otThreadSetMasterKey(ot_instance, &masterkey);
+		if (strlen(OT_NETWORKKEY)) {
+			net_bytes_from_str(networkKey.m8, OT_NETWORK_KEY_SIZE,
+					   (char *)OT_NETWORKKEY);
+			otThreadSetNetworkKey(ot_instance, &networkKey);
 		}
 	}
 

diff --git a/subsys/net/lib/openthread/platform/radio.c b/subsys/net/lib/openthread/platform/radio.c
@@ -1066,7 +1066,7 @@ uint8_t otPlatRadioGetCslAccuracy(otInstance *aInstance)
 	return radio_api->get_sch_acc(radio_dev);
 }
 
-#if defined(CONFIG_OPENTHREAD_LINK_METRICS)
+#if defined(CONFIG_OPENTHREAD_LINK_METRICS_SUBJECT)
 /**
  * Header IE format - IEEE Std. 802.15.4-2015, 7.4.2.1 && 7.4.2.2
  *
@@ -1180,4 +1180,5 @@ otError otPlatRadioConfigureEnhAckProbing(otInstance *aInstance, otLinkMetrics a
 
 	return result ? OT_ERROR_FAILED : OT_ERROR_NONE;
 }
-#endif /* OPENTHREAD_CONFIG_MLE_LINK_METRICS_ENABLE */
+
+#endif /* CONFIG_OPENTHREAD_LINK_METRICS_SUBJECT */
diff --git a/west.yml b/west.yml
@@ -130,7 +130,7 @@ manifest:
       revision: 6010f0523cbc75f551d9256cf782f173177acdef
       path: modules/lib/open-amp
     - name: openthread
-      revision: d7eaf6f421569bb9f6be64db4c8108e53e4278b6
+      revision: eae63bb47a31ed61d008f49a024873026626ebcc
       path: modules/lib/openthread
     - name: segger
       revision: 3a52ab222133193802d3c3b4d21730b9b1f1d2f6