qcacld-3.0: Remove obsolete 11d scan callback mechanism
SME exposes an 802.11d scan callback mechansim that was used by a prior generation of the driver. The current generation no longer uses this callback, so remove it. Change-Id: I11b7916fd8244f3ba03ec73779a8c7e61c2a06ab CRs-Fixed: 2273914
This commit is contained in:
@@ -7995,39 +7995,6 @@ void wlan_hdd_clear_netif_queue_history(struct hdd_context *hdd_ctx)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* hdd_11d_scan_done() - callback for 11d scan completion of flushing results
|
||||
* @mac_handle: MAC handle
|
||||
* @context: Pointer to the context
|
||||
* @session_id: Session ID
|
||||
* @scan_id: Scan ID
|
||||
* @status: Status
|
||||
*
|
||||
* This is the callback to be executed when 11d scan is completed to flush out
|
||||
* the scan results
|
||||
*
|
||||
* 11d scan is done during driver load and is a passive scan on all
|
||||
* channels supported by the device, 11d scans may find some APs on
|
||||
* frequencies which are forbidden to be used in the regulatory domain
|
||||
* the device is operating in. If these APs are notified to the supplicant
|
||||
* it may try to connect to these APs, thus flush out all the scan results
|
||||
* which are present in SME after 11d scan is done.
|
||||
*
|
||||
* Return: QDF_STATUS_SUCCESS
|
||||
*/
|
||||
static QDF_STATUS hdd_11d_scan_done(mac_handle_t mac_handle, void *context,
|
||||
uint8_t session_id, uint32_t scan_id,
|
||||
eCsrScanStatus status)
|
||||
{
|
||||
hdd_enter();
|
||||
|
||||
sme_scan_flush_result(mac_handle);
|
||||
|
||||
hdd_exit();
|
||||
|
||||
return QDF_STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef WLAN_FEATURE_OFFLOAD_PACKETS
|
||||
/**
|
||||
* hdd_init_offloaded_packets_ctx() - Initialize offload packets context
|
||||
@@ -11280,7 +11247,6 @@ int hdd_register_cb(struct hdd_context *hdd_ctx)
|
||||
hdd_enter();
|
||||
|
||||
mac_handle = hdd_ctx->mac_handle;
|
||||
sme_register11d_scan_done_callback(mac_handle, hdd_11d_scan_done);
|
||||
|
||||
sme_register_oem_data_rsp_callback(mac_handle,
|
||||
hdd_send_oem_data_rsp_msg);
|
||||
@@ -11387,7 +11353,6 @@ void hdd_deregister_cb(struct hdd_context *hdd_ctx)
|
||||
hdd_err("Failed to de-register data stall detect event callback");
|
||||
|
||||
sme_deregister_oem_data_rsp_callback(mac_handle);
|
||||
sme_deregister11d_scan_done_callback(mac_handle);
|
||||
|
||||
hdd_exit();
|
||||
}
|
||||
|
@@ -1656,14 +1656,6 @@ struct wep_update_default_key_idx {
|
||||
uint8_t default_idx;
|
||||
};
|
||||
|
||||
/*
|
||||
* NOTE: p2 is the second context pass in for the caller
|
||||
* NOTE: what if callback is called before requester gets the scanId??
|
||||
*/
|
||||
typedef QDF_STATUS (*csr_scan_completeCallback)(tHalHandle, void *p2,
|
||||
uint8_t sessionId,
|
||||
uint32_t scanID,
|
||||
eCsrScanStatus status);
|
||||
typedef QDF_STATUS (*csr_roam_complete_cb)(void *context,
|
||||
struct csr_roam_info *param,
|
||||
uint32_t roam_id,
|
||||
|
@@ -685,7 +685,6 @@ struct csr_scanstruct {
|
||||
struct csr_channel occupiedChannels[CSR_ROAM_SESSION_MAX];
|
||||
int8_t roam_candidate_count[CSR_ROAM_SESSION_MAX];
|
||||
int8_t inScanResultBestAPRssi;
|
||||
csr_scan_completeCallback callback11dScanDone;
|
||||
bool fcc_constraint;
|
||||
uint8_t max_scan_count;
|
||||
bool defer_update_channel_list;
|
||||
|
@@ -523,9 +523,6 @@ QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId,
|
||||
extern QDF_STATUS sme_set_host_power_save(tHalHandle hHal, bool psMode);
|
||||
|
||||
void sme_set_dhcp_till_power_active_flag(tHalHandle hHal, uint8_t flag);
|
||||
extern QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal,
|
||||
csr_scan_completeCallback);
|
||||
void sme_deregister11d_scan_done_callback(tHalHandle hHal);
|
||||
|
||||
#ifdef FEATURE_OEM_DATA_SUPPORT
|
||||
extern QDF_STATUS sme_register_oem_data_rsp_callback(tHalHandle h_hal,
|
||||
|
@@ -3900,49 +3900,6 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag)
|
||||
ps_global_info->remain_in_power_active_till_dhcp = flag;
|
||||
}
|
||||
|
||||
/*
|
||||
* sme_register11d_scan_done_callback() -
|
||||
* Register a routine of type csr_scan_completeCallback which is
|
||||
* called whenever an 11d scan is done
|
||||
*
|
||||
* hHal - The handle returned by mac_open.
|
||||
* callback - 11d scan complete routine to be registered
|
||||
* Return QDF_STATUS
|
||||
*/
|
||||
QDF_STATUS sme_register11d_scan_done_callback(tHalHandle hHal,
|
||||
csr_scan_completeCallback callback)
|
||||
{
|
||||
QDF_STATUS status = QDF_STATUS_SUCCESS;
|
||||
tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
|
||||
|
||||
pMac->scan.callback11dScanDone = callback;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* sme_deregister11d_scan_done_callback() - De-register scandone callback
|
||||
* @h_hal: Handler return by mac_open
|
||||
*
|
||||
* This function De-registers the scandone callback to SME
|
||||
*
|
||||
* Return: None
|
||||
*/
|
||||
void sme_deregister11d_scan_done_callback(tHalHandle h_hal)
|
||||
{
|
||||
tpAniSirGlobal pmac;
|
||||
|
||||
if (!h_hal) {
|
||||
QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
|
||||
FL("hHal is not valid"));
|
||||
return;
|
||||
}
|
||||
|
||||
pmac = PMAC_STRUCT(h_hal);
|
||||
pmac->scan.callback11dScanDone = NULL;
|
||||
}
|
||||
|
||||
|
||||
#ifdef FEATURE_OEM_DATA_SUPPORT
|
||||
/**
|
||||
* sme_register_oem_data_rsp_callback() - Register a routine of
|
||||
|
Reference in New Issue
Block a user