Browse Source

Merge "qca-wifi: Correct entries in command table"

Linux Build Service Account 5 years ago
parent
commit
fa0ac117da
1 changed files with 15 additions and 19 deletions
  1. 15 19
      tools/linux/cfg80211_ven_cmd.h

+ 15 - 19
tools/linux/cfg80211_ven_cmd.h

@@ -1207,7 +1207,7 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"get_mcastkeylen",     IEEE80211_PARAM_MCASTKEYLEN, GET_PARAM, 0},
 	{"ucastciphers",        IEEE80211_PARAM_UCASTCIPHERS, SET_PARAM, 1},
 	{"get_uciphers",        IEEE80211_PARAM_UCASTCIPHERS, GET_PARAM, 0},
-	{"ucastciphers",        IEEE80211_PARAM_UCASTCIPHER, SET_PARAM, 1},
+	{"ucastcipher",         IEEE80211_PARAM_UCASTCIPHER, SET_PARAM, 1},
 	{"get_ucastcipher",     IEEE80211_PARAM_UCASTCIPHER, GET_PARAM, 0},
 	{"ucastkeylen",         IEEE80211_PARAM_UCASTKEYLEN, SET_PARAM, 1},
 	{"get_ucastkeylen",     IEEE80211_PARAM_UCASTKEYLEN, GET_PARAM, 0},
@@ -1329,7 +1329,6 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"get_hbrtimer",        IEEE80211_PARAM_HBR_TIMER, GET_PARAM, 0},
 	{"get_hbrstate",        IEEE80211_PARAM_HBR_STATE, GET_PARAM, 0},
 	{"chextoffset",         IEEE80211_PARAM_CHEXTOFFSET, SET_PARAM, 1},
-	{"get_chextoffset",     IEEE80211_PARAM_CHEXTOFFSET, GET_PARAM, 0},
 	{"chscaninit",          IEEE80211_PARAM_CHSCANINIT, SET_PARAM, 1},
 	{"get_chscaninit",      IEEE80211_PARAM_CHSCANINIT, GET_PARAM, 0},
 	{"ht40intol",           IEEE80211_PARAM_HT40_INTOLERANT, SET_PARAM, 1},
@@ -1438,8 +1437,6 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"g_oce",               IEEE80211_PARAM_OCE, GET_PARAM, 0},
 	{"oce_asoc_rej",        IEEE80211_PARAM_OCE_ASSOC_REJECT, SET_PARAM, 1},
 	{"g_oce_asoc_rej",      IEEE80211_PARAM_OCE_ASSOC_REJECT, GET_PARAM, 0},
-	{"oce_asoc_rssi",       IEEE80211_PARAM_OCE_ASSOC_MIN_RSSI, SET_PARAM, 1},
-	{"g_oce_asoc_rssi",     IEEE80211_PARAM_OCE_ASSOC_MIN_RSSI, GET_PARAM, 0},
 	{"oce_asoc_dly",        IEEE80211_PARAM_OCE_ASSOC_RETRY_DELAY, SET_PARAM, 1},
 	{"g_oce_asoc_dly",      IEEE80211_PARAM_OCE_ASSOC_RETRY_DELAY, GET_PARAM, 0},
 	{"oce_wan_mtr",         IEEE80211_PARAM_OCE_WAN_METRICS, SET_PARAM, 2},
@@ -1455,8 +1452,9 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"rnr_fd",              IEEE80211_PARAM_RNR_FD, SET_PARAM, 1},
 	{"g_rnr_fd",            IEEE80211_PARAM_RNR_FD, GET_PARAM, 0},
 	{"rnr_tbtt",            IEEE80211_PARAM_RNR_TBTT, SET_PARAM, 1},
-	{"apchanrpt",           IEEE80211_PARAM_RNR_TBTT, GET_PARAM, 0},
-	{"g_apchanrpt",         IEEE80211_PARAM_AP_CHAN_RPT, SET_PARAM, 1},
+	{"g_rnr_tbtt",          IEEE80211_PARAM_RNR_TBTT, GET_PARAM, 0},
+	{"apchanrpt",           IEEE80211_PARAM_AP_CHAN_RPT, SET_PARAM, 1},
+	{"g_apchanrpt",         IEEE80211_PARAM_AP_CHAN_RPT, GET_PARAM, 0},
 	{"mgmt_rate",           IEEE80211_PARAM_MGMT_RATE, SET_PARAM, 1},
 	{"g_mgmt_rate",         IEEE80211_PARAM_MGMT_RATE, GET_PARAM, 0},
 	{"rrm",                 IEEE80211_PARAM_RRM_CAP, SET_PARAM, 1},
@@ -1492,19 +1490,19 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"get_ccmpSwSelEn",     IEEE80211_PARAM_CCMPSW_ENCDEC, GET_PARAM, 0},
 	{"periodicScan",        IEEE80211_PARAM_PERIODIC_SCAN, SET_PARAM, 1},
 	{"g_periodicScan",      IEEE80211_PARAM_PERIODIC_SCAN, GET_PARAM, 0},
+	{"csa2g",               IEEE80211_PARAM_2G_CSA, SET_PARAM, 1},
+	{"get_csa2g",           IEEE80211_PARAM_2G_CSA, GET_PARAM, 0},
 	{"wapi_rkupkt",         IEEE80211_PARAM_WAPIREKEY_USK, SET_PARAM, 1},
 	{"get_wapi_rkupkt",     IEEE80211_PARAM_WAPIREKEY_USK, GET_PARAM, 0},
 	{"wapi_rkmpkt",         IEEE80211_PARAM_WAPIREKEY_MSK, SET_PARAM, 1},
 	{"get_wapi_rkmpkt",     IEEE80211_PARAM_WAPIREKEY_MSK, GET_PARAM, 0},
-	{"csa2g",               IEEE80211_PARAM_2G_CSA, SET_PARAM, 1},
-	{"get_csa2g",           IEEE80211_PARAM_2G_CSA, GET_PARAM, 0},
 	{"wapi_rkupdate",       IEEE80211_PARAM_WAPIREKEY_UPDATE, SET_PARAM, 1},
 	{"wdsaddr",             IEEE80211_PARAM_ADD_WDS_ADDR, SET_PARAM, 1},
 #if UMAC_SUPPORT_VI_DBG
 	{"dbgcfg",              IEEE80211_PARAM_DBG_CFG, SET_PARAM, 1},
 	{"getdbgcfg",           IEEE80211_PARAM_DBG_CFG, GET_PARAM, 0},
-	{"dbgrestart",          IEEE80211_PARAM_DBG_NUM_STREAMS, SET_PARAM, 1},
-	{"getdbgrestart",       IEEE80211_PARAM_DBG_NUM_STREAMS, GET_PARAM, 0},
+	{"dbgrestart",          IEEE80211_PARAM_RESTART, SET_PARAM, 1},
+	{"getdbgrestart",       IEEE80211_PARAM_RESTART, GET_PARAM, 0},
 	{"rxdropstats",         IEEE80211_PARAM_RXDROP_STATUS, SET_PARAM, 1},
 	{"getrxdropstats",      IEEE80211_PARAM_RXDROP_STATUS, GET_PARAM, 0},
 #endif
@@ -1640,8 +1638,8 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"get_vhtstscap",       IEEE80211_PARAM_VHT_STS_CAP, GET_PARAM, 0},
 	{"vhtsounddim",         IEEE80211_PARAM_VHT_SOUNDING_DIM, SET_PARAM, 1},
 	{"get_vhtsounddim",     IEEE80211_PARAM_VHT_SOUNDING_DIM, GET_PARAM, 0},
-	{"vhtsubfee",           IEEE80211_PARAM_VHT_MUBFEE, SET_PARAM, 1},
-	{"get_vhtsubfee",       IEEE80211_PARAM_VHT_MUBFEE, GET_PARAM, 0},
+	{"vhtsubfee",           IEEE80211_PARAM_VHT_SUBFEE, SET_PARAM, 1},
+	{"get_vhtsubfee",       IEEE80211_PARAM_VHT_SUBFEE, GET_PARAM, 0},
 	{"vhtmubfee",           IEEE80211_PARAM_VHT_MUBFEE, SET_PARAM, 1},
 	{"get_vhtmubfee",       IEEE80211_PARAM_VHT_MUBFEE, GET_PARAM, 0},
 	{"vhtsubfer",           IEEE80211_PARAM_VHT_SUBFER, SET_PARAM, 1},
@@ -1719,7 +1717,7 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"get_blbwnssmap",      IEEE80211_DISABLE_STA_BWNSS_ADV, GET_PARAM, 0},
 	{"neighbourfilter",     IEEE80211_PARAM_RX_FILTER_NEIGHBOUR_PEERS_MONITOR,
 		SET_PARAM, 1},
-	{"get_whc_wds", IEEE80211_PARAM_WHC_APINFO_WDS, GET_PARAM, 0},
+	{"get_whc_wds",         IEEE80211_PARAM_WHC_APINFO_WDS, GET_PARAM, 0},
 	{"set_whc_dist",        IEEE80211_PARAM_WHC_APINFO_ROOT_DIST, SET_PARAM, 1},
 	{"get_whc_dist",        IEEE80211_PARAM_WHC_APINFO_ROOT_DIST, GET_PARAM, 0},
 	{"assocwar160",         IEEE80211_PARAM_CONFIG_ASSOC_WAR_160W, SET_PARAM, 1},
@@ -1839,7 +1837,7 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"g_db_timeout",        IEEE80211_PARAM_DBEACON_TIMEOUT, GET_PARAM, 0},
 #endif
 	{"s_txpow_mgmt",        IEEE80211_PARAM_TXPOW_MGMT, SET_PARAM, 2},
-	{"g_txpow_mgmt",        IEEE80211_PARAM_TXPOW_MGMT, GET_PARAM, 0},
+	{"g_txpow_mgmt",        IEEE80211_PARAM_TXPOW_MGMT, GET_PARAM, 1},
 	{"tx_capture",          IEEE80211_PARAM_CONFIG_TX_CAPTURE, SET_PARAM, 1},
 	{"g_tx_capture",        IEEE80211_PARAM_CONFIG_TX_CAPTURE, GET_PARAM, 0},
 	{"backhaul",            IEEE80211_PARAM_BACKHAUL, SET_PARAM, 1},
@@ -1932,7 +1930,7 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"enable_11v_dms",      IEEE80211_PARAM_DMS_AMSDU_WAR, SET_PARAM, 1},
 	{"g_enable_11v_dms",    IEEE80211_PARAM_DMS_AMSDU_WAR, GET_PARAM, 0},
 	{"s_txpow",             IEEE80211_PARAM_TXPOW, SET_PARAM, 2},
-	{"g_txpow",             IEEE80211_PARAM_TXPOW, GET_PARAM, 0},
+	{"g_txpow",             IEEE80211_PARAM_TXPOW, GET_PARAM, 1},
 	{"ul_hyst",             IEEE80211_PARAM_BEST_UL_HYST, SET_PARAM, 1},
 	{"g_ul_hyst",           IEEE80211_PARAM_BEST_UL_HYST, GET_PARAM, 0},
 	{"he_txmcsmap",         IEEE80211_PARAM_HE_TX_MCSMAP, SET_PARAM, 1},
@@ -2045,7 +2043,7 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"tx_lat_capture",      IEEE80211_PARAM_CONFIG_CAPTURE_LATENCY_ENABLE,
 		SET_PARAM, 1},
 	{"g_tx_lat_cptr",       IEEE80211_PARAM_CONFIG_CAPTURE_LATENCY_ENABLE,
-		SET_PARAM, 1},
+		GET_PARAM, 1},
 	{"get_ru26_tolerance",  IEEE80211_PARAM_GET_RU26_TOLERANCE, GET_PARAM, 0},
 	{"get_whc_ul_snr",      IEEE80211_PARAM_WHC_APINFO_UPLINK_SNR, GET_PARAM, 0},
 	{"set_dpp_mode",        IEEE80211_PARAM_DPP_VAP_MODE, SET_PARAM, 1},
@@ -2141,8 +2139,6 @@ struct vendor_commands vap_vendor_cmds[] = {
 	{"he_dlofdma_bf",       IEEE80211_PARAM_HE_DL_MU_OFDMA_BFER, SET_PARAM, 1},
 	{"g_he_dlofdma_bf",     IEEE80211_PARAM_HE_DL_MU_OFDMA_BFER, GET_PARAM, 0},
 	{"sendprobereq",        IEEE80211_PARAM_SEND_PROBE_REQ, SET_PARAM, 1},
-	{"min_asoc_rssi",       IEEE80211_PARAM_ASSOC_MIN_RSSI, SET_PARAM, 1},
-	{"g_min_asoc_rssi",     IEEE80211_PARAM_ASSOC_MIN_RSSI, GET_PARAM, 0},
 	{"oce_txpower",         IEEE80211_PARAM_OCE_TX_POWER, SET_PARAM, 2},
 	{"g_oce_txpower",       IEEE80211_PARAM_OCE_TX_POWER, GET_PARAM, 0},
 	{"oce_subnet_id",       IEEE80211_PARAM_OCE_IP_SUBNET_ID, SET_PARAM, 2},
@@ -2544,7 +2540,7 @@ struct vendor_commands radio_vendor_cmds[] = {
 	{"arp_dbg_dstaddr",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_DBG_ARP_DST_ADDR, SET_PARAM, 1},
 	{"arp_dbg_conf",
-		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_DBG_ARP_DST_ADDR, SET_PARAM, 1},
+		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ARP_DBG_CONF, SET_PARAM, 1},
 	{"g_arp_dbg_conf",
 		OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ARP_DBG_CONF, GET_PARAM, 0},
 	{"st_ht_noamsdu",