iw: generate command list at build time

There's no reason for me to do this manually every
time I do a release, just generate it directly at
build time.

Change-Id: Icd9c2bbc0ccfb183e054ababdd09d9443855ae12
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/.gitignore b/.gitignore
index 16bb88b0a6a2bb18301ce30c9372c871894bb3bc..c2910378b927b900670eda2dec4c6f009cdedfb0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ iw
 version.c
 iw.8.gz
 *-stamp
+/nl80211-commands.inc

diff --git a/Makefile b/Makefile
index 9bcfa8a0ee2136029322b041d32cb9903f7b11db..90f22518518aacbba3812ca455aa638ecb732552 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,11 @@ version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) nl80211.h iw.h Makefil
        @$(NQ) ' GEN ' $@
        $(Q)./version.sh $@
 
-%.o: %.c iw.h nl80211.h
+nl80211-commands.inc: nl80211.h
+       @$(NQ) ' GEN ' $@
+       $(Q)sed 's%^\tNL80211_CMD_%%;t n;d;:n s%^\([^=]*\),.*%\t[NL80211_CMD_\1] = \"\L\1\",%;t;d' nl80211.h | grep -v "reserved" > $@
+
+%.o: %.c iw.h nl80211.h nl80211-commands.inc
        @$(NQ) ' CC  ' $@
        $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
 
@@ -120,4 +124,4 @@ install: iw iw.8.gz
        $(Q)$(INSTALL) -m 644 iw.8.gz $(DESTDIR)$(MANDIR)/man8/
 
 clean:
-       $(Q)rm -f iw *.o *~ *.gz version.c *-stamp
+       $(Q)rm -f iw *.o *~ *.gz version.c *-stamp nl80211-commands.inc

diff --git a/util.c b/util.c
index cbac5ad46b7d98efad44ea829e72d233fd6eef84..886fef2b5e2c8ecdc9d40b620ea18cef11399167 100644 (file)
--- a/util.c
+++ b/util.c
@@ -148,145 +148,7 @@ const char *iftype_name(enum nl80211_iftype iftype)
 }
 
 static const char *commands[NL80211_CMD_MAX + 1] = {
-/*
- * sed 's%^\tNL80211_CMD_%%;t n;d;:n s%^\([^=]*\),.*%\t[NL80211_CMD_\1] = \"\L\1\",%;t;d' nl80211.h | grep -v "reserved"
- */
-       [NL80211_CMD_UNSPEC] = "unspec",
-       [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_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",
+#include "nl80211-commands.inc"
 };
 
 static char cmdbuf[100];