Revert "[nrf fromlist] openthread: avoid warning when CONFIG_NET_MGMT_EVENT=n"

rlubos · rlubos · commit 471a185e7fc1 · 2020-08-26T10:29:59.000+02:00
This reverts commit 3dfd0b5. Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
@@ -100,14 +100,13 @@ static k_tid_t ot_tid;
 static struct net_linkaddr *ll_addr;
 static otStateChangedCallback state_changed_cb;
 
+static struct net_mgmt_event_callback ip6_addr_cb;
+
 k_tid_t openthread_thread_id_get(void)
 {
 	return ot_tid;
 }
 
-#ifdef CONFIG_NET_MGMT_EVENT
-static struct net_mgmt_event_callback ip6_addr_cb;
-
 static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb,
 				    uint32_t mgmt_event, struct net_if *iface)
 {
@@ -123,7 +122,6 @@ static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb,
 		add_ipv6_maddr_to_ot(ot_context);
 	}
 }
-#endif
 
 void otPlatRadioGetIeeeEui64(otInstance *instance, uint8_t *ieee_eui64)
 {

Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,13 @@ static k_tid_t ot_tid;`
`100`	`100`	`static struct net_linkaddr *ll_addr;`
`101`	`101`	`static otStateChangedCallback state_changed_cb;`
`102`	`102`
	`103`	`+static struct net_mgmt_event_callback ip6_addr_cb;`
	`104`	`+`
`103`	`105`	`k_tid_t openthread_thread_id_get(void)`
`104`	`106`	`{`
`105`	`107`	`return ot_tid;`
`106`	`108`	`}`
`107`	`109`
`108`		`-#ifdef CONFIG_NET_MGMT_EVENT`
`109`		`-static struct net_mgmt_event_callback ip6_addr_cb;`
`110`		`-`
`111`	`110`	`static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb,`
`112`	`111`	`uint32_t mgmt_event, struct net_if *iface)`
`113`	`112`	`{`
`@@ -123,7 +122,6 @@ static void ipv6_addr_event_handler(struct net_mgmt_event_callback *cb,`
`123`	`122`	`add_ipv6_maddr_to_ot(ot_context);`
`124`	`123`	`}`
`125`	`124`	`}`
`126`		`-#endif`
`127`	`125`
`128`	`126`	`void otPlatRadioGetIeeeEui64(otInstance instance, uint8_t ieee_eui64)`
`129`	`127`	`{`