summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Johnson <jjohnson@codeaurora.org>2016-12-02 11:31:30 -0800
committerqcabuildsw <qcabuildsw@localhost>2016-12-09 15:20:54 -0800
commit29a538e1e90756a013f84b3dc42b78f59c86e9fa (patch)
tree4af81632c1b66af18dd8dfa9ea28f4da7948e065
parent7897cd5f07a2d32a3acca5b701d2c527fbb0b62f (diff)
qcacld-3.0: Remove obsolete "frame_xln_reqd" flag
The current driver inherited support for the "frame_xln_reqd" flag from a prior version of the driver. In the prior version of the driver this flag was used to communicate to hardware whether or not hardware-assisted data frame translation was required. However the current driver does not use this flag, so remove it from the code. Change-Id: I41047864de374c12a89fa031c6d38729a285262a CRs-Fixed: 1075631
-rw-r--r--core/cds/inc/cds_config.h2
-rw-r--r--core/cds/src/cds_api.c7
-rw-r--r--core/hdd/src/wlan_hdd_ftm.c4
-rw-r--r--core/hdd/src/wlan_hdd_main.c4
-rw-r--r--core/wma/inc/wma.h2
-rw-r--r--core/wma/src/wma_main.c2
6 files changed, 1 insertions, 20 deletions
diff --git a/core/cds/inc/cds_config.h b/core/cds/inc/cds_config.h
index 4492f3f7e101..0a3d4c9ec0ff 100644
--- a/core/cds/inc/cds_config.h
+++ b/core/cds/inc/cds_config.h
@@ -81,7 +81,6 @@ struct ol_tx_sched_wrr_ac_specs_t {
* struct cds_config_info - Place Holder for cds configuration
* @max_station: Max station supported
* @max_bssid: Max Bssid Supported
- * @frame_xln_reqd: frame transmission required
* @powersave_offload_enabled: Indicate if powersave offload is enabled
* @sta_maxlimod_dtim: station max listen interval
* @sta_mod_dtim: station mode DTIM
@@ -129,7 +128,6 @@ struct ol_tx_sched_wrr_ac_specs_t {
struct cds_config_info {
uint16_t max_station;
uint16_t max_bssid;
- uint32_t frame_xln_reqd;
uint8_t powersave_offload_enabled;
uint8_t sta_maxlimod_dtim;
uint8_t sta_mod_dtim;
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 80617af3528c..8abe471914d5 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -422,13 +422,8 @@ QDF_STATUS cds_open(void)
goto err_wma_close;
}
bmi_target_ready(scn, gp_cds_context->cfg_ctx);
- /* Now proceed to open the MAC */
-
- /* UMA is supported in hardware for performing the
- * frame translation 802.11 <-> 802.3
- */
- cds_cfg->frame_xln_reqd = 1;
+ /* Now proceed to open the MAC */
sirStatus =
mac_open(&(gp_cds_context->pMACContext),
gp_cds_context->pHDDContext, cds_cfg);
diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c
index 36a4d55390b2..9ebfd21dd2d4 100644
--- a/core/hdd/src/wlan_hdd_ftm.c
+++ b/core/hdd/src/wlan_hdd_ftm.c
@@ -136,10 +136,6 @@ int hdd_update_cds_config_ftm(hdd_context_t *hdd_ctx)
cds_cfg->powersave_offload_enabled =
hdd_ctx->config->enablePowersaveOffload;
hdd_lpass_populate_cds_config(cds_cfg, hdd_ctx);
- /* UMA is supported in hardware for performing the
- * frame translation 802.11 <-> 802.3
- */
- cds_cfg->frame_xln_reqd = 1;
cds_cfg->sub_20_channel_width = WLAN_SUB_20_CH_WIDTH_NONE;
cds_init_ini_config(cds_cfg);
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 0b31804673be..fbff62434743 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -6967,10 +6967,6 @@ static int hdd_update_cds_config(hdd_context_t *hdd_ctx)
return -ENOMEM;
}
- /* UMA is supported in hardware for performing the
- * frame translation 802.11 <-> 802.3
- */
- cds_cfg->frame_xln_reqd = 1;
cds_cfg->driver_type = DRIVER_TYPE_PRODUCTION;
cds_cfg->powersave_offload_enabled =
hdd_ctx->config->enablePowersaveOffload;
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 9963706e2697..f22f0c07ea65 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -1287,7 +1287,6 @@ struct extended_caps {
* @recovery_event: wma FW recovery event
* @max_station: max stations
* @max_bssid: max bssid
- * @frame_xln_reqd: frame transmission required
* @driver_type: driver type
* @myaddr: current mac address
* @hwaddr: mac address from EEPROM
@@ -1421,7 +1420,6 @@ typedef struct {
qdf_event_t recovery_event;
uint16_t max_station;
uint16_t max_bssid;
- uint32_t frame_xln_reqd;
t_wma_drv_type driver_type;
uint8_t myaddr[IEEE80211_ADDR_LEN];
uint8_t hwaddr[IEEE80211_ADDR_LEN];
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 7974da34a6a9..fa29c1b423ce 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -2039,7 +2039,6 @@ QDF_STATUS wma_open(void *cds_context,
cds_cfg->max_station = wma_get_number_of_peers_supported(wma_handle);
cds_cfg->max_bssid = WMA_MAX_SUPPORTED_BSS;
- cds_cfg->frame_xln_reqd = 0;
wma_handle->wlan_resource_config.num_wow_filters =
cds_cfg->max_wow_filters;
@@ -2058,7 +2057,6 @@ QDF_STATUS wma_open(void *cds_context,
wma_handle->ol_ini_info = cds_cfg->ol_ini_info;
wma_handle->max_station = cds_cfg->max_station;
wma_handle->max_bssid = cds_cfg->max_bssid;
- wma_handle->frame_xln_reqd = cds_cfg->frame_xln_reqd;
wma_handle->driver_type = cds_cfg->driver_type;
wma_handle->ssdp = cds_cfg->ssdp;
wma_handle->enable_mc_list = cds_cfg->enable_mc_list;