From 9aecfee377fef95e6790a7c137213fa94ba62b87 Mon Sep 17 00:00:00 2001 From: Kiran Kumar Lokere Date: Wed, 23 Nov 2016 17:37:42 -0800 Subject: [PATCH] qcacld-3.0: Fix compilation issues Fix compilation issues. Change-Id: I629acbb0c9ec1e36a3e6a13e3709dd4327003557 CRs-Fixed: 1094633 --- core/cds/src/cds_api.c | 14 +++++++------- core/dp/txrx/ol_cfg.c | 1 - core/hdd/src/wlan_hdd_lro.c | 7 +++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c index 5634f2317fa9..a8228e993132 100644 --- a/core/cds/src/cds_api.c +++ b/core/cds/src/cds_api.c @@ -179,13 +179,6 @@ static void cds_cdp_cfg_attach(struct cds_config_info *cds_cfg) struct txrx_pdev_cfg_param_t cdp_cfg = {0}; void *soc = cds_get_context(QDF_MODULE_ID_SOC); - gp_cds_context->cfg_ctx = cdp_cfg_attach(soc, gp_cds_context->qdf_ctx, - (void *)(&cdp_cfg)); - if (!gp_cds_context->cfg_ctx) { - WMA_LOGP("%s: failed to init cfg handle", __func__); - return; - } - cdp_cfg.is_uc_offload_enabled = cds_cfg->uc_offload_enabled; cdp_cfg.uc_tx_buffer_count = cds_cfg->uc_txbuf_count; cdp_cfg.uc_tx_buffer_size = cds_cfg->uc_txbuf_size; @@ -196,6 +189,13 @@ static void cds_cdp_cfg_attach(struct cds_config_info *cds_cfg) cds_cfg->ip_tcp_udp_checksum_offload; cdp_cfg.ce_classify_enabled = cds_cfg->ce_classify_enabled; + gp_cds_context->cfg_ctx = cdp_cfg_attach(soc, gp_cds_context->qdf_ctx, + (void *)(&cdp_cfg)); + if (!gp_cds_context->cfg_ctx) { + WMA_LOGP("%s: failed to init cfg handle", __func__); + return; + } + /* Configure Receive flow steering */ cdp_cfg_set_flow_steering(soc, &gp_cds_context->cfg_ctx, cds_cfg->flow_steering_enabled); diff --git a/core/dp/txrx/ol_cfg.c b/core/dp/txrx/ol_cfg.c index 80cdc148a72c..d4aa9d3811af 100644 --- a/core/dp/txrx/ol_cfg.c +++ b/core/dp/txrx/ol_cfg.c @@ -42,7 +42,6 @@ unsigned int vow_config = 0; void ol_tx_set_flow_control_parameters(struct txrx_pdev_cfg_t *cfg_ctx, struct txrx_pdev_cfg_param_t *cfg_param) { - struct txrx_pdev_cfg_t *cfg_ctx = pcfg_ctx; cfg_ctx->tx_flow_start_queue_offset = cfg_param->tx_flow_start_queue_offset; cfg_ctx->tx_flow_stop_queue_th = diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c index eafa0fc997a7..9f648f732c93 100644 --- a/core/hdd/src/wlan_hdd_lro.c +++ b/core/hdd/src/wlan_hdd_lro.c @@ -527,6 +527,7 @@ static void *hdd_init_lro_mgr(void) */ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { + void *soc = cds_get_context(QDF_MODULE_ID_SOC); if (!hdd_ctx->config->lro_enable || QDF_STA_MODE != adapter->device_mode) { @@ -535,7 +536,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) } /* Register the flush callback */ - cdp_register_lro_flush_cb(hdd_lro_flush, hdd_init_lro_mgr); + cdp_register_lro_flush_cb(soc, hdd_lro_flush, hdd_init_lro_mgr); adapter->dev->features |= NETIF_F_LRO; hdd_info("LRO Enabled"); @@ -563,12 +564,14 @@ void hdd_deinit_lro_mgr(void *lro_info) */ void hdd_lro_disable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter) { + void *soc = cds_get_context(QDF_MODULE_ID_SOC); + if (!hdd_ctx->config->lro_enable || QDF_STA_MODE != adapter->device_mode) return; /* Deregister the flush callback */ - cdp_deregister_lro_flush_cb(hdd_deinit_lro_mgr); + cdp_deregister_lro_flush_cb(soc, hdd_deinit_lro_mgr); return; }