diff options
46 files changed, 335 insertions, 214 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h index 034a0a057b1a..9c53f4b28f0e 100644 --- a/CORE/HDD/inc/wlan_hdd_assoc.h +++ b/CORE/HDD/inc/wlan_hdd_assoc.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2013-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ #if !defined( HDD_CONNECTION_H__ ) diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h index 08596f3536bd..81b8861fb870 100644 --- a/CORE/HDD/inc/wlan_hdd_main.h +++ b/CORE/HDD/inc/wlan_hdd_main.h @@ -20,13 +20,11 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - #if !defined( WLAN_HDD_MAIN_H ) #define WLAN_HDD_MAIN_H /**=========================================================================== @@ -319,6 +317,10 @@ extern spinlock_t hdd_context_lock; /* Max PMKSAIDS available in cache */ #define MAX_PMKSAIDS_IN_CACHE 8 +#define HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1 390 +#define HDD_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_1_1 390 + + typedef struct hdd_tx_rx_stats_s { // start_xmit stats diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index b65d7d16bb05..30c37fb58dcb 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -20,13 +20,11 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - /**======================================================================== \file wlan_hdd_cfg80211.c @@ -4845,7 +4843,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if (!vos_concurrent_sap_sessions_running()) { /* Single AP Mode */ if (VOS_IS_DFS_CH(pConfig->channel)) - pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; + pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; } else { /* MBSSID Mode */ hdd_adapter_t *con_sap_adapter; @@ -4855,21 +4853,21 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, if (con_sap_adapter) { /* we have active SAP running */ con_ch = con_sap_adapter->sessionCtx.ap.operatingChannel; - /* If this SAP is configured for ACS use CC_SAP's DFS channel */ - if (pConfig->channel == AUTO_CHANNEL_SELECT) { - if (con_ch != 0 && VOS_IS_DFS_CH(con_ch)) - pConfig->channel = con_ch; - } else if (VOS_IS_DFS_CH(con_ch) && - (pConfig->channel != con_ch)) { + if (con_ch != 0 && VOS_IS_DFS_CH(con_ch)) { + /* AP-AP DFS: secondary AP has to follow primary AP's + * channel */ hddLog(VOS_TRACE_LEVEL_ERROR, - "%s: Only SCC AP-AP DFS Permitted (ch=%d, con_ch=%d) !!", __func__, pConfig->channel, con_ch); - return -EINVAL; + "%s: Only SCC AP-AP DFS Permitted (chan=%d, con_ch=%d) !!, overriding guest AP's channel", + __func__, + pConfig->channel, + con_ch); + pConfig->channel = con_ch; } } else { /* We have idle AP interface (no active SAP running on it * When one SAP is stopped then also this condition applies */ if (VOS_IS_DFS_CH(pConfig->channel)) - pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; + pHddCtx->dev_dfs_cac_status = DFS_CAC_NEVER_DONE; } } #endif @@ -5301,11 +5299,12 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter, #ifdef WLAN_FEATURE_MBSSID pConfig->acsBandSwitchThreshold = pHostapdAdapter->sap_dyn_ini_cfg.acsBandSwitchThreshold; + pConfig->apAutoChannelSelection = + pHostapdAdapter->sap_dyn_ini_cfg.apAutoChannelSelection; #else pConfig->acsBandSwitchThreshold = iniConfig->acsBandSwitchThreshold; -#endif - pConfig->apAutoChannelSelection = iniConfig->apAutoChannelSelection; +#endif pSapEventCallback = hdd_hostapd_SAPEventCB; @@ -13888,7 +13887,6 @@ int wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, hdd_context_t *pHddCtx; VOS_STATUS status; tSmeConfigParams smeConfig; - int i; bool cbModeChange; if (NULL == wiphy) { @@ -13913,16 +13911,24 @@ int wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, sme_GetConfigParam(pHddCtx->hHal, &smeConfig); switch (chandef->width) { case NL80211_CHAN_WIDTH_20: - if (smeConfig.csrConfig.channelBondingMode24GHz != 0) { - smeConfig.csrConfig.channelBondingMode24GHz = 0; + if (smeConfig.csrConfig.channelBondingMode24GHz != + eCSR_INI_SINGLE_CHANNEL_CENTERED) { + smeConfig.csrConfig.channelBondingMode24GHz = + eCSR_INI_SINGLE_CHANNEL_CENTERED; sme_UpdateConfig(pHddCtx->hHal, &smeConfig); cbModeChange = TRUE; } break; case NL80211_CHAN_WIDTH_40: - if (smeConfig.csrConfig.channelBondingMode24GHz != 1) { - smeConfig.csrConfig.channelBondingMode24GHz = 1; + if (smeConfig.csrConfig.channelBondingMode24GHz == + eCSR_INI_SINGLE_CHANNEL_CENTERED) { + if ( NL80211_CHAN_HT40MINUS == cfg80211_get_chandef_type(chandef)) + smeConfig.csrConfig.channelBondingMode24GHz = + eCSR_INI_DOUBLE_CHANNEL_HIGH_PRIMARY; + else + smeConfig.csrConfig.channelBondingMode24GHz = + eCSR_INI_DOUBLE_CHANNEL_LOW_PRIMARY; sme_UpdateConfig(pHddCtx->hHal, &smeConfig); cbModeChange = TRUE; } @@ -13954,22 +13960,6 @@ int wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy, return -EINVAL; } - for (i = 0; i < WLAN_MAX_STA_COUNT; i++) { - if (!pAdapter->aStaInfo[i].isUsed) - continue; - - status = hdd_wlan_set_ht2040_mode(pAdapter, - pAdapter->aStaInfo[i].ucSTAId, - pAdapter->aStaInfo[i].macAddrSTA, - cfg80211_get_chandef_type(chandef)); - if (status != VOS_STATUS_SUCCESS) { - hddLog(VOS_TRACE_LEVEL_ERROR, - "%s:Error!!! Cannot set HT20/40 mode for STA %d!", - __func__, pAdapter->aStaInfo[i].ucSTAId); - return -EINVAL; - } - } - return 0; } #endif diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c index f60aa27a425f..eb4284c57f34 100644 --- a/CORE/HDD/src/wlan_hdd_ipa.c +++ b/CORE/HDD/src/wlan_hdd_ipa.c @@ -538,7 +538,7 @@ static int hdd_ipa_uc_enable_pipes(struct hdd_ipa_priv *hdd_ipa) return -ENOMEM; } - meta.msg_type = SW_ROUTING_ENABLE; + meta.msg_type = SW_ROUTING_DISABLE; HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Evt: %d", msg->name, meta.msg_type); result = ipa_send_msg(&meta, msg, hdd_ipa_msg_free_fn); @@ -566,18 +566,18 @@ static int hdd_ipa_uc_disable_pipes(struct hdd_ipa_priv *hdd_ipa) return -ENOMEM; } - meta.msg_type = SW_ROUTING_DISABLE; - HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Evt: %d", - msg->name, meta.msg_type); + meta.msg_type = SW_ROUTING_ENABLE; + HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: SW PATH ENA", __func__); result = ipa_send_msg(&meta, msg, hdd_ipa_msg_free_fn); if (result) { HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d", - msg->name, meta.msg_type, result); + msg->name, meta.msg_type, result); adf_os_mem_free(msg); return result; } + HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Disable RX PIPE", __func__); WLANTL_SetUcActive(hdd_ipa->hdd_ctx->pvosContext, @@ -1384,7 +1384,7 @@ VOS_STATUS hdd_ipa_process_rxt(v_VOID_t *vosContext, adf_nbuf_t rx_buf_list, if (hdd_ipa->pend_q_cnt > hdd_ipa->stats.max_pend_q_cnt) hdd_ipa->stats.max_pend_q_cnt = hdd_ipa->pend_q_cnt; - if (hdd_ipa_rm_request(hdd_ipa) == 0) { + if (cur_cnt && hdd_ipa_rm_request(hdd_ipa) == 0) { hdd_ipa_send_pkt_to_ipa(hdd_ipa); } @@ -1397,7 +1397,8 @@ drop_pkts: adf_nbuf_free(buf); buf = next_buf; hdd_ipa->stats.num_rx_drop++; - adapter->stats.rx_dropped++; + if (adapter) + adapter->stats.rx_dropped++; } return VOS_STATUS_E_FAILURE; @@ -1434,6 +1435,8 @@ static void hdd_ipa_set_adapter_ip_filter(hdd_adapter_t *adapter) #ifdef WLAN_OPEN_SOURCE rcu_read_unlock(); #endif + if (!dev) + return; } if ((in_dev = __in_dev_get_rtnl(dev)) != NULL) { for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; @@ -1918,8 +1921,8 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ipa_hdr->commit = 0; ipa_hdr->num_hdrs = 1; -#ifdef IPA_UC_OFFLOAD if (hdd_ipa_uc_is_enabled(hdd_ipa)) { +#ifdef IPA_UC_OFFLOAD uc_tx_hdr = (struct hdd_ipa_uc_tx_hdr *)ipa_hdr->hdr[0].hdr; memcpy(uc_tx_hdr, &ipa_uc_tx_hdr, HDD_IPA_UC_WLAN_TX_HDR_LEN); memcpy(uc_tx_hdr->eth.h_source, mac_addr, ETH_ALEN); @@ -1929,9 +1932,8 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, ipa_hdr->hdr[0].is_partial = 1; ipa_hdr->hdr[0].hdr_hdl = 0; ret = ipa_add_hdr(ipa_hdr); - } else #endif /* IPA_UC_OFFLOAD */ - { + } else { tx_hdr = (struct hdd_ipa_tx_hdr *)ipa_hdr->hdr[0].hdr; /* Set the Source MAC */ @@ -1964,6 +1966,7 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa, if (!hdd_ipa_uc_is_enabled(hdd_ipa)) { /* Set the type to IPV6 in the header*/ + tx_hdr = (struct hdd_ipa_tx_hdr *)ipa_hdr->hdr[0].hdr; tx_hdr->llc_snap.eth_type = cpu_to_be16(ETH_P_IPV6); } @@ -2359,7 +2362,7 @@ static ssize_t hdd_ipa_debugfs_read_ipa_stats(struct file *file, { struct hdd_ipa_priv *hdd_ipa = file->private_data; char *buf; - unsigned int len = 0, buf_len = 2048; + unsigned int len = 0, buf_len = 4096; ssize_t ret_cnt; int i; struct hdd_ipa_iface_context *iface_context = NULL; @@ -2369,7 +2372,6 @@ static ssize_t hdd_ipa_debugfs_read_ipa_stats(struct file *file, #define HDD_IPA_IFACE_STATS(_buf, _len, _iface, _name) \ scnprintf(_buf, _len, "%30s: %llu\n", #_name, _iface->stats._name) - buf = kzalloc(buf_len, GFP_KERNEL); if (!buf) return -ENOMEM; @@ -2499,8 +2501,36 @@ skip: #undef HDD_IPA_IFACE_STATS } +static ssize_t hdd_ipa_debugfs_write_ipa_stats(struct file *file, + const char __user *user_buf, size_t count, loff_t *ppos) +{ + struct hdd_ipa_priv *hdd_ipa = file->private_data; + struct hdd_ipa_iface_context *iface_context = NULL; + int ret; + uint32_t val; + int i; + + ret = kstrtou32_from_user(user_buf, count, 0, &val); + + if (ret) + return ret; + + if (val == 0) { + for (i = 0; i < HDD_IPA_MAX_IFACE; i++) { + iface_context = &hdd_ipa->iface_context[i]; + memset(&iface_context->stats, 0, + sizeof(iface_context->stats)); + } + + memset(&hdd_ipa->stats, 0, sizeof(hdd_ipa->stats)); + } + + return count; +} + static const struct file_operations fops_ipa_stats = { .read = hdd_ipa_debugfs_read_ipa_stats, + .write = hdd_ipa_debugfs_write_ipa_stats, .open = simple_open, .owner = THIS_MODULE, .llseek = default_llseek, diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c index 2a5ba1ff6611..98c90bd547ea 100755 --- a/CORE/HDD/src/wlan_hdd_main.c +++ b/CORE/HDD/src/wlan_hdd_main.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ @@ -6295,6 +6294,26 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx, { pconfig->enable2x2 = 0; pconfig->enableTxSTBC = 0; + + /* 1x1 */ + /* Update Rx Highest Long GI data Rate */ + if (ccmCfgSetInt(hdd_ctx->hHal, + WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE, + HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1, NULL, + eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) + { + hddLog(LOGE, "Could not pass on " + "WNI_CFG_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE to CCM"); + } + + /* Update Tx Highest Long GI data Rate */ + if (ccmCfgSetInt(hdd_ctx->hHal, WNI_CFG_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE, + HDD_VHT_TX_HIGHEST_SUPPORTED_DATA_RATE_1_1, NULL, + eANI_BOOLEAN_FALSE) == eHAL_STATUS_FAILURE) + { + hddLog(LOGE, "Could not pass on " + "HDD_VHT_RX_HIGHEST_SUPPORTED_DATA_RATE_1_1 to CCM"); + } } if (!(cfg->ht_tx_stbc && pconfig->enable2x2)) { diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c index 5cd1e6bfd26a..53a23d9ea0cd 100644 --- a/CORE/HDD/src/wlan_hdd_wext.c +++ b/CORE/HDD/src/wlan_hdd_wext.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h index 6f9fe2f63d49..f4d61ac34fff 100644 --- a/CORE/MAC/inc/aniGlobal.h +++ b/CORE/MAC/inc/aniGlobal.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h index dd98ecdbe42e..aabc1690b445 100644 --- a/CORE/MAC/inc/qwlan_version.h +++ b/CORE/MAC/inc/qwlan_version.h @@ -42,9 +42,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 0 #define QWLAN_VERSION_PATCH 0 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 153 +#define QWLAN_VERSION_BUILD 154 -#define QWLAN_VERSIONSTR "1.0.0.153" +#define QWLAN_VERSIONSTR "1.0.0.154" #ifdef QCA_WIFI_2_0 diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index ee033022ab98..15e92a5eb459 100644 --- a/CORE/MAC/inc/sirApi.h +++ b/CORE/MAC/inc/sirApi.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h index b2505e6ec525..25db3b3e3730 100644 --- a/CORE/MAC/inc/sirMacProtDef.h +++ b/CORE/MAC/inc/sirMacProtDef.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h index fccb49445e63..e629b740e015 100644 --- a/CORE/MAC/inc/wniApi.h +++ b/CORE/MAC/inc/wniApi.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h index b5fbf84ae732..60ddb523af02 100644 --- a/CORE/MAC/src/include/dot11f.h +++ b/CORE/MAC/src/include/dot11f.h @@ -20,12 +20,12 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ + #ifndef DOT11F_H #define DOT11F_H /** diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h index 058ec3a5effc..9f69127426d7 100644 --- a/CORE/MAC/src/include/sirParams.h +++ b/CORE/MAC/src/include/sirParams.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c index 87bc9eb9a1fc..e119cb495cf0 100644 --- a/CORE/MAC/src/pe/lim/limApi.c +++ b/CORE/MAC/src/pe/lim/limApi.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c index 5334e32de3f1..b50ae9f9f4b5 100644 --- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c +++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c index 1a5180385b8a..2639c76a1ccf 100644 --- a/CORE/MAC/src/pe/lim/limLogDump.c +++ b/CORE/MAC/src/pe/lim/limLogDump.c @@ -20,18 +20,11 @@ */ /* - * Copyright (c) 2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * - */ - - -/* * This file was originally distributed by Qualcomm Atheros, Inc. * under proprietary terms before Copyright ownership was assigned * to the Linux Foundation. */ + /*============================================================================ limLogDump.c diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c index 015c9ff7b3bc..b09e89d7b5d8 100644 --- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c index 3ddf03b6a53e..0b09aedcc00a 100644 --- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c @@ -1588,6 +1588,26 @@ void limSendMlmAssocInd(tpAniSirGlobal pMac, tpDphHashNode pStaDs, tpPESession p pMlmAssocInd->addIE.length = pAssocReq->addIE.length; } + /* Add HT Capabilities into addIE for OBSS processing in hostapd */ + if (pAssocReq->HTCaps.present) + { + if (pMlmAssocInd->addIE.length + DOT11F_IE_HTCAPS_MIN_LEN + 2 < + SIR_MAC_MAX_IE_LENGTH) + { + pMlmAssocInd->addIE.addIEdata[pMlmAssocInd->addIE.length] = + SIR_MAC_HT_CAPABILITIES_EID; + pMlmAssocInd->addIE.addIEdata[pMlmAssocInd->addIE.length + 1] = + DOT11F_IE_HTCAPS_MIN_LEN; + vos_mem_copy( + &pMlmAssocInd->addIE.addIEdata[pMlmAssocInd->addIE.length + 2], + ((tANI_U8*)&pAssocReq->HTCaps)+1, + DOT11F_IE_HTCAPS_MIN_LEN); + pMlmAssocInd->addIE.length += 2 + DOT11F_IE_HTCAPS_MIN_LEN; + } + else + limLog(pMac, LOGP, FL("Cannot add HT capabilities IE to addIE")); + } + if(pAssocReq->wmeInfoPresent) { diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c index 0ef172bc1e92..bbd1c18f3b02 100644 --- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c +++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 341f9ec6a827..ee8daf62adc9 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ @@ -4810,6 +4809,10 @@ static void __limProcessSmeSetHT2040Mode(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) tpSirSetHT2040Mode pSetHT2040Mode; tpPESession psessionEntry; tANI_U8 sessionId = 0; + vos_msg_t msg; + tUpdateVHTOpMode *pHtOpMode = NULL; + tANI_U16 staId = 0; + tpDphHashNode pStaDs = NULL; PELOG1(limLog(pMac, LOG1, FL("received Set HT 20/40 mode message"));); @@ -4851,6 +4854,54 @@ static void __limProcessSmeSetHT2040Mode(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) /* Update beacon */ schSetFixedBeaconFields(pMac, psessionEntry); limSendBeaconInd(pMac, psessionEntry); + + /* update OP Mode for each associated peer */ + for (staId = 0; staId < psessionEntry->dph.dphHashTable.size; staId++) + { + pStaDs = dphGetHashEntry(pMac, staId, &psessionEntry->dph.dphHashTable); + if (NULL == pStaDs) + continue; + + if (pStaDs->valid && pStaDs->htSupportedChannelWidthSet) + { + pHtOpMode = vos_mem_malloc(sizeof(tUpdateVHTOpMode)); + if ( NULL == pHtOpMode ) + { + limLog(pMac, LOGE, + FL("%s: Not able to allocate memory for setting OP mode"), + __func__); + return; + } + pHtOpMode->opMode = (psessionEntry->htSecondaryChannelOffset == + PHY_SINGLE_CHANNEL_CENTERED)? + eHT_CHANNEL_WIDTH_20MHZ:eHT_CHANNEL_WIDTH_40MHZ; + pHtOpMode->staId = staId; + vos_mem_copy(pHtOpMode->peer_mac, &pStaDs->staAddr, + sizeof(tSirMacAddr)); + pHtOpMode->smesessionId = sessionId; + + msg.type = WDA_UPDATE_OP_MODE; + msg.reserved = 0; + msg.bodyptr = pHtOpMode; + if (!VOS_IS_STATUS_SUCCESS( + vos_mq_post_message(VOS_MODULE_ID_WDA, &msg))) + { + limLog(pMac, LOGE, + FL("%s: Not able to post WDA_UPDATE_OP_MODE message to WDA"), + __func__); + vos_mem_free(pHtOpMode); + return; + } + limLog(pMac, LOG1, + FL("%s: Notifed FW about OP mode: %d for staId=%d"), + __func__, pHtOpMode->opMode, staId); + + } + else + limLog(pMac, LOG1, FL("%s: station %d does not support HT40\n"), + __func__, staId); + } + return; } #endif diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c index 8a88ab8d5f30..4c8edf6e0efc 100644 --- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c +++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h index 32fe24542450..31cc1d96d6b3 100644 --- a/CORE/MAC/src/pe/lim/limTypes.h +++ b/CORE/MAC/src/pe/lim/limTypes.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index 4fb055b9badc..ca09b87abf74 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -958,6 +958,11 @@ limCleanupMlm(tpAniSirGlobal pMac) { tANI_U32 n; tLimPreAuthNode *pAuthNode; +#ifdef WLAN_FEATURE_11W + tANI_U32 bss_entry, sta_entry; + tpDphHashNode pStaDs = NULL; + tpPESession psessionEntry = NULL; +#endif if (pMac->lim.gLimTimersCreated == 1) { @@ -1096,6 +1101,41 @@ limCleanupMlm(tpAniSirGlobal pMac) pMac->lim.gLimTimersCreated = 0; } +#ifdef WLAN_FEATURE_11W + /* + * When SSR is triggered, we need to loop through + * each STA associated per BSSId and deactivate/delete + * the pmfSaQueryTimer for it + */ + if (vos_is_logp_in_progress(VOS_MODULE_ID_PE, NULL)) + { + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, + FL("SSR is detected, proceed to clean up pmfSaQueryTimer")); + for (bss_entry = 0; bss_entry < pMac->lim.maxBssId; bss_entry++) + { + if (pMac->lim.gpSession[bss_entry].valid) + { + for (sta_entry = 1; sta_entry < pMac->lim.gLimAssocStaLimit; + sta_entry++) + { + psessionEntry = &pMac->lim.gpSession[bss_entry]; + pStaDs = dphGetHashEntry(pMac, sta_entry, + &psessionEntry->dph.dphHashTable); + if (NULL == pStaDs) + { + continue; + } + VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_ERROR, + FL("Deleting pmfSaQueryTimer for staid[%d]"), + pStaDs->staIndex) ; + tx_timer_deactivate(&pStaDs->pmfSaQueryTimer); + tx_timer_delete(&pStaDs->pmfSaQueryTimer); + } + } + } + } +#endif + /// Cleanup cached scan list limReInitScanResults(pMac); #ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD diff --git a/CORE/SERVICES/HIF/PCIe/hif_pci.c b/CORE/SERVICES/HIF/PCIe/hif_pci.c index b457c283fb2d..85bd7e303803 100644 --- a/CORE/SERVICES/HIF/PCIe/hif_pci.c +++ b/CORE/SERVICES/HIF/PCIe/hif_pci.c @@ -2138,10 +2138,12 @@ HIF_sleep_entry(void *arg) hif_state->fake_sleep = FALSE; } } else { + adf_os_timer_cancel(&hif_state->sleep_timer); adf_os_timer_start(&hif_state->sleep_timer, HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS); } } else { + adf_os_timer_cancel(&hif_state->sleep_timer); adf_os_timer_start(&hif_state->sleep_timer, HIF_SLEEP_INACTIVITY_TIMER_PERIOD_MS); } diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index 6f2b55a47a5f..27804a0a72ad 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -4511,7 +4511,15 @@ VOS_STATUS WDA_open(v_VOID_t *vos_context, v_VOID_t *os_ctx, olCfg.uc_tx_partition_base = mac_params->ucTxPartitionBase; #endif /* IPA_UC_OFFLOAD*/ /* Allocate cfg handle */ + + /* RX Full reorder should enable for PCIe, ROME3.X project only now + * MDM should enable later, schedule TBD + * HL also sdould be enabled, schedule TBD */ +#ifdef WLAN_FEATURE_RX_FULL_REORDER_OL olCfg.is_full_reorder_offload = mac_params->reorderOffload; +#else + olCfg.is_full_reorder_offload = 0; +#endif ((pVosContextType) vos_context)->cfg_ctx = ol_pdev_cfg_attach(((pVosContextType) vos_context)->adf_ctx, olCfg); if (!(((pVosContextType) vos_context)->cfg_ctx)) { diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h index ff15cbfae4ef..8ab4f4374f4c 100644 --- a/CORE/SME/inc/csrApi.h +++ b/CORE/SME/inc/csrApi.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h index f135503df259..7e62d2d86609 100644 --- a/CORE/SME/inc/csrInternal.h +++ b/CORE/SME/inc/csrInternal.h @@ -20,13 +20,11 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - /** ------------------------------------------------------------------------- * ------------------------------------------------------------------------- * diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h index cfb780d9d817..abc5b1be79e6 100644 --- a/CORE/SME/inc/smeInternal.h +++ b/CORE/SME/inc/smeInternal.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h index d5ea60191a9c..e31a1ec5e57a 100644 --- a/CORE/SME/inc/sme_Api.h +++ b/CORE/SME/inc/sme_Api.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 47a67f30bdcb..cb0f277f5145 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -20,13 +20,11 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - /** ------------------------------------------------------------------------- * ------------------------------------------------------------------------- * diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index cf70c0b70586..fb6f3e902f8c 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c index c079175d85c5..8861b2e779a6 100644 --- a/CORE/SYS/legacy/src/utils/src/dot11f.c +++ b/CORE/SYS/legacy/src/utils/src/dot11f.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ /** diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h index 47c0f99c89e2..5f2c0e45650f 100644 --- a/CORE/TL/inc/wlan_qct_tl.h +++ b/CORE/TL/inc/wlan_qct_tl.h @@ -20,15 +20,12 @@ */ /* - * Copyright (c) 2011-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - - #ifndef WLAN_QCT_WLANTL_H #define WLAN_QCT_WLANTL_H diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c index 281517dda52d..a1c62f176d59 100644 --- a/CORE/TL/src/wlan_qct_tl.c +++ b/CORE/TL/src/wlan_qct_tl.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h index 61d1a1b35830..bb69365a12f7 100644 --- a/CORE/TL/src/wlan_qct_tli.h +++ b/CORE/TL/src/wlan_qct_tli.h @@ -20,14 +20,12 @@ */ /* - * Copyright (c) 2011-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ - #ifndef WLAN_QCT_TLI_H #define WLAN_QCT_TLI_H diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 045331a7ede9..9f8e30253c6c 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDA/inc/legacy/wlan_qct_hal.h b/CORE/WDA/inc/legacy/wlan_qct_hal.h index e83a47665c79..7091d2e8dd30 100644 --- a/CORE/WDA/inc/legacy/wlan_qct_hal.h +++ b/CORE/WDA/inc/legacy/wlan_qct_hal.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h index 3cfa6cce912e..93a0791fb770 100644 --- a/CORE/WDA/inc/wlan_qct_wda.h +++ b/CORE/WDA/inc/wlan_qct_wda.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2014 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c index ece58ed9fcc2..142c577e203d 100644 --- a/CORE/WDA/src/wlan_qct_wda.c +++ b/CORE/WDA/src/wlan_qct_wda.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDA/src/wlan_qct_wda_ds.c b/CORE/WDA/src/wlan_qct_wda_ds.c index f95ad5559608..01890c4617be 100644 --- a/CORE/WDA/src/wlan_qct_wda_ds.c +++ b/CORE/WDA/src/wlan_qct_wda_ds.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2011-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h index be13cd54598c..fe837b5499c8 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h b/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h index 75a0bf725730..07f737a4b4fe 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h index bc19f22362b4..6f15947d4a5d 100644 --- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h +++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c index ce6e5ed685c7..88785c1dea78 100644 --- a/CORE/WDI/CP/src/wlan_qct_wdi.c +++ b/CORE/WDI/CP/src/wlan_qct_wdi.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ diff --git a/CORE/WDI/CP/src/wlan_qct_wdi_dp.c b/CORE/WDI/CP/src/wlan_qct_wdi_dp.c index 692321ba82e8..1a84ac544bce 100644 --- a/CORE/WDI/CP/src/wlan_qct_wdi_dp.c +++ b/CORE/WDI/CP/src/wlan_qct_wdi_dp.c @@ -20,10 +20,9 @@ */ /* - * Copyright (c) 2012-2013 Qualcomm Atheros, Inc. - * All Rights Reserved. - * Qualcomm Atheros Confidential and Proprietary. - * + * This file was originally distributed by Qualcomm Atheros, Inc. + * under proprietary terms before Copyright ownership was assigned + * to the Linux Foundation. */ @@ -1366,6 +1366,10 @@ CDEFINES += -DWLAN_OPEN_P2P_INTERFACE #Enable 2.4 GHz social channels in 5 GHz only mode for p2p usage CDEFINES += -DWLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY +#Enable RX Full re-order OL feature only "LL and NON-MDM platform" +ifeq ($(CONFIG_HIF_PCI), 1) +CDEFINES += -DWLAN_FEATURE_RX_FULL_REORDER_OL +endif endif #Enable Signed firmware support for split binary format |