Skip to content

Commit 2e47301

Browse files
jukkarjukkar
committed
net: mgmt: Use layer codes defined in net_mgmt.h
Instead of hard coding some random value to layer code, use the code that is registered in net_mgmt.h This way it is easier to keep track of used layer codes in the future, and we also allow out-of-tree components a way to avoid allocating same layer code to in-tree-source code. Signed-off-by: Jukka Rissanen <[email protected]>
1 parent e19e163 commit 2e47301

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

‎include/zephyr/net/coap_mgmt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C" {
3131

3232
/* CoAP events */
3333
#define NET_COAP_LAYER NET_MGMT_LAYER_L4
34-
#define NET_COAP_CODE 0x1c0
34+
#define NET_COAP_CODE NET_MGMT_LAYER_CODE_COAP
3535
#define NET_COAP_IF_BASE (NET_MGMT_EVENT_BIT | \
3636
NET_MGMT_LAYER(NET_COAP_LAYER) | \
3737
NET_MGMT_LAYER_CODE(NET_COAP_CODE))

‎include/zephyr/net/conn_mgr_connectivity.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern "C" {
3636

3737
/* Connectivity Events */
3838
#define NET_MGMT_CONN_LAYER NET_MGMT_LAYER(NET_MGMT_LAYER_L2)
39-
#define NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(0x207)
39+
#define NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(NET_MGMT_LAYER_CODE_CONN)
4040
#define NET_MGMT_CONN_BASE (NET_MGMT_CONN_LAYER | NET_MGMT_CONN_CODE | \
4141
NET_MGMT_EVENT_BIT)
4242
#define NET_MGMT_CONN_IF_EVENT (NET_MGMT_IFACE_BIT | NET_MGMT_CONN_BASE)

‎include/zephyr/net/ethernet_mgmt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C" {
3131
/** @cond INTERNAL_HIDDEN */
3232

3333
#define NET_ETHERNET_LAYER NET_MGMT_LAYER_L2
34-
#define NET_ETHERNET_CODE 0x208
34+
#define NET_ETHERNET_CODE NET_MGMT_LAYER_CODE_ETHERNET
3535
#define NET_ETHERNET_BASE (NET_MGMT_IFACE_BIT | \
3636
NET_MGMT_LAYER(NET_ETHERNET_LAYER) | \
3737
NET_MGMT_LAYER_CODE(NET_ETHERNET_CODE))

‎include/zephyr/net/ieee802154_mgmt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern "C" {
4646
*/
4747

4848
#define NET_IEEE802154_LAYER NET_MGMT_LAYER_L2
49-
#define NET_IEEE802154_CODE 0x154
49+
#define NET_IEEE802154_CODE NET_MGMT_LAYER_CODE_IEEE802514
5050
#define NET_IEEE802154_BASE (NET_MGMT_IFACE_BIT | \
5151
NET_MGMT_LAYER(NET_IEEE802154_LAYER) |\
5252
NET_MGMT_LAYER_CODE(NET_IEEE802154_CODE))

‎include/zephyr/net/net_event.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern "C" {
2828

2929
/* Network Interface events */
3030
#define NET_IF_LAYER NET_MGMT_LAYER_L2
31-
#define NET_IF_CORE_CODE 0x001
31+
#define NET_IF_CORE_CODE NET_MGMT_LAYER_CODE_IFACE
3232
#define NET_EVENT_IF_BASE (NET_MGMT_EVENT_BIT | \
3333
NET_MGMT_IFACE_BIT | \
3434
NET_MGMT_LAYER(NET_IF_LAYER) | \
@@ -43,7 +43,7 @@ enum net_event_if_cmd {
4343

4444
/* IPv6 Events */
4545
#define NET_IPV6_LAYER NET_MGMT_LAYER_L3
46-
#define NET_IPV6_CORE_CODE 0x060
46+
#define NET_IPV6_CORE_CODE NET_MGMT_LAYER_CODE_IPV6
4747
#define NET_EVENT_IPV6_BASE (NET_MGMT_EVENT_BIT | \
4848
NET_MGMT_IFACE_BIT | \
4949
NET_MGMT_LAYER(NET_IPV6_LAYER) | \
@@ -79,7 +79,7 @@ enum net_event_ipv6_cmd {
7979

8080
/* IPv4 Events*/
8181
#define NET_IPV4_LAYER NET_MGMT_LAYER_L3
82-
#define NET_IPV4_CORE_CODE 0x004
82+
#define NET_IPV4_CORE_CODE NET_MGMT_LAYER_CODE_IPV4
8383
#define NET_EVENT_IPV4_BASE (NET_MGMT_EVENT_BIT | \
8484
NET_MGMT_IFACE_BIT | \
8585
NET_MGMT_LAYER(NET_IPV4_LAYER) | \
@@ -104,7 +104,7 @@ enum net_event_ipv4_cmd {
104104
};
105105

106106
/* L4 network events */
107-
#define NET_L4_LAYER 0x114
107+
#define NET_L4_LAYER NET_MGMT_LAYER_L4
108108
#define NET_L4_CORE_CODE NET_MGMT_LAYER_CODE_L4
109109
#define NET_EVENT_L4_BASE (NET_MGMT_EVENT_BIT | \
110110
NET_MGMT_IFACE_BIT | \

‎include/zephyr/net/net_stats.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ struct net_stats_wifi {
734734
/** @cond INTERNAL_HIDDEN */
735735

736736
#define NET_STATS_LAYER NET_MGMT_LAYER_L3
737-
#define NET_STATS_CODE 0x101
737+
#define NET_STATS_CODE NET_MGMT_LAYER_CODE_STATS
738738
#define NET_STATS_BASE (NET_MGMT_LAYER(NET_STATS_LAYER) | \
739739
NET_MGMT_LAYER_CODE(NET_STATS_CODE))
740740

‎include/zephyr/net/ppp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ void net_ppp_init(struct net_if *iface);
562562
#define PPP_L2_CTX_TYPE struct ppp_context
563563

564564
#define NET_PPP_LAYER NET_MGMT_LAYER_L2
565-
#define NET_PPP_CODE 0x209
565+
#define NET_PPP_CODE NET_MGMT_LAYER_CODE_PPP
566566
#define NET_PPP_BASE (NET_MGMT_IFACE_BIT | \
567567
NET_MGMT_LAYER(NET_PPP_LAYER) | \
568568
NET_MGMT_LAYER_CODE(NET_PPP_CODE))

‎include/zephyr/net/virtual_mgmt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ extern "C" {
3131
/** @cond INTERNAL_HIDDEN */
3232

3333
#define NET_VIRTUAL_INTERFACE_LAYER NET_MGMT_LAYER_L2
34-
#define NET_VIRTUAL_INTERFACE_CODE 0x209
34+
#define NET_VIRTUAL_INTERFACE_CODE NET_MGMT_LAYER_CODE_VIRTUAL
3535
#define NET_VIRTUAL_INTERFACE_BASE \
3636
(NET_MGMT_IFACE_BIT | \
3737
NET_MGMT_LAYER(NET_VIRTUAL_INTERFACE_LAYER) | \

‎include/zephyr/net/wifi_mgmt.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extern "C" {
3333
/** @cond INTERNAL_HIDDEN */
3434

3535
#define NET_WIFI_LAYER NET_MGMT_LAYER_L2
36-
#define NET_WIFI_CODE 0x156
36+
#define NET_WIFI_CODE NET_MGMT_LAYER_CODE_WIFI
3737
#define NET_WIFI_BASE (NET_MGMT_IFACE_BIT | \
3838
NET_MGMT_LAYER(NET_WIFI_LAYER) | \
3939
NET_MGMT_LAYER_CODE(NET_WIFI_CODE))

‎modules/hostap/src/supp_events.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/* Connectivity Events */
1313
#define NET_MGMT_SUPPLICANT_LAYER NET_MGMT_LAYER_L3
14-
#define NET_MGMT_SUPPLICANT_CODE 0x157
14+
#define NET_MGMT_SUPPLICANT_CODE NET_MGMT_LAYER_CODE_HOSTAP
1515
#define NET_MGMT_SUPPLICANT_BASE (NET_MGMT_LAYER(NET_MGMT_SUPPLICANT_LAYER) | \
1616
NET_MGMT_LAYER_CODE(NET_MGMT_SUPPLICANT_CODE) | \
1717
NET_MGMT_IFACE_BIT)

0 commit comments

Comments
 (0)