diff options
| author | Srinivas Girigowda <sgirigow@codeaurora.org> | 2018-04-11 15:18:10 -0700 |
|---|---|---|
| committer | nshrivas <nshrivas@codeaurora.org> | 2018-04-13 22:09:35 -0700 |
| commit | da2c4bb9aa18907b0b27676d659dc8df7b0837a5 (patch) | |
| tree | ba3a1c77668d5b9e996b5d5be2ba622fdd6335bf | |
| parent | 6ea2dc09c1c204dd56cb7c3c62444d05b7ce474d (diff) | |
qcacld-3.0: Fix function type for sap_restart_chan_switch_cb
Fix function type for sap_restart_chan_switch_cb.
Change-Id: If6be49296c97b5f9a597910c551db1ed8f4dd45c
CRs-Fixed: 2222943
| -rw-r--r-- | core/cds/inc/cds_concurrency.h | 5 | ||||
| -rw-r--r-- | core/cds/inc/cds_sched.h | 4 | ||||
| -rw-r--r-- | core/cds/src/cds_concurrency.c | 3 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_main.c | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/core/cds/inc/cds_concurrency.h b/core/cds/inc/cds_concurrency.h index b6361ed00013..9e42e31a1189 100644 --- a/core/cds/inc/cds_concurrency.h +++ b/core/cds/inc/cds_concurrency.h @@ -66,6 +66,8 @@ #define MAX_MAC 2 +struct hdd_adapter_s; + /** * enum hw_mode_ss_config - Possible spatial stream configuration * @SS_0x0: Unused Tx and Rx of MAC @@ -865,7 +867,8 @@ QDF_STATUS cds_set_sap_mandatory_channels(uint8_t *channels, uint32_t len); QDF_STATUS cds_reset_sap_mandatory_channels(void); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH QDF_STATUS cds_register_sap_restart_channel_switch_cb( - void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t)); + void (*sap_restart_chan_switch_cb)(struct hdd_adapter_s *, + uint32_t, uint32_t)); QDF_STATUS cds_deregister_sap_restart_channel_switch_cb(void); #endif bool cds_is_any_mode_active_on_band_along_with_session(uint8_t session_id, diff --git a/core/cds/inc/cds_sched.h b/core/cds/inc/cds_sched.h index a5eaeb07a18e..c4f1f1cac545 100644 --- a/core/cds/inc/cds_sched.h +++ b/core/cds/inc/cds_sched.h @@ -248,6 +248,7 @@ typedef struct _cds_msg_wrapper { /* forward-declare hdd_context_s as it is used ina function type */ struct hdd_context_s; +struct hdd_adapter_s; typedef struct _cds_context_type { /* Messages buffers */ cds_msg_t aMsgBuffers[CDS_CORE_MAX_MESSAGES]; @@ -308,7 +309,8 @@ typedef struct _cds_context_type { qdf_mutex_t qdf_conc_list_lock; qdf_mc_timer_t dbs_opportunistic_timer; #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH - void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t); + void (*sap_restart_chan_switch_cb)(struct hdd_adapter_s *, + uint32_t, uint32_t); #endif QDF_STATUS (*sme_get_valid_channels)(void*, uint16_t cfg_id, uint8_t *, uint32_t *); diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c index 617f953b40a2..0d90da60bad8 100644 --- a/core/cds/src/cds_concurrency.c +++ b/core/cds/src/cds_concurrency.c @@ -9395,7 +9395,8 @@ QDF_STATUS cds_restart_opportunistic_timer(bool check_state) * Return: QDF_STATUS */ QDF_STATUS cds_register_sap_restart_channel_switch_cb( - void (*sap_restart_chan_switch_cb)(void *, uint32_t, uint32_t)) + void (*sap_restart_chan_switch_cb)(struct hdd_adapter_s *, + uint32_t, uint32_t)) { p_cds_contextType cds_ctx; diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 036b23067056..807890955182 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -9458,7 +9458,7 @@ QDF_STATUS hdd_register_for_sap_restart_with_channel_switch(void) QDF_STATUS status; status = cds_register_sap_restart_channel_switch_cb( - (void *)hdd_sap_restart_with_channel_switch); + hdd_sap_restart_with_channel_switch); if (!QDF_IS_STATUS_SUCCESS(status)) hdd_err("restart cb registration failed"); @@ -11085,7 +11085,7 @@ int hdd_register_cb(hdd_context_t *hdd_ctx) wlan_hdd_cfg80211_extscan_callback); status = cds_register_sap_restart_channel_switch_cb( - (void *)hdd_sap_restart_with_channel_switch); + hdd_sap_restart_with_channel_switch); if (!QDF_IS_STATUS_SUCCESS(status)) { hdd_err("restart cb registration failed"); ret = -EINVAL; |