From 702776bd1f9caa8a67cf341f99eacc377d1176df Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 24 Apr 2025 13:16:11 +0300 Subject: [PATCH] net: mgmt: Remove the _ from symbols The _ is a reserved character in front of the symbols so remove it from network management event macros. The remaining string without the _ will identify the network API anyway so having underscore there is not needed. Signed-off-by: Jukka Rissanen --- include/zephyr/net/coap_mgmt.h | 18 +-- include/zephyr/net/conn_mgr_connectivity.h | 12 +- include/zephyr/net/ethernet_mgmt.h | 58 ++++---- include/zephyr/net/ieee802154_mgmt.h | 52 +++---- include/zephyr/net/net_event.h | 158 ++++++++++----------- include/zephyr/net/net_stats.h | 46 +++--- include/zephyr/net/ppp.h | 20 +-- include/zephyr/net/virtual_mgmt.h | 30 ++-- include/zephyr/net/wifi_mgmt.h | 104 +++++++------- modules/hostap/src/supp_events.h | 22 +-- subsys/net/lib/shell/events.c | 10 +- 11 files changed, 265 insertions(+), 265 deletions(-) diff --git a/include/zephyr/net/coap_mgmt.h b/include/zephyr/net/coap_mgmt.h index 7997d1e9746..1c160c6abaf 100644 --- a/include/zephyr/net/coap_mgmt.h +++ b/include/zephyr/net/coap_mgmt.h @@ -30,11 +30,11 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ /* CoAP events */ -#define _NET_COAP_LAYER NET_MGMT_LAYER_L4 -#define _NET_COAP_CODE 0x1c0 -#define _NET_COAP_IF_BASE (NET_MGMT_EVENT_BIT | \ - NET_MGMT_LAYER(_NET_COAP_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_COAP_CODE)) +#define NET_COAP_LAYER NET_MGMT_LAYER_L4 +#define NET_COAP_CODE 0x1c0 +#define NET_COAP_IF_BASE (NET_MGMT_EVENT_BIT | \ + NET_MGMT_LAYER(NET_COAP_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_COAP_CODE)) struct coap_service; struct coap_resource; @@ -55,25 +55,25 @@ enum net_event_coap_cmd { * @brief coap_mgmt event raised when a service has started */ #define NET_EVENT_COAP_SERVICE_STARTED \ - (_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STARTED) + (NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STARTED) /** * @brief coap_mgmt event raised when a service has stopped */ #define NET_EVENT_COAP_SERVICE_STOPPED \ - (_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STOPPED) + (NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_SERVICE_STOPPED) /** * @brief coap_mgmt event raised when an observer has been added to a resource */ #define NET_EVENT_COAP_OBSERVER_ADDED \ - (_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_ADDED) + (NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_ADDED) /** * @brief coap_mgmt event raised when an observer has been removed from a resource */ #define NET_EVENT_COAP_OBSERVER_REMOVED \ - (_NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_REMOVED) + (NET_COAP_IF_BASE | NET_EVENT_COAP_CMD_OBSERVER_REMOVED) /** * @brief CoAP Service event structure. diff --git a/include/zephyr/net/conn_mgr_connectivity.h b/include/zephyr/net/conn_mgr_connectivity.h index 4f3da6b4442..6eb6dbc5e15 100644 --- a/include/zephyr/net/conn_mgr_connectivity.h +++ b/include/zephyr/net/conn_mgr_connectivity.h @@ -35,11 +35,11 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ /* Connectivity Events */ -#define _NET_MGMT_CONN_LAYER NET_MGMT_LAYER(NET_MGMT_LAYER_L2) -#define _NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(0x207) -#define _NET_MGMT_CONN_BASE (_NET_MGMT_CONN_LAYER | _NET_MGMT_CONN_CODE | \ +#define NET_MGMT_CONN_LAYER NET_MGMT_LAYER(NET_MGMT_LAYER_L2) +#define NET_MGMT_CONN_CODE NET_MGMT_LAYER_CODE(0x207) +#define NET_MGMT_CONN_BASE (NET_MGMT_CONN_LAYER | NET_MGMT_CONN_CODE | \ NET_MGMT_EVENT_BIT) -#define _NET_MGMT_CONN_IF_EVENT (NET_MGMT_IFACE_BIT | _NET_MGMT_CONN_BASE) +#define NET_MGMT_CONN_IF_EVENT (NET_MGMT_IFACE_BIT | NET_MGMT_CONN_BASE) enum net_event_conn_cmd { NET_EVENT_CONN_CMD_IF_TIMEOUT = 1, @@ -52,13 +52,13 @@ enum net_event_conn_cmd { * @brief net_mgmt event raised when a connection attempt times out */ #define NET_EVENT_CONN_IF_TIMEOUT \ - (_NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_TIMEOUT) + (NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_TIMEOUT) /** * @brief net_mgmt event raised when a non-recoverable connectivity error occurs on an iface */ #define NET_EVENT_CONN_IF_FATAL_ERROR \ - (_NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_FATAL_ERROR) + (NET_MGMT_CONN_IF_EVENT | NET_EVENT_CONN_CMD_IF_FATAL_ERROR) /** diff --git a/include/zephyr/net/ethernet_mgmt.h b/include/zephyr/net/ethernet_mgmt.h index d92f39bc18b..918109a79ce 100644 --- a/include/zephyr/net/ethernet_mgmt.h +++ b/include/zephyr/net/ethernet_mgmt.h @@ -30,12 +30,12 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ -#define _NET_ETHERNET_LAYER NET_MGMT_LAYER_L2 -#define _NET_ETHERNET_CODE 0x208 -#define _NET_ETHERNET_BASE (NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_ETHERNET_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_ETHERNET_CODE)) -#define _NET_ETHERNET_EVENT (_NET_ETHERNET_BASE | NET_MGMT_EVENT_BIT) +#define NET_ETHERNET_LAYER NET_MGMT_LAYER_L2 +#define NET_ETHERNET_CODE 0x208 +#define NET_ETHERNET_BASE (NET_MGMT_IFACE_BIT | \ + NET_MGMT_LAYER(NET_ETHERNET_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_ETHERNET_CODE)) +#define NET_ETHERNET_EVENT (NET_ETHERNET_BASE | NET_MGMT_EVENT_BIT) enum net_request_ethernet_cmd { NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION = 1, @@ -60,97 +60,97 @@ enum net_request_ethernet_cmd { }; #define NET_REQUEST_ETHERNET_SET_AUTO_NEGOTIATION \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_AUTO_NEGOTIATION) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_AUTO_NEGOTIATION); #define NET_REQUEST_ETHERNET_SET_LINK \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_LINK) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_LINK) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_LINK); #define NET_REQUEST_ETHERNET_SET_DUPLEX \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_DUPLEX) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_DUPLEX) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_DUPLEX); #define NET_REQUEST_ETHERNET_SET_MAC_ADDRESS \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_ADDRESS) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_ADDRESS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_MAC_ADDRESS); #define NET_REQUEST_ETHERNET_SET_QAV_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QAV_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QAV_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QAV_PARAM); #define NET_REQUEST_ETHERNET_GET_PORTS_NUM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PORTS_NUM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PORTS_NUM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_PORTS_NUM); #define NET_REQUEST_ETHERNET_SET_QBV_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBV_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBV_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QBV_PARAM); #define NET_REQUEST_ETHERNET_SET_QBU_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBU_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_QBU_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_QBU_PARAM); #define NET_REQUEST_ETHERNET_SET_TXTIME_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXTIME_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXTIME_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_TXTIME_PARAM); #define NET_REQUEST_ETHERNET_SET_PROMISC_MODE \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_PROMISC_MODE) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_PROMISC_MODE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_PROMISC_MODE); #define NET_REQUEST_ETHERNET_GET_PRIORITY_QUEUES_NUM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PRIORITY_QUEUES_NUM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_PRIORITY_QUEUES_NUM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_PRIORITY_QUEUES_NUM); #define NET_REQUEST_ETHERNET_GET_QAV_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QAV_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QAV_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QAV_PARAM); #define NET_REQUEST_ETHERNET_GET_QBV_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBV_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBV_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QBV_PARAM); #define NET_REQUEST_ETHERNET_GET_QBU_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBU_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_QBU_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_QBU_PARAM); #define NET_REQUEST_ETHERNET_GET_TXTIME_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXTIME_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXTIME_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_TXTIME_PARAM); #define NET_REQUEST_ETHERNET_SET_T1S_PARAM \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_T1S_PARAM) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_T1S_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_T1S_PARAM); #define NET_REQUEST_ETHERNET_SET_TXINJECTION_MODE \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXINJECTION_MODE) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_TXINJECTION_MODE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_TXINJECTION_MODE); #define NET_REQUEST_ETHERNET_GET_TXINJECTION_MODE \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXINJECTION_MODE) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_GET_TXINJECTION_MODE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_GET_TXINJECTION_MODE); #define NET_REQUEST_ETHERNET_SET_MAC_FILTER \ - (_NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_FILTER) + (NET_ETHERNET_BASE | NET_REQUEST_ETHERNET_CMD_SET_MAC_FILTER) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_ETHERNET_SET_MAC_FILTER); @@ -196,16 +196,16 @@ enum net_event_ethernet_cmd { }; #define NET_EVENT_ETHERNET_CARRIER_ON \ - (_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_ON) + (NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_ON) #define NET_EVENT_ETHERNET_CARRIER_OFF \ - (_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_OFF) + (NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_CARRIER_OFF) #define NET_EVENT_ETHERNET_VLAN_TAG_ENABLED \ - (_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED) + (NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_ENABLED) #define NET_EVENT_ETHERNET_VLAN_TAG_DISABLED \ - (_NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED) + (NET_ETHERNET_EVENT | NET_EVENT_ETHERNET_CMD_VLAN_TAG_DISABLED) struct net_if; diff --git a/include/zephyr/net/ieee802154_mgmt.h b/include/zephyr/net/ieee802154_mgmt.h index 8996014d056..df388f2f37e 100644 --- a/include/zephyr/net/ieee802154_mgmt.h +++ b/include/zephyr/net/ieee802154_mgmt.h @@ -45,12 +45,12 @@ extern "C" { * @cond INTERNAL_HIDDEN */ -#define _NET_IEEE802154_LAYER NET_MGMT_LAYER_L2 -#define _NET_IEEE802154_CODE 0x154 -#define _NET_IEEE802154_BASE (NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_IEEE802154_LAYER) |\ - NET_MGMT_LAYER_CODE(_NET_IEEE802154_CODE)) -#define _NET_IEEE802154_EVENT (_NET_IEEE802154_BASE | NET_MGMT_EVENT_BIT) +#define NET_IEEE802154_LAYER NET_MGMT_LAYER_L2 +#define NET_IEEE802154_CODE 0x154 +#define NET_IEEE802154_BASE (NET_MGMT_IFACE_BIT | \ + NET_MGMT_LAYER(NET_IEEE802154_LAYER) |\ + NET_MGMT_LAYER_CODE(NET_IEEE802154_CODE)) +#define NET_IEEE802154_EVENT (NET_IEEE802154_BASE | NET_MGMT_EVENT_BIT) enum net_request_ieee802154_cmd { NET_REQUEST_IEEE802154_CMD_SET_ACK = 1, @@ -108,13 +108,13 @@ enum net_request_ieee802154_cmd { */ /** Sets AckTx for all subsequent MLME-DATA (aka TX) requests. */ -#define NET_REQUEST_IEEE802154_SET_ACK (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_ACK) +#define NET_REQUEST_IEEE802154_SET_ACK (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_ACK) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_ACK); /** Unsets AckTx for all subsequent MLME-DATA requests. */ #define NET_REQUEST_IEEE802154_UNSET_ACK \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_UNSET_ACK) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_UNSET_ACK) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_UNSET_ACK); @@ -124,7 +124,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_UNSET_ACK); * See @ref ieee802154_req_params for associated command parameters. */ #define NET_REQUEST_IEEE802154_PASSIVE_SCAN \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_PASSIVE_SCAN) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_PASSIVE_SCAN) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_PASSIVE_SCAN); @@ -134,49 +134,49 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_PASSIVE_SCAN); * See @ref ieee802154_req_params for associated command parameters. */ #define NET_REQUEST_IEEE802154_ACTIVE_SCAN \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_ACTIVE_SCAN) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_ACTIVE_SCAN) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_ACTIVE_SCAN); /** Cancels an ongoing MLME-SCAN(...) command (non-standard). */ #define NET_REQUEST_IEEE802154_CANCEL_SCAN \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_CANCEL_SCAN) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_CANCEL_SCAN) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_CANCEL_SCAN); /** MLME-ASSOCIATE(...) request */ #define NET_REQUEST_IEEE802154_ASSOCIATE \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_ASSOCIATE) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_ASSOCIATE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_ASSOCIATE); /** MLME-DISASSOCIATE(...) request */ #define NET_REQUEST_IEEE802154_DISASSOCIATE \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_DISASSOCIATE) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_DISASSOCIATE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_DISASSOCIATE); /** MLME-SET(phyCurrentChannel) request */ #define NET_REQUEST_IEEE802154_SET_CHANNEL \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_CHANNEL) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_CHANNEL) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_CHANNEL); /** MLME-GET(phyCurrentChannel) request */ #define NET_REQUEST_IEEE802154_GET_CHANNEL \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_CHANNEL) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_CHANNEL) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_CHANNEL); /** MLME-SET(macPanId) request */ #define NET_REQUEST_IEEE802154_SET_PAN_ID \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_PAN_ID) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_PAN_ID) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_PAN_ID); /** MLME-GET(macPanId) request */ #define NET_REQUEST_IEEE802154_GET_PAN_ID \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_PAN_ID) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_PAN_ID) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_PAN_ID); @@ -185,25 +185,25 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_PAN_ID); * and 8.4.3.1, in big endian byte order */ #define NET_REQUEST_IEEE802154_SET_EXT_ADDR \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_EXT_ADDR) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_EXT_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_EXT_ADDR); /** like MLME-GET(macExtendedAddress) but in big endian byte order */ #define NET_REQUEST_IEEE802154_GET_EXT_ADDR \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_EXT_ADDR) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_EXT_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_EXT_ADDR); /** MLME-SET(macShortAddress) request, only allowed for co-ordinators */ #define NET_REQUEST_IEEE802154_SET_SHORT_ADDR \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_SHORT_ADDR) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_SHORT_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_SHORT_ADDR); /** MLME-GET(macShortAddress) request */ #define NET_REQUEST_IEEE802154_GET_SHORT_ADDR \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_SHORT_ADDR) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_SHORT_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_SHORT_ADDR); @@ -212,13 +212,13 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_SHORT_ADDR); * not distinguished) */ #define NET_REQUEST_IEEE802154_GET_TX_POWER \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_TX_POWER) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_TX_POWER) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_TX_POWER); /** MLME-GET(phyUnicastTxPower/phyBroadcastTxPower) request */ #define NET_REQUEST_IEEE802154_SET_TX_POWER \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_TX_POWER) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_TX_POWER) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_TX_POWER); @@ -231,7 +231,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_TX_POWER); * See @ref ieee802154_security_params for associated command parameters. */ #define NET_REQUEST_IEEE802154_SET_SECURITY_SETTINGS \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_SECURITY_SETTINGS) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_SET_SECURITY_SETTINGS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_SECURITY_SETTINGS); @@ -241,7 +241,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_SET_SECURITY_SETTINGS); * See @ref ieee802154_security_params for associated command parameters. */ #define NET_REQUEST_IEEE802154_GET_SECURITY_SETTINGS \ - (_NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_SECURITY_SETTINGS) + (NET_IEEE802154_BASE | NET_REQUEST_IEEE802154_CMD_GET_SECURITY_SETTINGS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_IEEE802154_GET_SECURITY_SETTINGS); @@ -282,7 +282,7 @@ enum net_event_ieee802154_cmd { * See @ref ieee802154_req_params for associated event parameters. */ #define NET_EVENT_IEEE802154_SCAN_RESULT \ - (_NET_IEEE802154_EVENT | NET_EVENT_IEEE802154_CMD_SCAN_RESULT) + (NET_IEEE802154_EVENT | NET_EVENT_IEEE802154_CMD_SCAN_RESULT) /** * @} diff --git a/include/zephyr/net/net_event.h b/include/zephyr/net/net_event.h index 8c403b057c6..b1f4d6773a7 100644 --- a/include/zephyr/net/net_event.h +++ b/include/zephyr/net/net_event.h @@ -27,12 +27,12 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ /* Network Interface events */ -#define _NET_IF_LAYER NET_MGMT_LAYER_L2 -#define _NET_IF_CORE_CODE 0x001 -#define _NET_EVENT_IF_BASE (NET_MGMT_EVENT_BIT | \ +#define NET_IF_LAYER NET_MGMT_LAYER_L2 +#define NET_IF_CORE_CODE 0x001 +#define NET_EVENT_IF_BASE (NET_MGMT_EVENT_BIT | \ NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_IF_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_IF_CORE_CODE)) + NET_MGMT_LAYER(NET_IF_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_IF_CORE_CODE)) enum net_event_if_cmd { NET_EVENT_IF_CMD_DOWN = 1, @@ -42,12 +42,12 @@ enum net_event_if_cmd { }; /* IPv6 Events */ -#define _NET_IPV6_LAYER NET_MGMT_LAYER_L3 -#define _NET_IPV6_CORE_CODE 0x060 -#define _NET_EVENT_IPV6_BASE (NET_MGMT_EVENT_BIT | \ +#define NET_IPV6_LAYER NET_MGMT_LAYER_L3 +#define NET_IPV6_CORE_CODE 0x060 +#define NET_EVENT_IPV6_BASE (NET_MGMT_EVENT_BIT | \ NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_IPV6_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_IPV6_CORE_CODE)) + NET_MGMT_LAYER(NET_IPV6_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_IPV6_CORE_CODE)) enum net_event_ipv6_cmd { NET_EVENT_IPV6_CMD_ADDR_ADD = 1, @@ -78,12 +78,12 @@ enum net_event_ipv6_cmd { }; /* IPv4 Events*/ -#define _NET_IPV4_LAYER NET_MGMT_LAYER_L3 -#define _NET_IPV4_CORE_CODE 0x004 -#define _NET_EVENT_IPV4_BASE (NET_MGMT_EVENT_BIT | \ +#define NET_IPV4_LAYER NET_MGMT_LAYER_L3 +#define NET_IPV4_CORE_CODE 0x004 +#define NET_EVENT_IPV4_BASE (NET_MGMT_EVENT_BIT | \ NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_IPV4_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_IPV4_CORE_CODE)) + NET_MGMT_LAYER(NET_IPV4_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_IPV4_CORE_CODE)) enum net_event_ipv4_cmd { NET_EVENT_IPV4_CMD_ADDR_ADD = 1, @@ -104,12 +104,12 @@ enum net_event_ipv4_cmd { }; /* L4 network events */ -#define _NET_L4_LAYER NET_MGMT_LAYER_L4 -#define _NET_L4_CORE_CODE 0x114 -#define _NET_EVENT_L4_BASE (NET_MGMT_EVENT_BIT | \ +#define NET_L4_LAYER 0x114 +#define NET_L4_CORE_CODE NET_MGMT_LAYER_CODE_L4 +#define NET_EVENT_L4_BASE (NET_MGMT_EVENT_BIT | \ NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_L4_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_L4_CORE_CODE)) + NET_MGMT_LAYER(NET_L4_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_L4_CORE_CODE)) enum net_event_l4_cmd { NET_EVENT_L4_CMD_CONNECTED = 1, @@ -133,189 +133,189 @@ enum net_event_l4_cmd { /** Event emitted when the network interface goes down. */ #define NET_EVENT_IF_DOWN \ - (_NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_DOWN) + (NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_DOWN) /** Event emitted when the network interface goes up. */ #define NET_EVENT_IF_UP \ - (_NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_UP) + (NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_UP) /** Event emitted when the network interface is taken down manually. */ #define NET_EVENT_IF_ADMIN_DOWN \ - (_NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_ADMIN_DOWN) + (NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_ADMIN_DOWN) /** Event emitted when the network interface goes up manually. */ #define NET_EVENT_IF_ADMIN_UP \ - (_NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_ADMIN_UP) + (NET_EVENT_IF_BASE | NET_EVENT_IF_CMD_ADMIN_UP) /** Event emitted when an IPv6 address is added to the system. */ #define NET_EVENT_IPV6_ADDR_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_ADD) /** Event emitted when an IPv6 address is removed from the system. */ #define NET_EVENT_IPV6_ADDR_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_DEL) /** Event emitted when an IPv6 multicast address is added to the system. */ #define NET_EVENT_IPV6_MADDR_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MADDR_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MADDR_ADD) /** Event emitted when an IPv6 multicast address is removed from the system. */ #define NET_EVENT_IPV6_MADDR_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MADDR_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MADDR_DEL) /** Event emitted when an IPv6 prefix is added to the system. */ #define NET_EVENT_IPV6_PREFIX_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PREFIX_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PREFIX_ADD) /** Event emitted when an IPv6 prefix is removed from the system. */ #define NET_EVENT_IPV6_PREFIX_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PREFIX_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PREFIX_DEL) /** Event emitted when an IPv6 multicast group is joined. */ #define NET_EVENT_IPV6_MCAST_JOIN \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MCAST_JOIN) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MCAST_JOIN) /** Event emitted when an IPv6 multicast group is left. */ #define NET_EVENT_IPV6_MCAST_LEAVE \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MCAST_LEAVE) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_MCAST_LEAVE) /** Event emitted when an IPv6 router is added to the system. */ #define NET_EVENT_IPV6_ROUTER_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTER_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTER_ADD) /** Event emitted when an IPv6 router is removed from the system. */ #define NET_EVENT_IPV6_ROUTER_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTER_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTER_DEL) /** Event emitted when an IPv6 route is added to the system. */ #define NET_EVENT_IPV6_ROUTE_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTE_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTE_ADD) /** Event emitted when an IPv6 route is removed from the system. */ #define NET_EVENT_IPV6_ROUTE_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTE_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ROUTE_DEL) /** Event emitted when an IPv6 duplicate address detection succeeds. */ #define NET_EVENT_IPV6_DAD_SUCCEED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DAD_SUCCEED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DAD_SUCCEED) /** Event emitted when an IPv6 duplicate address detection fails. */ #define NET_EVENT_IPV6_DAD_FAILED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DAD_FAILED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DAD_FAILED) /** Event emitted when an IPv6 neighbor is added to the system. */ #define NET_EVENT_IPV6_NBR_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_NBR_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_NBR_ADD) /** Event emitted when an IPv6 neighbor is removed from the system. */ #define NET_EVENT_IPV6_NBR_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_NBR_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_NBR_DEL) /** Event emitted when an IPv6 DHCP client starts. */ #define NET_EVENT_IPV6_DHCP_START \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_START) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_START) /** Event emitted when an IPv6 DHCP client address is bound. */ #define NET_EVENT_IPV6_DHCP_BOUND \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_BOUND) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_BOUND) /** Event emitted when an IPv6 DHCP client is stopped. */ #define NET_EVENT_IPV6_DHCP_STOP \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_STOP) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_DHCP_STOP) /** IPv6 address is deprecated. */ #define NET_EVENT_IPV6_ADDR_DEPRECATED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_DEPRECATED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_ADDR_DEPRECATED) /** IPv6 Privacy extension is enabled. */ #define NET_EVENT_IPV6_PE_ENABLED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_ENABLED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_ENABLED) /** IPv6 Privacy extension is disabled. */ #define NET_EVENT_IPV6_PE_DISABLED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_DISABLED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_DISABLED) /** IPv6 Privacy extension filter is added. */ #define NET_EVENT_IPV6_PE_FILTER_ADD \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_FILTER_ADD) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_FILTER_ADD) /** IPv6 Privacy extension filter is removed. */ #define NET_EVENT_IPV6_PE_FILTER_DEL \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_FILTER_DEL) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PE_FILTER_DEL) /** IPv6 Path MTU is changed. */ #define NET_EVENT_IPV6_PMTU_CHANGED \ - (_NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PMTU_CHANGED) + (NET_EVENT_IPV6_BASE | NET_EVENT_IPV6_CMD_PMTU_CHANGED) /** Event emitted when an IPv4 address is added to the system. */ #define NET_EVENT_IPV4_ADDR_ADD \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ADDR_ADD) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ADDR_ADD) /** Event emitted when an IPv4 address is removed from the system. */ #define NET_EVENT_IPV4_ADDR_DEL \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ADDR_DEL) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ADDR_DEL) /** Event emitted when an IPv4 multicast address is added to the system. */ #define NET_EVENT_IPV4_MADDR_ADD \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MADDR_ADD) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MADDR_ADD) /** Event emitted when an IPv4 multicast address is removed from the system. */ #define NET_EVENT_IPV4_MADDR_DEL \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MADDR_DEL) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MADDR_DEL) /** Event emitted when an IPv4 router is added to the system. */ #define NET_EVENT_IPV4_ROUTER_ADD \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ROUTER_ADD) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ROUTER_ADD) /** Event emitted when an IPv4 router is removed from the system. */ #define NET_EVENT_IPV4_ROUTER_DEL \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ROUTER_DEL) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ROUTER_DEL) /** Event emitted when an IPv4 DHCP client is started. */ #define NET_EVENT_IPV4_DHCP_START \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_START) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_START) /** Event emitted when an IPv4 DHCP client address is bound. */ #define NET_EVENT_IPV4_DHCP_BOUND \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_BOUND) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_BOUND) /** Event emitted when an IPv4 DHCP client is stopped. */ #define NET_EVENT_IPV4_DHCP_STOP \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_STOP) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_DHCP_STOP) /** Event emitted when an IPv4 multicast group is joined. */ #define NET_EVENT_IPV4_MCAST_JOIN \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MCAST_JOIN) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MCAST_JOIN) /** Event emitted when an IPv4 multicast group is left. */ #define NET_EVENT_IPV4_MCAST_LEAVE \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MCAST_LEAVE) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_MCAST_LEAVE) /** Event emitted when an IPv4 address conflict detection succeeds. */ #define NET_EVENT_IPV4_ACD_SUCCEED \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_SUCCEED) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_SUCCEED) /** Event emitted when an IPv4 address conflict detection fails. */ #define NET_EVENT_IPV4_ACD_FAILED \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_FAILED) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_FAILED) /** Event emitted when an IPv4 address conflict was detected after the address * was confirmed as safe to use. It's up to the application to determine on * how to act in such case. */ #define NET_EVENT_IPV4_ACD_CONFLICT \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_CONFLICT) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_ACD_CONFLICT) /** IPv4 Path MTU is changed. */ #define NET_EVENT_IPV4_PMTU_CHANGED \ - (_NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_PMTU_CHANGED) + (NET_EVENT_IPV4_BASE | NET_EVENT_IPV4_CMD_PMTU_CHANGED) /** Event emitted when the system is considered to be connected. * The connected in this context means that the network interface is up, * and the interface has either IPv4 or IPv6 address assigned to it. */ #define NET_EVENT_L4_CONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CONNECTED) /** Event emitted when the system is no longer connected. * Typically this means that network connectivity is lost either by @@ -323,60 +323,60 @@ enum net_event_l4_cmd { * an IP address etc. */ #define NET_EVENT_L4_DISCONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DISCONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DISCONNECTED) /** Event raised when IPv4 network connectivity is available. */ #define NET_EVENT_L4_IPV4_CONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV4_CONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV4_CONNECTED) /** Event emitted when IPv4 network connectivity is lost. */ #define NET_EVENT_L4_IPV4_DISCONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV4_DISCONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV4_DISCONNECTED) /** Event emitted when IPv6 network connectivity is available. */ #define NET_EVENT_L4_IPV6_CONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV6_CONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV6_CONNECTED) /** Event emitted when IPv6 network connectivity is lost. */ #define NET_EVENT_L4_IPV6_DISCONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV6_DISCONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_IPV6_DISCONNECTED) /** Event emitted when a DNS server is added to the system. */ #define NET_EVENT_DNS_SERVER_ADD \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DNS_SERVER_ADD) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DNS_SERVER_ADD) /** Event emitted when a DNS server is removed from the system. */ #define NET_EVENT_DNS_SERVER_DEL \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DNS_SERVER_DEL) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_DNS_SERVER_DEL) /** Event emitted when the system hostname is changed. */ #define NET_EVENT_HOSTNAME_CHANGED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_HOSTNAME_CHANGED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_HOSTNAME_CHANGED) /** Network packet capture is started. */ #define NET_EVENT_CAPTURE_STARTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CAPTURE_STARTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CAPTURE_STARTED) /** Network packet capture is stopped. */ #define NET_EVENT_CAPTURE_STOPPED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CAPTURE_STOPPED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_CAPTURE_STOPPED) /** Event emitted when VPN network connectivity is available. */ #define NET_EVENT_VPN_CONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_CONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_CONNECTED) /** Event emitted when VPN network connectivity is lost. */ #define NET_EVENT_VPN_DISCONNECTED \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_DISCONNECTED) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_DISCONNECTED) /** Event emitted when a VPN peer is added to the system. */ #define NET_EVENT_VPN_PEER_ADD \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_ADD) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_ADD) /** Event emitted when a VPN peer is removed from the system. */ #define NET_EVENT_VPN_PEER_DEL \ - (_NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_DEL) + (NET_EVENT_L4_BASE | NET_EVENT_L4_CMD_VPN_PEER_DEL) /** * @brief Network Management event information structure diff --git a/include/zephyr/net/net_stats.h b/include/zephyr/net/net_stats.h index 588121f5be1..48c3dfa5659 100644 --- a/include/zephyr/net/net_stats.h +++ b/include/zephyr/net/net_stats.h @@ -733,10 +733,10 @@ struct net_stats_wifi { /** @cond INTERNAL_HIDDEN */ -#define _NET_STATS_LAYER NET_MGMT_LAYER_L3 -#define _NET_STATS_CODE 0x101 -#define _NET_STATS_BASE (NET_MGMT_LAYER(_NET_STATS_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_STATS_CODE)) +#define NET_STATS_LAYER NET_MGMT_LAYER_L3 +#define NET_STATS_CODE 0x101 +#define NET_STATS_BASE (NET_MGMT_LAYER(NET_STATS_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_STATS_CODE)) enum net_request_stats_cmd { NET_REQUEST_STATS_CMD_GET_ALL = 1, @@ -764,23 +764,23 @@ enum net_request_stats_cmd { /** Request all network statistics */ #define NET_REQUEST_STATS_GET_ALL \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ALL) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ALL) /** Request all processing error statistics */ #define NET_REQUEST_STATS_GET_PROCESSING_ERROR \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PROCESSING_ERROR) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PROCESSING_ERROR) /** Request all pkt_filter drop statistics */ #define NET_REQUEST_STATS_GET_PKT_FILTER_DROP \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PKT_FILTER_DROP) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PKT_FILTER_DROP) /** Request number of received and sent bytes */ #define NET_REQUEST_STATS_GET_BYTES \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_BYTES) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_BYTES) /** Request IP error statistics */ #define NET_REQUEST_STATS_GET_IP_ERRORS \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IP_ERRORS) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IP_ERRORS) /** @cond INTERNAL_HIDDEN */ @@ -798,7 +798,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PKT_FILTER_DROP); #if defined(CONFIG_NET_STATISTICS_IPV4) /** Request IPv4 statistics */ #define NET_REQUEST_STATS_GET_IPV4 \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV4) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV4) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV4); @@ -808,7 +808,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV4); #if defined(CONFIG_NET_STATISTICS_IPV6) /** Request IPv6 statistics */ #define NET_REQUEST_STATS_GET_IPV6 \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6); @@ -818,7 +818,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6); #if defined(CONFIG_NET_STATISTICS_IPV6_ND) /** Request IPv6 neighbor discovery statistics */ #define NET_REQUEST_STATS_GET_IPV6_ND \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6_ND) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6_ND) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6_ND); @@ -828,7 +828,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6_ND); #if defined(CONFIG_NET_STATISTICS_IPV6_PMTU) /** Request IPv6 Path MTU Discovery statistics */ #define NET_REQUEST_STATS_GET_IPV6_PMTU \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6_PMTU) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV6_PMTU) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6_PMTU); @@ -838,7 +838,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV6_PMTU); #if defined(CONFIG_NET_STATISTICS_IPV4_PMTU) /** Request IPv4 Path MTU Discovery statistics */ #define NET_REQUEST_STATS_GET_IPV4_PMTU \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV4_PMTU) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_IPV4_PMTU) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV4_PMTU); @@ -848,7 +848,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_IPV4_PMTU); #if defined(CONFIG_NET_STATISTICS_ICMP) /** Request ICMPv4 and ICMPv6 statistics */ #define NET_REQUEST_STATS_GET_ICMP \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ICMP) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ICMP) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_ICMP); @@ -858,7 +858,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_ICMP); #if defined(CONFIG_NET_STATISTICS_UDP) /** Request UDP statistics */ #define NET_REQUEST_STATS_GET_UDP \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_UDP) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_UDP) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_UDP); @@ -868,7 +868,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_UDP); #if defined(CONFIG_NET_STATISTICS_TCP) /** Request TCP statistics */ #define NET_REQUEST_STATS_GET_TCP \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_TCP) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_TCP) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_TCP); @@ -878,7 +878,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_TCP); #if defined(CONFIG_NET_STATISTICS_ETHERNET) /** Request Ethernet statistics */ #define NET_REQUEST_STATS_GET_ETHERNET \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ETHERNET) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_ETHERNET) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_ETHERNET); @@ -888,7 +888,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_ETHERNET); #if defined(CONFIG_NET_STATISTICS_PPP) /** Request PPP statistics */ #define NET_REQUEST_STATS_GET_PPP \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PPP) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PPP) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PPP); @@ -898,7 +898,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PPP); #if defined(CONFIG_NET_STATISTICS_VPN) /** Request VPN statistics */ #define NET_REQUEST_STATS_GET_VPN \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_VPN) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_VPN) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_VPN); @@ -910,7 +910,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_VPN); #if defined(CONFIG_NET_STATISTICS_POWER_MANAGEMENT) /** Request network power management statistics */ #define NET_REQUEST_STATS_GET_PM \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PM) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_PM) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PM); @@ -920,7 +920,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_PM); #if defined(CONFIG_NET_STATISTICS_WIFI) /** Request Wi-Fi statistics */ #define NET_REQUEST_STATS_GET_WIFI \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_WIFI) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_GET_WIFI) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_WIFI); @@ -928,7 +928,7 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_GET_WIFI); /** Reset Wi-Fi statistics*/ #define NET_REQUEST_STATS_RESET_WIFI \ - (_NET_STATS_BASE | NET_REQUEST_STATS_CMD_RESET_WIFI) + (NET_STATS_BASE | NET_REQUEST_STATS_CMD_RESET_WIFI) /** @cond INTERNAL_HIDDEN */ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_STATS_RESET_WIFI); diff --git a/include/zephyr/net/ppp.h b/include/zephyr/net/ppp.h index fc31f347122..cd5408c78c1 100644 --- a/include/zephyr/net/ppp.h +++ b/include/zephyr/net/ppp.h @@ -561,12 +561,12 @@ void net_ppp_init(struct net_if *iface); #define PPP_L2_CTX_TYPE struct ppp_context -#define _NET_PPP_LAYER NET_MGMT_LAYER_L2 -#define _NET_PPP_CODE 0x209 -#define _NET_PPP_BASE (NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_PPP_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_PPP_CODE)) -#define _NET_PPP_EVENT (_NET_PPP_BASE | NET_MGMT_EVENT_BIT) +#define NET_PPP_LAYER NET_MGMT_LAYER_L2 +#define NET_PPP_CODE 0x209 +#define NET_PPP_BASE (NET_MGMT_IFACE_BIT | \ + NET_MGMT_LAYER(NET_PPP_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_PPP_CODE)) +#define NET_PPP_EVENT (NET_PPP_BASE | NET_MGMT_EVENT_BIT) enum net_event_ppp_cmd { NET_EVENT_PPP_CMD_CARRIER_ON = 1, @@ -581,19 +581,19 @@ struct net_if; /** Event emitted when PPP carrier is on */ #define NET_EVENT_PPP_CARRIER_ON \ - (_NET_PPP_EVENT | NET_EVENT_PPP_CMD_CARRIER_ON) + (NET_PPP_EVENT | NET_EVENT_PPP_CMD_CARRIER_ON) /** Event emitted when PPP carrier is off */ #define NET_EVENT_PPP_CARRIER_OFF \ - (_NET_PPP_EVENT | NET_EVENT_PPP_CMD_CARRIER_OFF) + (NET_PPP_EVENT | NET_EVENT_PPP_CMD_CARRIER_OFF) /** Event emitted when PPP goes into running phase */ #define NET_EVENT_PPP_PHASE_RUNNING \ - (_NET_PPP_EVENT | NET_EVENT_PPP_CMD_PHASE_RUNNING) + (NET_PPP_EVENT | NET_EVENT_PPP_CMD_PHASE_RUNNING) /** Event emitted when PPP goes into dead phase */ #define NET_EVENT_PPP_PHASE_DEAD \ - (_NET_PPP_EVENT | NET_EVENT_PPP_CMD_PHASE_DEAD) + (NET_PPP_EVENT | NET_EVENT_PPP_CMD_PHASE_DEAD) /** * @brief Raise CARRIER_ON event when PPP is connected. diff --git a/include/zephyr/net/virtual_mgmt.h b/include/zephyr/net/virtual_mgmt.h index 4b5e3163e59..79f4e13a305 100644 --- a/include/zephyr/net/virtual_mgmt.h +++ b/include/zephyr/net/virtual_mgmt.h @@ -30,14 +30,14 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ -#define _NET_VIRTUAL_INTERFACE_LAYER NET_MGMT_LAYER_L2 -#define _NET_VIRTUAL_INTERFACE_CODE 0x209 -#define _NET_VIRTUAL_INTERFACE_BASE \ +#define NET_VIRTUAL_INTERFACE_LAYER NET_MGMT_LAYER_L2 +#define NET_VIRTUAL_INTERFACE_CODE 0x209 +#define NET_VIRTUAL_INTERFACE_BASE \ (NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_VIRTUAL_INTERFACE_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_VIRTUAL_INTERFACE_CODE)) -#define _NET_VIRTUAL_INTERFACE_EVENT \ - (_NET_VIRTUAL_INTERFACE_BASE | NET_MGMT_EVENT_BIT) + NET_MGMT_LAYER(NET_VIRTUAL_INTERFACE_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_VIRTUAL_INTERFACE_CODE)) +#define NET_VIRTUAL_INTERFACE_EVENT \ + (NET_VIRTUAL_INTERFACE_BASE | NET_MGMT_EVENT_BIT) struct virtual_interface_req_params { sa_family_t family; @@ -69,49 +69,49 @@ enum net_request_virtual_interface_cmd { }; #define NET_REQUEST_VIRTUAL_INTERFACE_SET_PEER_ADDRESS \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_PEER_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_PEER_ADDRESS); #define NET_REQUEST_VIRTUAL_INTERFACE_SET_MTU \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_MTU) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_MTU); #define NET_REQUEST_VIRTUAL_INTERFACE_SET_LINK_TYPE \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_LINK_TYPE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_LINK_TYPE); #define NET_REQUEST_VIRTUAL_INTERFACE_GET_PEER_ADDRESS \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_PEER_ADDR) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_PEER_ADDRESS); #define NET_REQUEST_VIRTUAL_INTERFACE_GET_MTU \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_MTU) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_MTU); #define NET_REQUEST_VIRTUAL_INTERFACE_GET_LINK_TYPE \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_LINK_TYPE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_LINK_TYPE); #define NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_SET_PRIVATE_KEY) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_SET_PRIVATE_KEY); #define NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY \ - (_NET_VIRTUAL_INTERFACE_BASE | \ + (NET_VIRTUAL_INTERFACE_BASE | \ NET_REQUEST_VIRTUAL_INTERFACE_CMD_GET_PUBLIC_KEY) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_VIRTUAL_INTERFACE_GET_PUBLIC_KEY); diff --git a/include/zephyr/net/wifi_mgmt.h b/include/zephyr/net/wifi_mgmt.h index 969a6c65ab0..b94cefdfeb7 100644 --- a/include/zephyr/net/wifi_mgmt.h +++ b/include/zephyr/net/wifi_mgmt.h @@ -32,12 +32,12 @@ extern "C" { /** @cond INTERNAL_HIDDEN */ -#define _NET_WIFI_LAYER NET_MGMT_LAYER_L2 -#define _NET_WIFI_CODE 0x156 -#define _NET_WIFI_BASE (NET_MGMT_IFACE_BIT | \ - NET_MGMT_LAYER(_NET_WIFI_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_WIFI_CODE)) -#define _NET_WIFI_EVENT (_NET_WIFI_BASE | NET_MGMT_EVENT_BIT) +#define NET_WIFI_LAYER NET_MGMT_LAYER_L2 +#define NET_WIFI_CODE 0x156 +#define NET_WIFI_BASE (NET_MGMT_IFACE_BIT | \ + NET_MGMT_LAYER(NET_WIFI_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_WIFI_CODE)) +#define NET_WIFI_EVENT (NET_WIFI_BASE | NET_MGMT_EVENT_BIT) #ifdef CONFIG_WIFI_MGMT_SCAN_SSID_FILT_MAX #define WIFI_MGMT_SCAN_SSID_FILT_MAX CONFIG_WIFI_MGMT_SCAN_SSID_FILT_MAX @@ -140,180 +140,180 @@ enum net_request_wifi_cmd { /** Request a Wi-Fi scan */ #define NET_REQUEST_WIFI_SCAN \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_SCAN) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_SCAN) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_SCAN); /** Request a Wi-Fi connect */ #define NET_REQUEST_WIFI_CONNECT \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONNECT) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONNECT) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_CONNECT); /** Request a Wi-Fi disconnect */ #define NET_REQUEST_WIFI_DISCONNECT \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DISCONNECT) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DISCONNECT) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DISCONNECT); /** Request a Wi-Fi access point enable */ #define NET_REQUEST_WIFI_AP_ENABLE \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_ENABLE) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_ENABLE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_ENABLE); /** Request a Wi-Fi access point disable */ #define NET_REQUEST_WIFI_AP_DISABLE \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_DISABLE) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_DISABLE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_DISABLE); /** Request a Wi-Fi RTS threshold */ #define NET_REQUEST_WIFI_AP_RTS_THRESHOLD \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_RTS_THRESHOLD) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_RTS_THRESHOLD) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_RTS_THRESHOLD); /** Request a Wi-Fi network interface status */ #define NET_REQUEST_WIFI_IFACE_STATUS \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_IFACE_STATUS) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_IFACE_STATUS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_IFACE_STATUS); #define NET_REQUEST_WIFI_11K_CONFIG \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_11K_CONFIG) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_11K_CONFIG) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_11K_CONFIG); #define NET_REQUEST_WIFI_11K_NEIGHBOR_REQUEST \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_11K_NEIGHBOR_REQUEST) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_11K_NEIGHBOR_REQUEST) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_11K_NEIGHBOR_REQUEST); /** Request a Wi-Fi power save */ #define NET_REQUEST_WIFI_PS \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PS) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_PS); /** Request a Wi-Fi TWT */ #define NET_REQUEST_WIFI_TWT \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_TWT) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_TWT) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_TWT); #define NET_REQUEST_WIFI_BTWT \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BTWT) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BTWT) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_BTWT); /** Request a Wi-Fi power save configuration */ #define NET_REQUEST_WIFI_PS_CONFIG \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PS_CONFIG) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PS_CONFIG) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_PS_CONFIG); /** Request a Wi-Fi regulatory domain */ #define NET_REQUEST_WIFI_REG_DOMAIN \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_REG_DOMAIN) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_REG_DOMAIN) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_REG_DOMAIN); /** Request current Wi-Fi mode */ #define NET_REQUEST_WIFI_MODE \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_MODE) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_MODE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_MODE); /** Request Wi-Fi packet filter */ #define NET_REQUEST_WIFI_PACKET_FILTER \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PACKET_FILTER) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PACKET_FILTER) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_PACKET_FILTER); /** Request a Wi-Fi channel */ #define NET_REQUEST_WIFI_CHANNEL \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CHANNEL) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CHANNEL) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_CHANNEL); /** Request a Wi-Fi access point to disconnect a station */ #define NET_REQUEST_WIFI_AP_STA_DISCONNECT \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_STA_DISCONNECT) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_STA_DISCONNECT) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_STA_DISCONNECT); /** Request a Wi-Fi version */ #define NET_REQUEST_WIFI_VERSION \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_VERSION) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_VERSION) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_VERSION); /** Request a Wi-Fi connection parameters */ #define NET_REQUEST_WIFI_CONN_PARAMS \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONN_PARAMS) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONN_PARAMS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_CONN_PARAMS); /** Request a Wi-Fi RTS threshold */ #define NET_REQUEST_WIFI_RTS_THRESHOLD \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_RTS_THRESHOLD) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_RTS_THRESHOLD) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD); /** Request a Wi-Fi AP parameters configuration */ #define NET_REQUEST_WIFI_AP_CONFIG_PARAM \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_CONFIG_PARAM) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_AP_CONFIG_PARAM) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM); #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP /** Request a Wi-Fi DPP operation */ #define NET_REQUEST_WIFI_DPP \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP); #endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */ /** Request a Wi-Fi BTM query */ -#define NET_REQUEST_WIFI_BTM_QUERY (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BTM_QUERY) +#define NET_REQUEST_WIFI_BTM_QUERY (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_BTM_QUERY) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_BTM_QUERY); /** Request a Wi-Fi PMKSA cache entries flush */ #define NET_REQUEST_WIFI_PMKSA_FLUSH \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PMKSA_FLUSH) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_PMKSA_FLUSH) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_PMKSA_FLUSH); /** Set Wi-Fi enterprise mode CA/client Cert and key */ #define NET_REQUEST_WIFI_ENTERPRISE_CREDS \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_ENTERPRISE_CREDS) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_ENTERPRISE_CREDS) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_ENTERPRISE_CREDS); /** Request a Wi-Fi RTS threshold configuration */ #define NET_REQUEST_WIFI_RTS_THRESHOLD_CONFIG \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_RTS_THRESHOLD_CONFIG) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_RTS_THRESHOLD_CONFIG) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD_CONFIG); -#define NET_REQUEST_WIFI_WPS_CONFIG (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_WPS_CONFIG) +#define NET_REQUEST_WIFI_WPS_CONFIG (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_WPS_CONFIG) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_WPS_CONFIG); #ifdef CONFIG_WIFI_CREDENTIALS_CONNECT_STORED -#define NET_REQUEST_WIFI_CONNECT_STORED (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONNECT_STORED) +#define NET_REQUEST_WIFI_CONNECT_STORED (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_CONNECT_STORED) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_CONNECT_STORED); #endif #define NET_REQUEST_WIFI_START_ROAMING \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_START_ROAMING) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_START_ROAMING) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_START_ROAMING); #define NET_REQUEST_WIFI_NEIGHBOR_REP_COMPLETE \ - (_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_NEIGHBOR_REP_COMPLETE) + (NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_NEIGHBOR_REP_COMPLETE) NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_NEIGHBOR_REP_COMPLETE); @@ -359,63 +359,63 @@ enum net_event_wifi_cmd { /** Event emitted for Wi-Fi scan result */ #define NET_EVENT_WIFI_SCAN_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SCAN_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SCAN_RESULT) /** Event emitted when Wi-Fi scan is done */ #define NET_EVENT_WIFI_SCAN_DONE \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SCAN_DONE) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SCAN_DONE) /** Event emitted for Wi-Fi connect result */ #define NET_EVENT_WIFI_CONNECT_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_CONNECT_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_CONNECT_RESULT) /** Event emitted for Wi-Fi disconnect result */ #define NET_EVENT_WIFI_DISCONNECT_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_DISCONNECT_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_DISCONNECT_RESULT) /** Event emitted for Wi-Fi network interface status */ #define NET_EVENT_WIFI_IFACE_STATUS \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_IFACE_STATUS) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_IFACE_STATUS) /** Event emitted for Wi-Fi TWT information */ #define NET_EVENT_WIFI_TWT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_TWT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_TWT) /** Event emitted for Wi-Fi TWT sleep state */ #define NET_EVENT_WIFI_TWT_SLEEP_STATE \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_TWT_SLEEP_STATE) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_TWT_SLEEP_STATE) /** Event emitted for Wi-Fi raw scan result */ #define NET_EVENT_WIFI_RAW_SCAN_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_RAW_SCAN_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_RAW_SCAN_RESULT) /** Event emitted Wi-Fi disconnect is completed */ #define NET_EVENT_WIFI_DISCONNECT_COMPLETE \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_DISCONNECT_COMPLETE) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_DISCONNECT_COMPLETE) /** Event signal change of connected AP */ #define NET_EVENT_WIFI_SIGNAL_CHANGE \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SIGNAL_CHANGE) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_SIGNAL_CHANGE) /** Event Neighbor Report Completed */ #define NET_EVENT_WIFI_NEIGHBOR_REP_COMP \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_NEIGHBOR_REP_COMPLETE) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_NEIGHBOR_REP_COMPLETE) /** Event emitted for Wi-Fi access point enable result */ #define NET_EVENT_WIFI_AP_ENABLE_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT) /** Event emitted for Wi-Fi access point disable result */ #define NET_EVENT_WIFI_AP_DISABLE_RESULT \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_DISABLE_RESULT) /** Event emitted when Wi-Fi station is connected in AP mode */ #define NET_EVENT_WIFI_AP_STA_CONNECTED \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_STA_CONNECTED) /** Event emitted Wi-Fi station is disconnected from AP */ #define NET_EVENT_WIFI_AP_STA_DISCONNECTED \ - (_NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED) + (NET_WIFI_EVENT | NET_EVENT_WIFI_CMD_AP_STA_DISCONNECTED) /** @brief Wi-Fi version */ struct wifi_version { diff --git a/modules/hostap/src/supp_events.h b/modules/hostap/src/supp_events.h index dc922940d78..6d4fabfecbb 100644 --- a/modules/hostap/src/supp_events.h +++ b/modules/hostap/src/supp_events.h @@ -10,12 +10,12 @@ #include /* Connectivity Events */ -#define _NET_MGMT_SUPPLICANT_LAYER NET_MGMT_LAYER_L3 -#define _NET_MGMT_SUPPLICANT_CODE 0x157 -#define _NET_MGMT_SUPPLICANT_BASE (NET_MGMT_LAYER(_NET_MGMT_SUPPLICANT_LAYER) | \ - NET_MGMT_LAYER_CODE(_NET_MGMT_SUPPLICANT_CODE) | \ +#define NET_MGMT_SUPPLICANT_LAYER NET_MGMT_LAYER_L3 +#define NET_MGMT_SUPPLICANT_CODE 0x157 +#define NET_MGMT_SUPPLICANT_BASE (NET_MGMT_LAYER(NET_MGMT_SUPPLICANT_LAYER) | \ + NET_MGMT_LAYER_CODE(NET_MGMT_SUPPLICANT_CODE) | \ NET_MGMT_IFACE_BIT) -#define _NET_MGMT_SUPPLICANT_EVENT (NET_MGMT_EVENT_BIT | _NET_MGMT_SUPPLICANT_BASE) +#define NET_MGMT_SUPPLICANT_EVENT (NET_MGMT_EVENT_BIT | NET_MGMT_SUPPLICANT_BASE) enum net_event_supplicant_cmd { NET_EVENT_SUPPLICANT_CMD_READY = 1, @@ -28,22 +28,22 @@ enum net_event_supplicant_cmd { }; #define NET_EVENT_SUPPLICANT_READY \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_READY) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_READY) #define NET_EVENT_SUPPLICANT_NOT_READY \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_NOT_READY) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_NOT_READY) #define NET_EVENT_SUPPLICANT_IFACE_ADDED \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_ADDED) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_ADDED) #define NET_EVENT_SUPPLICANT_IFACE_REMOVED \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVED) #define NET_EVENT_SUPPLICANT_IFACE_REMOVING \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_IFACE_REMOVING) #define NET_EVENT_SUPPLICANT_INT_EVENT \ - (_NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_INT_EVENT) + (NET_MGMT_SUPPLICANT_EVENT | NET_EVENT_SUPPLICANT_CMD_INT_EVENT) int supplicant_send_wifi_mgmt_event(const char *ifname, enum net_event_wifi_cmd event, diff --git a/subsys/net/lib/shell/events.c b/subsys/net/lib/shell/events.c index c61922f073d..6b27dc2e4b0 100644 --- a/subsys/net/lib/shell/events.c +++ b/subsys/net/lib/shell/events.c @@ -20,13 +20,13 @@ LOG_MODULE_DECLARE(net_shell); #if defined(CONFIG_NET_MGMT_EVENT_MONITOR) #define THREAD_PRIORITY K_PRIO_COOP(2) #define MAX_EVENT_INFO_SIZE NET_EVENT_INFO_MAX_SIZE -#define MONITOR_L2_MASK (_NET_EVENT_IF_BASE) -#define MONITOR_L3_IPV4_MASK (_NET_EVENT_IPV4_BASE | NET_MGMT_COMMAND_MASK) -#define MONITOR_L3_IPV6_MASK (_NET_EVENT_IPV6_BASE | NET_MGMT_COMMAND_MASK) -#define MONITOR_L4_MASK (_NET_EVENT_L4_BASE | NET_MGMT_COMMAND_MASK) +#define MONITOR_L2_MASK (NET_EVENT_IF_BASE) +#define MONITOR_L3_IPV4_MASK (NET_EVENT_IPV4_BASE | NET_MGMT_COMMAND_MASK) +#define MONITOR_L3_IPV6_MASK (NET_EVENT_IPV6_BASE | NET_MGMT_COMMAND_MASK) +#define MONITOR_L4_MASK (NET_EVENT_L4_BASE | NET_MGMT_COMMAND_MASK) #if defined(CONFIG_NET_L2_ETHERNET_MGMT) -#define MONITOR_L2_ETHERNET_MASK (_NET_ETHERNET_BASE) +#define MONITOR_L2_ETHERNET_MASK (NET_ETHERNET_BASE) static struct net_mgmt_event_callback l2_ethernet_cb; #endif