From 8577cfe2bc1dc42c6b071a3a3c46f01a9b6b1b16 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 7 Sep 2026 16:11:30 +0900 Subject: [PATCH 1/4] wifi-util: align table with = --- src/shared/wifi-util.c | 288 ++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/src/shared/wifi-util.c b/src/shared/wifi-util.c index 81b6cda5dd..0c3febcf6e 100644 --- a/src/shared/wifi-util.c +++ b/src/shared/wifi-util.c @@ -160,151 +160,151 @@ static const char * const nl80211_iftype_table[NUM_NL80211_IFTYPES] = { DEFINE_STRING_TABLE_LOOKUP(nl80211_iftype, enum nl80211_iftype); static const char * const nl80211_cmd_table[__NL80211_CMD_AFTER_LAST] = { - [NL80211_CMD_GET_WIPHY] = "get_wiphy", - [NL80211_CMD_SET_WIPHY] = "set_wiphy", - [NL80211_CMD_NEW_WIPHY] = "new_wiphy", - [NL80211_CMD_DEL_WIPHY] = "del_wiphy", - [NL80211_CMD_GET_INTERFACE] = "get_interface", - [NL80211_CMD_SET_INTERFACE] = "set_interface", - [NL80211_CMD_NEW_INTERFACE] = "new_interface", - [NL80211_CMD_DEL_INTERFACE] = "del_interface", - [NL80211_CMD_GET_KEY] = "get_key", - [NL80211_CMD_SET_KEY] = "set_key", - [NL80211_CMD_NEW_KEY] = "new_key", - [NL80211_CMD_DEL_KEY] = "del_key", - [NL80211_CMD_GET_BEACON] = "get_beacon", - [NL80211_CMD_SET_BEACON] = "set_beacon", - [NL80211_CMD_START_AP] = "start_ap", - [NL80211_CMD_STOP_AP] = "stop_ap", - [NL80211_CMD_GET_STATION] = "get_station", - [NL80211_CMD_SET_STATION] = "set_station", - [NL80211_CMD_NEW_STATION] = "new_station", - [NL80211_CMD_DEL_STATION] = "del_station", - [NL80211_CMD_GET_MPATH] = "get_mpath", - [NL80211_CMD_SET_MPATH] = "set_mpath", - [NL80211_CMD_NEW_MPATH] = "new_mpath", - [NL80211_CMD_DEL_MPATH] = "del_mpath", - [NL80211_CMD_SET_BSS] = "set_bss", - [NL80211_CMD_SET_REG] = "set_reg", - [NL80211_CMD_REQ_SET_REG] = "req_set_reg", - [NL80211_CMD_GET_MESH_CONFIG] = "get_mesh_config", - [NL80211_CMD_SET_MESH_CONFIG] = "set_mesh_config", - [NL80211_CMD_SET_MGMT_EXTRA_IE] = "set_mgmt_extra_ie", - [NL80211_CMD_GET_REG] = "get_reg", - [NL80211_CMD_GET_SCAN] = "get_scan", - [NL80211_CMD_TRIGGER_SCAN] = "trigger_scan", - [NL80211_CMD_NEW_SCAN_RESULTS] = "new_scan_results", - [NL80211_CMD_SCAN_ABORTED] = "scan_aborted", - [NL80211_CMD_REG_CHANGE] = "reg_change", - [NL80211_CMD_AUTHENTICATE] = "authenticate", - [NL80211_CMD_ASSOCIATE] = "associate", - [NL80211_CMD_DEAUTHENTICATE] = "deauthenticate", - [NL80211_CMD_DISASSOCIATE] = "disassociate", - [NL80211_CMD_MICHAEL_MIC_FAILURE] = "michael_mic_failure", - [NL80211_CMD_REG_BEACON_HINT] = "reg_beacon_hint", - [NL80211_CMD_JOIN_IBSS] = "join_ibss", - [NL80211_CMD_LEAVE_IBSS] = "leave_ibss", - [NL80211_CMD_TESTMODE] = "testmode", - [NL80211_CMD_CONNECT] = "connect", - [NL80211_CMD_ROAM] = "roam", - [NL80211_CMD_DISCONNECT] = "disconnect", - [NL80211_CMD_SET_WIPHY_NETNS] = "set_wiphy_netns", - [NL80211_CMD_GET_SURVEY] = "get_survey", - [NL80211_CMD_NEW_SURVEY_RESULTS] = "new_survey_results", - [NL80211_CMD_SET_PMKSA] = "set_pmksa", - [NL80211_CMD_DEL_PMKSA] = "del_pmksa", - [NL80211_CMD_FLUSH_PMKSA] = "flush_pmksa", - [NL80211_CMD_REMAIN_ON_CHANNEL] = "remain_on_channel", - [NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL] = "cancel_remain_on_channel", - [NL80211_CMD_SET_TX_BITRATE_MASK] = "set_tx_bitrate_mask", - [NL80211_CMD_REGISTER_FRAME] = "register_frame", - [NL80211_CMD_FRAME] = "frame", - [NL80211_CMD_FRAME_TX_STATUS] = "frame_tx_status", - [NL80211_CMD_SET_POWER_SAVE] = "set_power_save", - [NL80211_CMD_GET_POWER_SAVE] = "get_power_save", - [NL80211_CMD_SET_CQM] = "set_cqm", - [NL80211_CMD_NOTIFY_CQM] = "notify_cqm", - [NL80211_CMD_SET_CHANNEL] = "set_channel", - [NL80211_CMD_SET_WDS_PEER] = "set_wds_peer", - [NL80211_CMD_FRAME_WAIT_CANCEL] = "frame_wait_cancel", - [NL80211_CMD_JOIN_MESH] = "join_mesh", - [NL80211_CMD_LEAVE_MESH] = "leave_mesh", - [NL80211_CMD_UNPROT_DEAUTHENTICATE] = "unprot_deauthenticate", - [NL80211_CMD_UNPROT_DISASSOCIATE] = "unprot_disassociate", - [NL80211_CMD_NEW_PEER_CANDIDATE] = "new_peer_candidate", - [NL80211_CMD_GET_WOWLAN] = "get_wowlan", - [NL80211_CMD_SET_WOWLAN] = "set_wowlan", - [NL80211_CMD_START_SCHED_SCAN] = "start_sched_scan", - [NL80211_CMD_STOP_SCHED_SCAN] = "stop_sched_scan", - [NL80211_CMD_SCHED_SCAN_RESULTS] = "sched_scan_results", - [NL80211_CMD_SCHED_SCAN_STOPPED] = "sched_scan_stopped", - [NL80211_CMD_SET_REKEY_OFFLOAD] = "set_rekey_offload", - [NL80211_CMD_PMKSA_CANDIDATE] = "pmksa_candidate", - [NL80211_CMD_TDLS_OPER] = "tdls_oper", - [NL80211_CMD_TDLS_MGMT] = "tdls_mgmt", - [NL80211_CMD_UNEXPECTED_FRAME] = "unexpected_frame", - [NL80211_CMD_PROBE_CLIENT] = "probe_client", - [NL80211_CMD_REGISTER_BEACONS] = "register_beacons", - [NL80211_CMD_UNEXPECTED_4ADDR_FRAME] = "unexpected_4addr_frame", - [NL80211_CMD_SET_NOACK_MAP] = "set_noack_map", - [NL80211_CMD_CH_SWITCH_NOTIFY] = "ch_switch_notify", - [NL80211_CMD_START_P2P_DEVICE] = "start_p2p_device", - [NL80211_CMD_STOP_P2P_DEVICE] = "stop_p2p_device", - [NL80211_CMD_CONN_FAILED] = "conn_failed", - [NL80211_CMD_SET_MCAST_RATE] = "set_mcast_rate", - [NL80211_CMD_SET_MAC_ACL] = "set_mac_acl", - [NL80211_CMD_RADAR_DETECT] = "radar_detect", - [NL80211_CMD_GET_PROTOCOL_FEATURES] = "get_protocol_features", - [NL80211_CMD_UPDATE_FT_IES] = "update_ft_ies", - [NL80211_CMD_FT_EVENT] = "ft_event", - [NL80211_CMD_CRIT_PROTOCOL_START] = "crit_protocol_start", - [NL80211_CMD_CRIT_PROTOCOL_STOP] = "crit_protocol_stop", - [NL80211_CMD_GET_COALESCE] = "get_coalesce", - [NL80211_CMD_SET_COALESCE] = "set_coalesce", - [NL80211_CMD_CHANNEL_SWITCH] = "channel_switch", - [NL80211_CMD_VENDOR] = "vendor", - [NL80211_CMD_SET_QOS_MAP] = "set_qos_map", - [NL80211_CMD_ADD_TX_TS] = "add_tx_ts", - [NL80211_CMD_DEL_TX_TS] = "del_tx_ts", - [NL80211_CMD_GET_MPP] = "get_mpp", - [NL80211_CMD_JOIN_OCB] = "join_ocb", - [NL80211_CMD_LEAVE_OCB] = "leave_ocb", - [NL80211_CMD_CH_SWITCH_STARTED_NOTIFY] = "ch_switch_started_notify", - [NL80211_CMD_TDLS_CHANNEL_SWITCH] = "tdls_channel_switch", - [NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH] = "tdls_cancel_channel_switch", - [NL80211_CMD_WIPHY_REG_CHANGE] = "wiphy_reg_change", - [NL80211_CMD_ABORT_SCAN] = "abort_scan", - [NL80211_CMD_START_NAN] = "start_nan", - [NL80211_CMD_STOP_NAN] = "stop_nan", - [NL80211_CMD_ADD_NAN_FUNCTION] = "add_nan_function", - [NL80211_CMD_DEL_NAN_FUNCTION] = "del_nan_function", - [NL80211_CMD_CHANGE_NAN_CONFIG] = "change_nan_config", - [NL80211_CMD_NAN_MATCH] = "nan_match", - [NL80211_CMD_SET_MULTICAST_TO_UNICAST] = "set_multicast_to_unicast", - [NL80211_CMD_UPDATE_CONNECT_PARAMS] = "update_connect_params", - [NL80211_CMD_SET_PMK] = "set_pmk", - [NL80211_CMD_DEL_PMK] = "del_pmk", - [NL80211_CMD_PORT_AUTHORIZED] = "port_authorized", - [NL80211_CMD_RELOAD_REGDB] = "reload_regdb", - [NL80211_CMD_EXTERNAL_AUTH] = "external_auth", - [NL80211_CMD_STA_OPMODE_CHANGED] = "sta_opmode_changed", - [NL80211_CMD_CONTROL_PORT_FRAME] = "control_port_frame", - [NL80211_CMD_GET_FTM_RESPONDER_STATS] = "get_ftm_responder_stats", - [NL80211_CMD_PEER_MEASUREMENT_START] = "peer_measurement_start", - [NL80211_CMD_PEER_MEASUREMENT_RESULT] = "peer_measurement_result", - [NL80211_CMD_PEER_MEASUREMENT_COMPLETE] = "peer_measurement_complete", - [NL80211_CMD_NOTIFY_RADAR] = "notify_radar", - [NL80211_CMD_UPDATE_OWE_INFO] = "update_owe_info", - [NL80211_CMD_PROBE_MESH_LINK] = "probe_mesh_link", - [NL80211_CMD_SET_TID_CONFIG] = "set_tid_config", - [NL80211_CMD_UNPROT_BEACON] = "unprot_beacon", + [NL80211_CMD_GET_WIPHY] = "get_wiphy", + [NL80211_CMD_SET_WIPHY] = "set_wiphy", + [NL80211_CMD_NEW_WIPHY] = "new_wiphy", + [NL80211_CMD_DEL_WIPHY] = "del_wiphy", + [NL80211_CMD_GET_INTERFACE] = "get_interface", + [NL80211_CMD_SET_INTERFACE] = "set_interface", + [NL80211_CMD_NEW_INTERFACE] = "new_interface", + [NL80211_CMD_DEL_INTERFACE] = "del_interface", + [NL80211_CMD_GET_KEY] = "get_key", + [NL80211_CMD_SET_KEY] = "set_key", + [NL80211_CMD_NEW_KEY] = "new_key", + [NL80211_CMD_DEL_KEY] = "del_key", + [NL80211_CMD_GET_BEACON] = "get_beacon", + [NL80211_CMD_SET_BEACON] = "set_beacon", + [NL80211_CMD_START_AP] = "start_ap", + [NL80211_CMD_STOP_AP] = "stop_ap", + [NL80211_CMD_GET_STATION] = "get_station", + [NL80211_CMD_SET_STATION] = "set_station", + [NL80211_CMD_NEW_STATION] = "new_station", + [NL80211_CMD_DEL_STATION] = "del_station", + [NL80211_CMD_GET_MPATH] = "get_mpath", + [NL80211_CMD_SET_MPATH] = "set_mpath", + [NL80211_CMD_NEW_MPATH] = "new_mpath", + [NL80211_CMD_DEL_MPATH] = "del_mpath", + [NL80211_CMD_SET_BSS] = "set_bss", + [NL80211_CMD_SET_REG] = "set_reg", + [NL80211_CMD_REQ_SET_REG] = "req_set_reg", + [NL80211_CMD_GET_MESH_CONFIG] = "get_mesh_config", + [NL80211_CMD_SET_MESH_CONFIG] = "set_mesh_config", + [NL80211_CMD_SET_MGMT_EXTRA_IE] = "set_mgmt_extra_ie", + [NL80211_CMD_GET_REG] = "get_reg", + [NL80211_CMD_GET_SCAN] = "get_scan", + [NL80211_CMD_TRIGGER_SCAN] = "trigger_scan", + [NL80211_CMD_NEW_SCAN_RESULTS] = "new_scan_results", + [NL80211_CMD_SCAN_ABORTED] = "scan_aborted", + [NL80211_CMD_REG_CHANGE] = "reg_change", + [NL80211_CMD_AUTHENTICATE] = "authenticate", + [NL80211_CMD_ASSOCIATE] = "associate", + [NL80211_CMD_DEAUTHENTICATE] = "deauthenticate", + [NL80211_CMD_DISASSOCIATE] = "disassociate", + [NL80211_CMD_MICHAEL_MIC_FAILURE] = "michael_mic_failure", + [NL80211_CMD_REG_BEACON_HINT] = "reg_beacon_hint", + [NL80211_CMD_JOIN_IBSS] = "join_ibss", + [NL80211_CMD_LEAVE_IBSS] = "leave_ibss", + [NL80211_CMD_TESTMODE] = "testmode", + [NL80211_CMD_CONNECT] = "connect", + [NL80211_CMD_ROAM] = "roam", + [NL80211_CMD_DISCONNECT] = "disconnect", + [NL80211_CMD_SET_WIPHY_NETNS] = "set_wiphy_netns", + [NL80211_CMD_GET_SURVEY] = "get_survey", + [NL80211_CMD_NEW_SURVEY_RESULTS] = "new_survey_results", + [NL80211_CMD_SET_PMKSA] = "set_pmksa", + [NL80211_CMD_DEL_PMKSA] = "del_pmksa", + [NL80211_CMD_FLUSH_PMKSA] = "flush_pmksa", + [NL80211_CMD_REMAIN_ON_CHANNEL] = "remain_on_channel", + [NL80211_CMD_CANCEL_REMAIN_ON_CHANNEL] = "cancel_remain_on_channel", + [NL80211_CMD_SET_TX_BITRATE_MASK] = "set_tx_bitrate_mask", + [NL80211_CMD_REGISTER_FRAME] = "register_frame", + [NL80211_CMD_FRAME] = "frame", + [NL80211_CMD_FRAME_TX_STATUS] = "frame_tx_status", + [NL80211_CMD_SET_POWER_SAVE] = "set_power_save", + [NL80211_CMD_GET_POWER_SAVE] = "get_power_save", + [NL80211_CMD_SET_CQM] = "set_cqm", + [NL80211_CMD_NOTIFY_CQM] = "notify_cqm", + [NL80211_CMD_SET_CHANNEL] = "set_channel", + [NL80211_CMD_SET_WDS_PEER] = "set_wds_peer", + [NL80211_CMD_FRAME_WAIT_CANCEL] = "frame_wait_cancel", + [NL80211_CMD_JOIN_MESH] = "join_mesh", + [NL80211_CMD_LEAVE_MESH] = "leave_mesh", + [NL80211_CMD_UNPROT_DEAUTHENTICATE] = "unprot_deauthenticate", + [NL80211_CMD_UNPROT_DISASSOCIATE] = "unprot_disassociate", + [NL80211_CMD_NEW_PEER_CANDIDATE] = "new_peer_candidate", + [NL80211_CMD_GET_WOWLAN] = "get_wowlan", + [NL80211_CMD_SET_WOWLAN] = "set_wowlan", + [NL80211_CMD_START_SCHED_SCAN] = "start_sched_scan", + [NL80211_CMD_STOP_SCHED_SCAN] = "stop_sched_scan", + [NL80211_CMD_SCHED_SCAN_RESULTS] = "sched_scan_results", + [NL80211_CMD_SCHED_SCAN_STOPPED] = "sched_scan_stopped", + [NL80211_CMD_SET_REKEY_OFFLOAD] = "set_rekey_offload", + [NL80211_CMD_PMKSA_CANDIDATE] = "pmksa_candidate", + [NL80211_CMD_TDLS_OPER] = "tdls_oper", + [NL80211_CMD_TDLS_MGMT] = "tdls_mgmt", + [NL80211_CMD_UNEXPECTED_FRAME] = "unexpected_frame", + [NL80211_CMD_PROBE_CLIENT] = "probe_client", + [NL80211_CMD_REGISTER_BEACONS] = "register_beacons", + [NL80211_CMD_UNEXPECTED_4ADDR_FRAME] = "unexpected_4addr_frame", + [NL80211_CMD_SET_NOACK_MAP] = "set_noack_map", + [NL80211_CMD_CH_SWITCH_NOTIFY] = "ch_switch_notify", + [NL80211_CMD_START_P2P_DEVICE] = "start_p2p_device", + [NL80211_CMD_STOP_P2P_DEVICE] = "stop_p2p_device", + [NL80211_CMD_CONN_FAILED] = "conn_failed", + [NL80211_CMD_SET_MCAST_RATE] = "set_mcast_rate", + [NL80211_CMD_SET_MAC_ACL] = "set_mac_acl", + [NL80211_CMD_RADAR_DETECT] = "radar_detect", + [NL80211_CMD_GET_PROTOCOL_FEATURES] = "get_protocol_features", + [NL80211_CMD_UPDATE_FT_IES] = "update_ft_ies", + [NL80211_CMD_FT_EVENT] = "ft_event", + [NL80211_CMD_CRIT_PROTOCOL_START] = "crit_protocol_start", + [NL80211_CMD_CRIT_PROTOCOL_STOP] = "crit_protocol_stop", + [NL80211_CMD_GET_COALESCE] = "get_coalesce", + [NL80211_CMD_SET_COALESCE] = "set_coalesce", + [NL80211_CMD_CHANNEL_SWITCH] = "channel_switch", + [NL80211_CMD_VENDOR] = "vendor", + [NL80211_CMD_SET_QOS_MAP] = "set_qos_map", + [NL80211_CMD_ADD_TX_TS] = "add_tx_ts", + [NL80211_CMD_DEL_TX_TS] = "del_tx_ts", + [NL80211_CMD_GET_MPP] = "get_mpp", + [NL80211_CMD_JOIN_OCB] = "join_ocb", + [NL80211_CMD_LEAVE_OCB] = "leave_ocb", + [NL80211_CMD_CH_SWITCH_STARTED_NOTIFY] = "ch_switch_started_notify", + [NL80211_CMD_TDLS_CHANNEL_SWITCH] = "tdls_channel_switch", + [NL80211_CMD_TDLS_CANCEL_CHANNEL_SWITCH] = "tdls_cancel_channel_switch", + [NL80211_CMD_WIPHY_REG_CHANGE] = "wiphy_reg_change", + [NL80211_CMD_ABORT_SCAN] = "abort_scan", + [NL80211_CMD_START_NAN] = "start_nan", + [NL80211_CMD_STOP_NAN] = "stop_nan", + [NL80211_CMD_ADD_NAN_FUNCTION] = "add_nan_function", + [NL80211_CMD_DEL_NAN_FUNCTION] = "del_nan_function", + [NL80211_CMD_CHANGE_NAN_CONFIG] = "change_nan_config", + [NL80211_CMD_NAN_MATCH] = "nan_match", + [NL80211_CMD_SET_MULTICAST_TO_UNICAST] = "set_multicast_to_unicast", + [NL80211_CMD_UPDATE_CONNECT_PARAMS] = "update_connect_params", + [NL80211_CMD_SET_PMK] = "set_pmk", + [NL80211_CMD_DEL_PMK] = "del_pmk", + [NL80211_CMD_PORT_AUTHORIZED] = "port_authorized", + [NL80211_CMD_RELOAD_REGDB] = "reload_regdb", + [NL80211_CMD_EXTERNAL_AUTH] = "external_auth", + [NL80211_CMD_STA_OPMODE_CHANGED] = "sta_opmode_changed", + [NL80211_CMD_CONTROL_PORT_FRAME] = "control_port_frame", + [NL80211_CMD_GET_FTM_RESPONDER_STATS] = "get_ftm_responder_stats", + [NL80211_CMD_PEER_MEASUREMENT_START] = "peer_measurement_start", + [NL80211_CMD_PEER_MEASUREMENT_RESULT] = "peer_measurement_result", + [NL80211_CMD_PEER_MEASUREMENT_COMPLETE] = "peer_measurement_complete", + [NL80211_CMD_NOTIFY_RADAR] = "notify_radar", + [NL80211_CMD_UPDATE_OWE_INFO] = "update_owe_info", + [NL80211_CMD_PROBE_MESH_LINK] = "probe_mesh_link", + [NL80211_CMD_SET_TID_CONFIG] = "set_tid_config", + [NL80211_CMD_UNPROT_BEACON] = "unprot_beacon", [NL80211_CMD_CONTROL_PORT_FRAME_TX_STATUS] = "control_port_frame_tx_status", - [NL80211_CMD_SET_SAR_SPECS] = "set_sar_specs", - [NL80211_CMD_OBSS_COLOR_COLLISION] = "obss_color_collision", - [NL80211_CMD_COLOR_CHANGE_REQUEST] = "color_change_request", - [NL80211_CMD_COLOR_CHANGE_STARTED] = "color_change_started", - [NL80211_CMD_COLOR_CHANGE_ABORTED] = "color_change_aborted", - [NL80211_CMD_COLOR_CHANGE_COMPLETED] = "color_change_completed", + [NL80211_CMD_SET_SAR_SPECS] = "set_sar_specs", + [NL80211_CMD_OBSS_COLOR_COLLISION] = "obss_color_collision", + [NL80211_CMD_COLOR_CHANGE_REQUEST] = "color_change_request", + [NL80211_CMD_COLOR_CHANGE_STARTED] = "color_change_started", + [NL80211_CMD_COLOR_CHANGE_ABORTED] = "color_change_aborted", + [NL80211_CMD_COLOR_CHANGE_COMPLETED] = "color_change_completed", }; DEFINE_STRING_TABLE_LOOKUP_TO_STRING(nl80211_cmd, int); From 0b5d9bf14086915b689877773daccf02cbbbef1c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 7 Sep 2026 16:12:26 +0900 Subject: [PATCH 2/4] wifi-util: update string tables Note, NL80211_CMD_PROBE_CLIENT is renamed to NL80211_CMD_PROBE_PEER in kernel v7.3: https://github.com/torvalds/linux/commit/4ab9b637b94a3821acfcd6d6037dffe33669245a --- man/systemd.netdev.xml | 3 ++- src/shared/wifi-util.c | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index e50d4bc35d..934c02328f 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -2888,7 +2888,8 @@ Ports=eth2 station, ap, ap-vlan, wds, monitor, mesh-point, p2p-client, p2p-go, p2p-device, - ocb, and nan. This option is mandatory. + ocb, nan, nan-data and + pd. This option is mandatory. diff --git a/src/shared/wifi-util.c b/src/shared/wifi-util.c index 0c3febcf6e..4e3e905a97 100644 --- a/src/shared/wifi-util.c +++ b/src/shared/wifi-util.c @@ -155,6 +155,8 @@ static const char * const nl80211_iftype_table[NUM_NL80211_IFTYPES] = { [NL80211_IFTYPE_P2P_DEVICE] = "p2p-device", [NL80211_IFTYPE_OCB] = "ocb", [NL80211_IFTYPE_NAN] = "nan", + [NL80211_IFTYPE_NAN_DATA] = "nan-data", + [NL80211_IFTYPE_PD] = "pd", }; DEFINE_STRING_TABLE_LOOKUP(nl80211_iftype, enum nl80211_iftype); @@ -243,7 +245,7 @@ static const char * const nl80211_cmd_table[__NL80211_CMD_AFTER_LAST] = { [NL80211_CMD_TDLS_OPER] = "tdls_oper", [NL80211_CMD_TDLS_MGMT] = "tdls_mgmt", [NL80211_CMD_UNEXPECTED_FRAME] = "unexpected_frame", - [NL80211_CMD_PROBE_CLIENT] = "probe_client", + [NL80211_CMD_PROBE_PEER] = "probe_peer", [NL80211_CMD_REGISTER_BEACONS] = "register_beacons", [NL80211_CMD_UNEXPECTED_4ADDR_FRAME] = "unexpected_4addr_frame", [NL80211_CMD_SET_NOACK_MAP] = "set_noack_map", @@ -305,6 +307,28 @@ static const char * const nl80211_cmd_table[__NL80211_CMD_AFTER_LAST] = { [NL80211_CMD_COLOR_CHANGE_STARTED] = "color_change_started", [NL80211_CMD_COLOR_CHANGE_ABORTED] = "color_change_aborted", [NL80211_CMD_COLOR_CHANGE_COMPLETED] = "color_change_completed", + [NL80211_CMD_SET_FILS_AAD] = "set_fils_aad", + [NL80211_CMD_ASSOC_COMEBACK] = "assoc_comeback", + [NL80211_CMD_ADD_LINK] = "add_link", + [NL80211_CMD_REMOVE_LINK] = "remove_link", + [NL80211_CMD_ADD_LINK_STA] = "add_link_sta", + [NL80211_CMD_MODIFY_LINK_STA] = "modify_link_sta", + [NL80211_CMD_REMOVE_LINK_STA] = "remove_link_sta", + [NL80211_CMD_SET_HW_TIMESTAMP] = "set_hw_timestamp", + [NL80211_CMD_LINKS_REMOVED] = "links_removed", + [NL80211_CMD_SET_TID_TO_LINK_MAPPING] = "set_tid_to_link_mapping", + [NL80211_CMD_ASSOC_MLO_RECONF] = "assoc_mlo_reconf", + [NL80211_CMD_EPCS_CFG] = "epcs_cfg", + [NL80211_CMD_NAN_NEXT_DW_NOTIFICATION] = "nan_next_dw_notification", + [NL80211_CMD_NAN_CLUSTER_JOINED] = "nan_cluster_joined", + [NL80211_CMD_INCUMBENT_SIGNAL_DETECT] = "incumbent_signal_detect", + [NL80211_CMD_NAN_SET_LOCAL_SCHED] = "nan_set_local_sched", + [NL80211_CMD_NAN_SCHED_UPDATE_DONE] = "nan_sched_update_done", + [NL80211_CMD_NAN_SET_PEER_SCHED] = "nan_set_peer_sched", + [NL80211_CMD_NAN_ULW_UPDATE] = "nan_ulw_update", + [NL80211_CMD_NAN_CHANNEL_EVAC] = "nan_channel_evac", + [NL80211_CMD_START_PD] = "start_pd", + [NL80211_CMD_STOP_PD] = "stop_pd", }; DEFINE_STRING_TABLE_LOOKUP_TO_STRING(nl80211_cmd, int); From 50a41d15b5a7a464ae8318bf7283026468540c4b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 7 Sep 2026 16:35:07 +0900 Subject: [PATCH 3/4] networkd-link: refactoring logger for IFF_ flags No functional change. --- src/network/networkd-link.c | 89 ++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 3de23c8dd1..50a499723d 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -2227,10 +2227,37 @@ bool link_multicast_enabled(Link *link) { return FLAGS_SET(link->flags, IFF_MULTICAST); } -#define FLAG_STRING(string, flag, old, new) \ - (((old ^ new) & flag) \ - ? ((old & flag) ? (" -" string) : (" +" string)) \ - : "") +#define _FLAG_STRING(old_flags, new_flags, string, flag) \ + ({ \ + unsigned _old_flags = (old_flags), _new_flags = (new_flags); \ + \ + (((_old_flags ^ _new_flags) & flag) \ + ? ((_old_flags & flag) ? (" -" string) : (" +" string)) \ + : ""); \ + }) +#define FLAG_STRING(old_flags, new_flags, name) \ + _FLAG_STRING(old_flags, new_flags, STRINGIFY(name), IFF_##name) + +#define KNOWN_IFF_FLAGS \ + (IFF_UP | \ + IFF_BROADCAST | \ + IFF_DEBUG | \ + IFF_LOOPBACK | \ + IFF_POINTOPOINT | \ + IFF_NOTRAILERS | \ + IFF_RUNNING | \ + IFF_NOARP | \ + IFF_PROMISC | \ + IFF_ALLMULTI | \ + IFF_MASTER | \ + IFF_SLAVE | \ + IFF_MULTICAST | \ + IFF_PORTSEL | \ + IFF_AUTOMEDIA | \ + IFF_DYNAMIC | \ + IFF_LOWER_UP | \ + IFF_DORMANT | \ + IFF_ECHO) static int link_update_flags(Link *link, sd_netlink_message *message) { bool link_was_admin_up, had_carrier; @@ -2256,42 +2283,34 @@ static int link_update_flags(Link *link, sd_netlink_message *message) { return 0; if (link->flags != flags) { - unsigned unknown_flags, unknown_flags_added, unknown_flags_removed; - log_link_debug(link, "Flags change:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", - FLAG_STRING("LOOPBACK", IFF_LOOPBACK, link->flags, flags), - FLAG_STRING("MASTER", IFF_MASTER, link->flags, flags), - FLAG_STRING("SLAVE", IFF_SLAVE, link->flags, flags), - FLAG_STRING("UP", IFF_UP, link->flags, flags), - FLAG_STRING("DORMANT", IFF_DORMANT, link->flags, flags), - FLAG_STRING("LOWER_UP", IFF_LOWER_UP, link->flags, flags), - FLAG_STRING("RUNNING", IFF_RUNNING, link->flags, flags), - FLAG_STRING("MULTICAST", IFF_MULTICAST, link->flags, flags), - FLAG_STRING("BROADCAST", IFF_BROADCAST, link->flags, flags), - FLAG_STRING("POINTOPOINT", IFF_POINTOPOINT, link->flags, flags), - FLAG_STRING("PROMISC", IFF_PROMISC, link->flags, flags), - FLAG_STRING("ALLMULTI", IFF_ALLMULTI, link->flags, flags), - FLAG_STRING("PORTSEL", IFF_PORTSEL, link->flags, flags), - FLAG_STRING("AUTOMEDIA", IFF_AUTOMEDIA, link->flags, flags), - FLAG_STRING("DYNAMIC", IFF_DYNAMIC, link->flags, flags), - FLAG_STRING("NOARP", IFF_NOARP, link->flags, flags), - FLAG_STRING("NOTRAILERS", IFF_NOTRAILERS, link->flags, flags), - FLAG_STRING("DEBUG", IFF_DEBUG, link->flags, flags), - FLAG_STRING("ECHO", IFF_ECHO, link->flags, flags)); + FLAG_STRING(link->flags, flags, UP), + FLAG_STRING(link->flags, flags, BROADCAST), + FLAG_STRING(link->flags, flags, DEBUG), + FLAG_STRING(link->flags, flags, LOOPBACK), + FLAG_STRING(link->flags, flags, POINTOPOINT), + FLAG_STRING(link->flags, flags, NOTRAILERS), + FLAG_STRING(link->flags, flags, RUNNING), + FLAG_STRING(link->flags, flags, NOARP), + FLAG_STRING(link->flags, flags, PROMISC), + FLAG_STRING(link->flags, flags, ALLMULTI), + FLAG_STRING(link->flags, flags, MASTER), + FLAG_STRING(link->flags, flags, SLAVE), + FLAG_STRING(link->flags, flags, MULTICAST), + FLAG_STRING(link->flags, flags, PORTSEL), + FLAG_STRING(link->flags, flags, AUTOMEDIA), + FLAG_STRING(link->flags, flags, DYNAMIC), + FLAG_STRING(link->flags, flags, LOWER_UP), + FLAG_STRING(link->flags, flags, DORMANT), + FLAG_STRING(link->flags, flags, ECHO)); - unknown_flags = ~(IFF_LOOPBACK | IFF_MASTER | IFF_SLAVE | IFF_UP | - IFF_DORMANT | IFF_LOWER_UP | IFF_RUNNING | - IFF_MULTICAST | IFF_BROADCAST | IFF_POINTOPOINT | - IFF_PROMISC | IFF_ALLMULTI | IFF_PORTSEL | - IFF_AUTOMEDIA | IFF_DYNAMIC | IFF_NOARP | - IFF_NOTRAILERS | IFF_DEBUG | IFF_ECHO); - unknown_flags_added = ((link->flags ^ flags) & flags & unknown_flags); - unknown_flags_removed = ((link->flags ^ flags) & link->flags & unknown_flags); + unsigned unknown_flags_added = ((link->flags ^ flags) & flags & ~KNOWN_IFF_FLAGS); + unsigned unknown_flags_removed = ((link->flags ^ flags) & link->flags & ~KNOWN_IFF_FLAGS); - if (unknown_flags_added) + if (unknown_flags_added != 0) log_link_debug(link, "Unknown link flags gained, ignoring: %#.5x", unknown_flags_added); - if (unknown_flags_removed) + if (unknown_flags_removed != 0) log_link_debug(link, "Unknown link flags lost, ignoring: %#.5x", unknown_flags_removed); } From 5c7ca2d6a69c3b9b1d164b12ae15de76650f6eaf Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 7 Sep 2026 16:46:28 +0900 Subject: [PATCH 4/4] network: update route protocol string table RTPROT_KEEPALIVED, RTPROT_OVN, and RTPROT_OPENR are added. These are mostly used for logging, so documentation update is not necessary. --- src/network/networkd-route-util.c | 43 +++++++++++++++++-------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/network/networkd-route-util.c b/src/network/networkd-route-util.c index 3a7156fc41..e80a465881 100644 --- a/src/network/networkd-route-util.c +++ b/src/network/networkd-route-util.c @@ -374,26 +374,29 @@ static const char * const route_protocol_table[] = { DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(route_protocol, int, UINT8_MAX); static const char * const route_protocol_full_table[] = { - [RTPROT_REDIRECT] = "redirect", - [RTPROT_KERNEL] = "kernel", - [RTPROT_BOOT] = "boot", - [RTPROT_STATIC] = "static", - [RTPROT_GATED] = "gated", - [RTPROT_RA] = "ra", - [RTPROT_MRT] = "mrt", - [RTPROT_ZEBRA] = "zebra", - [RTPROT_BIRD] = "bird", - [RTPROT_DNROUTED] = "dnrouted", - [RTPROT_XORP] = "xorp", - [RTPROT_NTK] = "ntk", - [RTPROT_DHCP] = "dhcp", - [RTPROT_MROUTED] = "mrouted", - [RTPROT_BABEL] = "babel", - [RTPROT_BGP] = "bgp", - [RTPROT_ISIS] = "isis", - [RTPROT_OSPF] = "ospf", - [RTPROT_RIP] = "rip", - [RTPROT_EIGRP] = "eigrp", + [RTPROT_REDIRECT] = "redirect", + [RTPROT_KERNEL] = "kernel", + [RTPROT_BOOT] = "boot", + [RTPROT_STATIC] = "static", + [RTPROT_GATED] = "gated", + [RTPROT_RA] = "ra", + [RTPROT_MRT] = "mrt", + [RTPROT_ZEBRA] = "zebra", + [RTPROT_BIRD] = "bird", + [RTPROT_DNROUTED] = "dnrouted", + [RTPROT_XORP] = "xorp", + [RTPROT_NTK] = "ntk", + [RTPROT_DHCP] = "dhcp", + [RTPROT_MROUTED] = "mrouted", + [RTPROT_KEEPALIVED] = "keepalived", + [RTPROT_BABEL] = "babel", + [RTPROT_OVN] = "ovn", + [RTPROT_OPENR] = "openr", + [RTPROT_BGP] = "bgp", + [RTPROT_ISIS] = "isis", + [RTPROT_OSPF] = "ospf", + [RTPROT_RIP] = "rip", + [RTPROT_EIGRP] = "eigrp", }; DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(route_protocol_full, int, UINT8_MAX);