Merge "qca-wifi: Multi-Link Repeater Functionality"
diff --git a/dp/wifi3.0/dp_tx_capture.c b/dp/wifi3.0/dp_tx_capture.c
index 60cfe91..2f0ebc0 100644
--- a/dp/wifi3.0/dp_tx_capture.c
+++ b/dp/wifi3.0/dp_tx_capture.c
@@ -5251,7 +5251,6 @@
set_mpdu_info(&tx_capture_info,
&ppdu_info->rx_status, rx_user_status);
- tx_capture_info.mpdu_info.mcs = rx_user_status->mcs;
/* ppdu_desc is not required for legacy frames */
tx_capture_info.ppdu_desc = NULL;
diff --git a/tools/linux/cfg80211_ven_cmd.h b/tools/linux/cfg80211_ven_cmd.h
index 48f2a10..c02ef39 100644
--- a/tools/linux/cfg80211_ven_cmd.h
+++ b/tools/linux/cfg80211_ven_cmd.h
@@ -1300,7 +1300,6 @@
{"set11NRetries", IEEE80211_PARAM_11N_RETRIES, SET_PARAM, 1},
{"get11NRetries", IEEE80211_PARAM_11N_RETRIES, GET_PARAM, 0},
{"dbgLVL", IEEE80211_PARAM_DBG_LVL, SET_PARAM, 1},
- {"getdbgLVL", IEEE80211_PARAM_DBG_LVL, GET_PARAM, 0},
{"wdsdetect", IEEE80211_PARAM_WDS_AUTODETECT, SET_PARAM, 1},
{"get_wdsdetect", IEEE80211_PARAM_WDS_AUTODETECT, GET_PARAM, 0},
{"ignore11d", IEEE80211_PARAM_IGNORE_11DBEACON, SET_PARAM, 1},
@@ -1816,7 +1815,6 @@
{"g_vie_ena", IEEE80211_PARAM_ENABLE_VENDOR_IE, GET_PARAM, 0},
{"set_whc_sfactor", IEEE80211_PARAM_WHC_APINFO_SFACTOR, SET_PARAM, 1},
{"get_whc_sfactor", IEEE80211_PARAM_WHC_APINFO_SFACTOR, GET_PARAM, 0},
- {"get_whc_bssid", IEEE80211_PARAM_WHC_APINFO_BSSID, GET_PARAM, 0},
{"get_whc_rate", IEEE80211_PARAM_WHC_APINFO_RATE, GET_PARAM, 0},
{"mon_decoder", IEEE80211_PARAM_CONFIG_MON_DECODER, SET_PARAM, 1},
{"g_mon_decoder", IEEE80211_PARAM_CONFIG_MON_DECODER, GET_PARAM, 0},
@@ -1826,7 +1824,6 @@
{"get_mucapwar", IEEE80211_PARAM_CONFIG_MU_CAP_WAR, GET_PARAM, 0},
{"nstswar", IEEE80211_PARAM_CONFIG_NSTSCAP_WAR, SET_PARAM, 1},
{"get_nstswar", IEEE80211_PARAM_CONFIG_NSTSCAP_WAR, GET_PARAM, 0},
- {"g_whc_cap_bssid", IEEE80211_PARAM_WHC_APINFO_CAP_BSSID, GET_PARAM, 0},
{"set_bcn_rate", IEEE80211_PARAM_BEACON_RATE_FOR_VAP, SET_PARAM, 1},
{"get_bcn_rate", IEEE80211_PARAM_BEACON_RATE_FOR_VAP, GET_PARAM, 0},
{"csmode", IEEE80211_PARAM_CHANNEL_SWITCH_MODE, SET_PARAM, 1},
@@ -1875,11 +1872,6 @@
{"caprssi", IEEE80211_PARAM_WHC_CAP_RSSI, SET_PARAM, 1},
{"g_caprssi", IEEE80211_PARAM_WHC_CAP_RSSI, GET_PARAM, 0},
{"g_curr_caprssi", IEEE80211_PARAM_WHC_CURRENT_CAP_RSSI, GET_PARAM, 0},
- {"g_best_ob_bssid",
- IEEE80211_PARAM_WHC_APINFO_BEST_UPLINK_OTHERBAND_BSSID, GET_PARAM, 0},
- {"g_whc_ob_bssid", IEEE80211_PARAM_WHC_APINFO_OTHERBAND_UPLINK_BSSID,
- GET_PARAM, 0},
- {"otherband_bssid", IEEE80211_PARAM_WHC_APINFO_OTHERBAND_BSSID, SET_PARAM, 2},
{"set_whc_ul_rate", IEEE80211_PARAM_WHC_APINFO_UPLINK_RATE, SET_PARAM, 1},
{"get_whc_ul_rate", IEEE80211_PARAM_WHC_APINFO_UPLINK_RATE, GET_PARAM, 0},
{"he_subfee", IEEE80211_PARAM_HE_SU_BFEE, SET_PARAM, 1},
@@ -2007,7 +1999,7 @@
{"he_ul_mcs", IEEE80211_PARAM_HE_UL_FIXED_RATE, SET_PARAM, 1},
{"get_he_ul_mcs", IEEE80211_PARAM_HE_UL_FIXED_RATE, GET_PARAM, 0},
#if WLAN_SER_DEBUG
- {"ser_history", IEEE80211_PARAM_WLAN_SER_HISTORY, GET_PARAM, 2},
+ {"ser_history", IEEE80211_PARAM_WLAN_SER_HISTORY, SET_PARAM, 2},
#endif
{"da_wds_war", IEEE80211_PARAM_DA_WAR_ENABLE, SET_PARAM, 1},
{"g_da_wds_war", IEEE80211_PARAM_DA_WAR_ENABLE, GET_PARAM, 0},
@@ -2040,7 +2032,6 @@
{"get_he_amsdu_in_ampdu_supp", IEEE80211_PARAM_HE_AMSDU_IN_AMPDU_SUPRT,
GET_PARAM, 0},
{"he_bfee_sts_supp", IEEE80211_PARAM_HE_SUBFEE_STS_SUPRT, SET_PARAM, 2},
- {"get_he_bfee_sts_supp", IEEE80211_PARAM_HE_SUBFEE_STS_SUPRT, GET_PARAM, 0},
{"he_4xltf_800nsgi_rx", IEEE80211_PARAM_HE_4XLTF_800NS_GI_RX_SUPRT,
SET_PARAM, 1},
{"get_he_4xltf_800nsgi_rx", IEEE80211_PARAM_HE_4XLTF_800NS_GI_RX_SUPRT,
@@ -2151,7 +2142,7 @@
#endif
{"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, 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},
@@ -2998,12 +2989,12 @@
OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_GET_PDEV_NUM_MONITOR_VDEVS, GET_PARAM, 0},
{"set_opclass_tbl",
OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_OPCLASS_TBL, SET_PARAM, 1},
+ {"get_opclass_tbl",
+ OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_OPCLASS_TBL, GET_PARAM, 0},
#ifdef CE_TASKLET_DEBUG_ENABLE
{"ce_debug_stats",
OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ENABLE_CE_LATENCY_STATS, SET_PARAM, 1},
#endif
- {"get_opclass_tbl",
- OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_OPCLASS_TBL, GET_PARAM, 0},
#ifdef QCA_SUPPORT_ADFS_RCAC
{"rCACEn",
OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_ROLLING_CAC_ENABLE, SET_PARAM, 1},
@@ -3014,14 +3005,14 @@
{"get_rCACfreq",
OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_CONFIGURE_RCAC_FREQ, GET_PARAM, 0},
#endif
- {"setNxtRadarFreq",
- OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_NXT_RDR_FREQ, SET_PARAM, 1},
- {"getNxtRadarFreq",
- OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_NXT_RDR_FREQ, GET_PARAM, 0},
#if ATH_SUPPORT_DFS
{"scan_over_cac_en",
OL_ATH_PARAM_SHIFT | OL_ATH_SCAN_OVER_CAC, SET_PARAM, 1},
#endif
+ {"setNxtRadarFreq",
+ OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_NXT_RDR_FREQ, SET_PARAM, 1},
+ {"getNxtRadarFreq",
+ OL_ATH_PARAM_SHIFT | OL_ATH_PARAM_NXT_RDR_FREQ, GET_PARAM, 0},
{"setCountryID",
OL_SPECIAL_PARAM_SHIFT | OL_SPECIAL_PARAM_COUNTRY_ID, SET_PARAM, 1},
{"getCountryID",