diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 05277cd6dafb..ca162adbab35 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -1633,158 +1633,6 @@ struct mobility_domain_info { uint16_t mobility_domain; }; -#ifndef ROAM_OFFLOAD_V1 -#define WMI_HOST_ROAM_OFFLOAD_NUM_MCS_SET (16) - -/* This TLV will be filled only in case roam offload - * for wpa2-psk/pmkid/ese/11r is enabled */ -typedef struct { - uint32_t rssi_cat_gap; /* gap for every category bucket */ - uint32_t prefer_5g; /* prefer select 5G candidate */ - uint32_t select_5g_margin; - uint32_t reassoc_failure_timeout; /* reassoc failure timeout */ - uint32_t capability; - uint32_t ht_caps_info; - uint32_t ampdu_param; - uint32_t ht_ext_cap; - uint32_t ht_txbf; - uint32_t asel_cap; - uint32_t qos_enabled; - uint32_t qos_caps; - uint32_t wmm_caps; - /* since this is 4 byte aligned, we don't declare it as tlv array */ - uint32_t mcsset[WMI_HOST_ROAM_OFFLOAD_NUM_MCS_SET >> 2]; - uint32_t ho_delay_for_rx; - uint32_t roam_preauth_retry_count; - uint32_t roam_preauth_no_ack_timeout; -} roam_offload_param; - -#define WMI_FILS_MAX_RRK_LENGTH 64 -#define WMI_FILS_MAX_RIK_LENGTH WMI_FILS_MAX_RRK_LENGTH -#define WMI_FILS_MAX_REALM_LENGTH 256 -#define WMI_FILS_MAX_USERNAME_LENGTH 16 -#define WMI_FILS_FT_MAX_LEN 48 - -/** - * struct roam_fils_params - Roam FILS params - * @username: username - * @username_length: username length - * @next_erp_seq_num: next ERP sequence number - * @rrk: RRK - * @rrk_length: length of @rrk - * @rik: RIK - * @rik_length: length of @rik - * @realm: realm - * @realm_len: length of @realm - * @fils_ft: xx_key for FT-FILS connection - * @fils_ft_len: length of FT-FILS - */ -struct roam_fils_params { - uint8_t username[WMI_FILS_MAX_USERNAME_LENGTH]; - uint32_t username_length; - uint32_t next_erp_seq_num; - uint8_t rrk[WMI_FILS_MAX_RRK_LENGTH]; - uint32_t rrk_length; - uint8_t rik[WMI_FILS_MAX_RIK_LENGTH]; - uint32_t rik_length; - uint8_t realm[WMI_FILS_MAX_REALM_LENGTH]; - uint32_t realm_len; - uint8_t fils_ft[WMI_FILS_FT_MAX_LEN]; - uint8_t fils_ft_len; -}; - -/* struct roam_offload_scan_params - structure - * containing roaming offload scan parameters - * @is_roam_req_valid: flag to tell whether roam req - * is valid or NULL - * @mode: stores flags for scan - * @vdev_id: vdev id - * @roam_offload_enabled: flag for offload enable - * @disable_self_roam: disable roaming to self BSSID - * @psk_pmk: pre shared key/pairwise master key - * @pmk_len: length of PMK - * @prefer_5ghz: prefer select 5G candidate - * @roam_rssi_cat_gap: gap for every category bucket - * @select_5ghz_margin: select 5 Ghz margin - * @krk: KRK - * @btk: BTK - * @reassoc_failure_timeout: reassoc failure timeout - * @rokh_id_length: r0kh id length - * @rokh_id: r0kh id - * @roam_key_mgmt_offload_enabled: roam offload flag - * @auth_mode: authentication mode - * @fw_okc: use OKC in firmware - * @fw_pmksa_cache: use PMKSA cache in firmware - * @is_ese_assoc: flag to determine ese assoc - * @mdid: mobility domain info - * @roam_offload_params: roam offload tlv params - * @min_delay_btw_roam_scans: Delay btw two scans - * @roam_trigger_reason_bitmask: Roam reason bitmark - * @roam_offload_params: roam offload tlv params, unused - * in non tlv target, only for roam offload feature - * @assoc_ie_length: Assoc IE length - * @assoc_ie: Assoc IE buffer - * @add_fils_tlv: add FILS TLV boolean - * @roam_fils_params: roam fils params - * @rct_validity_timer: duration value for which the entries in - * roam candidate table are valid - * @roam_scan_inactivity_time: inactivity monitoring time in ms for which the - * device is considered to be inactive - * @is_sae_same_pmk: Flag to indicate fw whether WLAN_SAE_SINGLE_PMK feature is - * enable or not - * @enable_ft_im_roaming: Flag to enable/disable FT-IM roaming upon receiving - * deauth - * @roam_inactive_data_packet_count: Maximum allowed data packets count during - * roam_scan_inactivity_time. - * @roam_scan_period_after_inactivity: Roam scan period in ms after device is - * in inactive state. - */ -struct roam_offload_scan_params { - uint8_t is_roam_req_valid; - uint32_t mode; - uint32_t vdev_id; -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - uint8_t roam_offload_enabled; - bool disable_self_roam; - uint8_t psk_pmk[WMI_ROAM_SCAN_PSK_SIZE]; - uint32_t pmk_len; - uint8_t prefer_5ghz; - uint8_t roam_rssi_cat_gap; - uint8_t select_5ghz_margin; - uint8_t krk[WMI_KRK_KEY_LEN]; - uint8_t btk[WMI_BTK_KEY_LEN]; - uint32_t reassoc_failure_timeout; - uint32_t rokh_id_length; - uint8_t rokh_id[WMI_ROAM_R0KH_ID_MAX_LEN]; - uint8_t roam_key_mgmt_offload_enabled; - int auth_mode; - bool fw_okc; - bool fw_pmksa_cache; - uint32_t rct_validity_timer; - bool is_adaptive_11r; - bool is_sae_same_pmk; - bool enable_ft_im_roaming; -#endif - uint32_t min_delay_btw_roam_scans; - uint32_t roam_trigger_reason_bitmask; - bool is_ese_assoc; - bool is_11r_assoc; - struct mobility_domain_info mdid; -#ifdef WLAN_FEATURE_ROAM_OFFLOAD - roam_offload_param roam_offload_params; -#endif - uint32_t assoc_ie_length; - uint8_t assoc_ie[MAX_ASSOC_IE_LENGTH]; - bool add_fils_tlv; - uint32_t roam_scan_inactivity_time; - uint32_t roam_inactive_data_packet_count; - uint32_t roam_scan_period_after_inactivity; -#ifdef WLAN_FEATURE_FILS_SK - struct roam_fils_params roam_fils_params; -#endif -}; -#endif - /** * struct wifi_epno_network - enhanced pno network block * @ssid: ssid diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index fc80fdc11867..5a7b8582ed5b 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -663,7 +663,6 @@ QDF_STATUS (*send_set_rssi_monitoring_cmd)(wmi_unified_t wmi_handle, struct rssi_monitor_param *req); #endif /* FEATURE_RSSI_MONITOR */ -#ifdef ROAM_OFFLOAD_V1 QDF_STATUS (*send_roam_scan_offload_rssi_thresh_cmd)( wmi_unified_t wmi_handle, struct wlan_roam_offload_scan_rssi_params *roam_req); @@ -671,15 +670,6 @@ QDF_STATUS (*send_roam_scan_offload_rssi_thresh_cmd)( QDF_STATUS (*send_roam_scan_offload_scan_period_cmd)( wmi_unified_t wmi_handle, struct wlan_roam_scan_period_params *params); -#else -QDF_STATUS (*send_roam_scan_offload_rssi_thresh_cmd)( - wmi_unified_t wmi_handle, - struct roam_offload_scan_rssi_params *roam_req); - -QDF_STATUS (*send_roam_scan_offload_scan_period_cmd)( - wmi_unified_t wmi_handle, - struct roam_scan_period_params *params); -#endif QDF_STATUS (*send_roam_mawc_params_cmd)( wmi_unified_t wmi_handle, @@ -688,15 +678,9 @@ QDF_STATUS (*send_roam_mawc_params_cmd)( QDF_STATUS (*send_roam_scan_filter_cmd)(wmi_unified_t wmi_handle, struct roam_scan_filter_params *roam_req); -#ifdef ROAM_OFFLOAD_V1 QDF_STATUS (*send_roam_scan_offload_mode_cmd)( wmi_unified_t wmi_handle, struct wlan_roam_scan_offload_params *rso_cfg); -#else -QDF_STATUS (*send_roam_scan_offload_mode_cmd)(wmi_unified_t wmi_handle, - wmi_start_scan_cmd_fixed_param *scan_cmd_fp, - struct roam_offload_scan_params *roam_req); -#endif QDF_STATUS (*send_roam_scan_offload_ap_profile_cmd)(wmi_unified_t wmi_handle, struct ap_profile_params *ap_profile); @@ -704,7 +688,6 @@ QDF_STATUS (*send_roam_scan_offload_ap_profile_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*send_roam_scan_offload_cmd)(wmi_unified_t wmi_handle, uint32_t command, uint32_t vdev_id); -#ifdef ROAM_OFFLOAD_V1 QDF_STATUS (*send_roam_scan_offload_chan_list_cmd)( wmi_unified_t wmi_handle, struct wlan_roam_scan_channel_list *rso_ch_info); @@ -713,17 +696,6 @@ QDF_STATUS (*send_roam_scan_offload_rssi_change_cmd)( wmi_unified_t wmi_handle, struct wlan_roam_rssi_change_params *params); -#else -QDF_STATUS (*send_roam_scan_offload_rssi_change_cmd)(wmi_unified_t wmi_handle, - uint32_t vdev_id, - int32_t rssi_change_thresh, - uint32_t hirssi_delay_btw_scans); -QDF_STATUS (*send_roam_scan_offload_chan_list_cmd)(wmi_unified_t wmi_handle, - uint8_t chan_count, - uint32_t *chan_list, - uint8_t list_type, uint32_t vdev_id); -#endif - QDF_STATUS (*send_per_roam_config_cmd)(wmi_unified_t wmi_handle, struct wlan_per_roam_config_req *req_buf);