From b23de8817b9ae50ffb93045c73f75535edc0786a Mon Sep 17 00:00:00 2001
From: Mahesh Kumar Kalikot Veetil <mkalikot@qca.qualcomm.com>
Date: Wed, 23 Jul 2014 09:55:03 -0700
Subject: wlan: Guest AP should follow Primary AP's dfs channel

In AP+AP case, radar detection is supported only in case of SCC
mode. So if primary AP is in DFS channel, guest AP should follow
primary AP's channel.

Change-Id: I117d8d436fe00a23d3eecf625a9d9704eb548662
CRs-fixed: 698719
---
 CORE/HDD/src/wlan_hdd_cfg80211.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index b65d7d16bb05..fcb7ff4232f8 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -4845,7 +4845,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 +4855,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
-- 
cgit v1.2.3


From d9f17a227da39dc3aa166132d9836addca3c9bb2 Mon Sep 17 00:00:00 2001
From: Peng Xu <pxu@qca.qualcomm.com>
Date: Mon, 21 Jul 2014 22:21:21 -0700
Subject: qca-cld:lim: Send change OP mode message to FW

For HT20/40 mode switch, check associated station's HT capability
before sending change OP mode message to FW.

Change-Id: Iad4f7fde03eb8399db9e17087b9720b8221c7fb8
CRs-fixed: 697592
---
 CORE/HDD/src/wlan_hdd_cfg80211.c               | 33 ++++++----------
 CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 52 ++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index fcb7ff4232f8..3584a6e958b7 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -13888,7 +13888,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 +13912,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 +13961,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/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 341f9ec6a827..8fc67f4288f8 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -4810,6 +4810,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 +4855,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
-- 
cgit v1.2.3


From 7b2b3c347e91e63e08c3001c4d04aef668b4d29b Mon Sep 17 00:00:00 2001
From: Prashanth Bhatta <bhattap@qca.qualcomm.com>
Date: Tue, 22 Jul 2014 15:25:46 -0700
Subject: qcacld: ipa: Fix issue reported by static analyzer

Fixing issue reported by static analyzer for IPA modules.
Issue are introduced in multiple changes which are now fixed in
right way.

Change-Id: If924df7785f165f7447564eb91eb83a13da74c42
CRs-fixed: 698170
---
 CORE/HDD/src/wlan_hdd_ipa.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c
index f60aa27a425f..92bd1f233a7b 100644
--- a/CORE/HDD/src/wlan_hdd_ipa.c
+++ b/CORE/HDD/src/wlan_hdd_ipa.c
@@ -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);
 		}
 
-- 
cgit v1.2.3


From 19b247e00979188549dd6e040da8e02c3ede84f8 Mon Sep 17 00:00:00 2001
From: Prashanth Bhatta <bhattap@qca.qualcomm.com>
Date: Wed, 23 Jul 2014 15:55:32 -0700
Subject: qcacld: ipa: Dont request RM when no pending packets

With the recent changes to prevent the suspend while data is
going over IPA, a new issue is introduced where in IPA RM request
would be called even when there are no nbufs in the pending
queue.  This leads to not releasing the RM as release happens
from write done call back which would never be called as no nbufs
are passed to IPA hardware. This issue happens when all the nbufs
are pre-filtered and no nbufs are queued to pending queue to be
sent to IPA.

Also along with this change, adding debugfs write call back to
reset the stats which would help for better debugging and
increase the debugfs buffer size to 4096 to support concurrent
interfaces. Buffer size of 2048 is not enough to hold all the
interface statistics.

Change-Id: Iaa876e2651cdc3400fb9a4de9f85ac7a7a5e05af
CRs-fixed: 698929
---
 CORE/HDD/src/wlan_hdd_ipa.c | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c
index 92bd1f233a7b..f943de50ed39 100644
--- a/CORE/HDD/src/wlan_hdd_ipa.c
+++ b/CORE/HDD/src/wlan_hdd_ipa.c
@@ -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);
 	}
 
@@ -2362,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;
@@ -2372,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;
@@ -2502,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,
-- 
cgit v1.2.3


From 96858923ea8b22850e665f4065f5617f5f8749a1 Mon Sep 17 00:00:00 2001
From: Leo Chang <schang@qca.qualcomm.com>
Date: Mon, 21 Jul 2014 15:59:40 -0700
Subject: qca-cld: rx full reorder offload should be enabled only rome 3.X

RX full reorder offload feature should only be enabled for Rome
3.X PL. MDM and HL data path PL should not enabled feature.
INI value will be disabled for MDM and HL system

Change-Id: I3c42f9b6881f2f2e7bfcab5fb0bea2719a7245c1
CRs-fixed: 698807
---
 CORE/SERVICES/WMA/wma.c | 8 ++++++++
 Kbuild                  | 4 ++++
 2 files changed, 12 insertions(+)

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/Kbuild b/Kbuild
index af3b621bcdca..6f76cbac4b39 100644
--- a/Kbuild
+++ b/Kbuild
@@ -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
-- 
cgit v1.2.3


From 46ec7272578429d44bc82a5c8244c3167006574c Mon Sep 17 00:00:00 2001
From: Peng Xu <pxu@qca.qualcomm.com>
Date: Sun, 20 Jul 2014 21:51:37 -0700
Subject: qca-cld:lim: Pass HT Capabilities IE to hostapd

For OBSS feature, driver needs to pass HT Capabilities IE to hostapd.
Added code to pass HT Capabilities IE into the additional IE structure
in order to pass to hostapd.

Change-Id: I3fa48b900dae5e12e7aaef467779da80e9293219
CRs-fixed: 697592
---
 CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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)
         {
 
-- 
cgit v1.2.3


From 30b2c79c6dfd197b26d747da6824e0a3e650d291 Mon Sep 17 00:00:00 2001
From: krunal soni <ksoni@qca.qualcomm.com>
Date: Tue, 22 Jul 2014 21:04:16 -0700
Subject: qcacld: PMF: Fix to delete pmfSaQueryTimer during SubSystemRestart

The issue is, when SSR is triggered, we are not deleting pmfSaQueryTimer
because the function which actually deletes this timer is not getting
called during SSR.

This solution will fix this issue. As part of this solution, when ever
SSR is triggered, we will loop through each STA per BSSID and deletes
the pmfSaQueryTimer associated.

Change-Id: I01d6394d78b4ef93bdb5af24445c24d80d2fa8df
CRs-Fixed: 696054
---
 CORE/MAC/src/pe/lim/limUtils.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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
-- 
cgit v1.2.3


From a0bc901f42aa4f68e8ae33a6e91b6a01cb49b2cb Mon Sep 17 00:00:00 2001
From: Peng Xu <pxu@qca.qualcomm.com>
Date: Wed, 23 Jul 2014 16:25:01 -0700
Subject: qca-cld:hdd: Store ACS configuration value to SAP context

ACS configuration value need to be passed to SAP context for
later channel selection. It will be checked when selecting proper
channel from channel range if ACS is enabled.

Change-Id: I54aee78ed9158fe14620d3a9516dbc09f9a65681
CRs-fixed: 698941
---
 CORE/HDD/src/wlan_hdd_cfg80211.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 3584a6e958b7..6551ed83afe2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -5301,11 +5301,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;
 
-- 
cgit v1.2.3


From 6e6c9e08c9c253b6234b7d044b84a8db234de127 Mon Sep 17 00:00:00 2001
From: Leo Chang <schang@qca.qualcomm.com>
Date: Wed, 23 Jul 2014 11:24:52 -0700
Subject: qca-cld: ipa hardware data path disabled bug fix

To make IPA micro controller hardware data path working,
modem hardware data path should be enabled.
Current code, software data path enabled, then hardware data path
disabled. When PIPE enable software path should be disabled

Change-Id: I033c9fbb6a42bb329bcfed0a87f202310bc7daf2
CRs-fixed: 698788
---
 CORE/HDD/src/wlan_hdd_ipa.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c
index f943de50ed39..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,
-- 
cgit v1.2.3


From 1ef4645561dd72c7bf6ed2dfeddf5c8b43f72d1d Mon Sep 17 00:00:00 2001
From: Ganesh Babu Kumaravel <kganesh@qti.qualcomm.com>
Date: Wed, 23 Jul 2014 14:45:05 +0530
Subject: qcacld:Fix race in starting HIF Sleep timer

HIF sleep timer is getting started from both HIF_sleep_entry() and
HIFTargetSleepStateAdjust().

So make sure that HIF sleep timer is stopped before starting to
avoid kernel panic.

CRs-Fixed: 698535
Change-Id: I44dd079128f3925695a3db2ba45052d1ee04b8cd
---
 CORE/SERVICES/HIF/PCIe/hif_pci.c | 2 ++
 1 file changed, 2 insertions(+)

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);
 	}
-- 
cgit v1.2.3


From 5f3e0b080d8fca57da2daea31ba3843572b6dc7b Mon Sep 17 00:00:00 2001
From: Ganesh Kondabattini <ganeshk@qti.qualcomm.com>
Date: Wed, 23 Jul 2014 15:14:11 +0530
Subject: qcacld: Configure correct Rx/Tx LGI data rates for 1x1

The default value for Rx/Tx LGI data rate is 780. This is valid
for MCS 9 for 2x2. These parameters should be set to 390
When device is configured in 1x1 mode.

Change-Id: Ic9c7b0aa1c6e7f23d72e5495a19afba2927556e5
CRs-Fixed: 698127
---
 CORE/HDD/inc/wlan_hdd_main.h |  4 ++++
 CORE/HDD/src/wlan_hdd_main.c | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index 08596f3536bd..7d1e74e0b25d 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -319,6 +319,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_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 2a5ba1ff6611..1c0d1e00cadb 100755
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -6295,6 +6295,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))
     {
-- 
cgit v1.2.3


From fb8c8f17c807f4be70f08d9d1b72a7e260c09527 Mon Sep 17 00:00:00 2001
From: Akash Patel <c_akashp@qca.qualcomm.com>
Date: Wed, 23 Jul 2014 08:09:39 -0700
Subject: WLAN: qcacld: Copyright fix: Removing QCA Prop copyright from
 opensource

Fixing the copyright issue for opensource.

Change-Id: I6b93f9b799f653d93bd002e88631620fa31db8cc
CRs-Fixed: 698830
---
 CORE/HDD/inc/wlan_hdd_assoc.h                  | 7 +++----
 CORE/HDD/inc/wlan_hdd_main.h                   | 8 +++-----
 CORE/HDD/src/wlan_hdd_cfg80211.c               | 8 +++-----
 CORE/HDD/src/wlan_hdd_main.c                   | 7 +++----
 CORE/HDD/src/wlan_hdd_wext.c                   | 7 +++----
 CORE/MAC/inc/aniGlobal.h                       | 7 +++----
 CORE/MAC/inc/sirApi.h                          | 7 +++----
 CORE/MAC/inc/sirMacProtDef.h                   | 7 +++----
 CORE/MAC/inc/wniApi.h                          | 7 +++----
 CORE/MAC/src/include/dot11f.h                  | 8 ++++----
 CORE/MAC/src/include/sirParams.h               | 7 +++----
 CORE/MAC/src/pe/lim/limApi.c                   | 7 +++----
 CORE/MAC/src/pe/lim/limIbssPeerMgmt.c          | 7 +++----
 CORE/MAC/src/pe/lim/limLogDump.c               | 9 +--------
 CORE/MAC/src/pe/lim/limProcessActionFrame.c    | 7 +++----
 CORE/MAC/src/pe/lim/limProcessMessageQueue.c   | 7 +++----
 CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 7 +++----
 CORE/MAC/src/pe/lim/limSendManagementFrames.c  | 7 +++----
 CORE/MAC/src/pe/lim/limTypes.h                 | 7 +++----
 CORE/SME/inc/csrApi.h                          | 7 +++----
 CORE/SME/inc/csrInternal.h                     | 8 +++-----
 CORE/SME/inc/smeInternal.h                     | 7 +++----
 CORE/SME/inc/sme_Api.h                         | 7 +++----
 CORE/SME/src/csr/csrApiRoam.c                  | 8 +++-----
 CORE/SME/src/sme_common/sme_Api.c              | 7 +++----
 CORE/SYS/legacy/src/utils/src/dot11f.c         | 7 +++----
 CORE/TL/inc/wlan_qct_tl.h                      | 9 +++------
 CORE/TL/src/wlan_qct_tl.c                      | 7 +++----
 CORE/TL/src/wlan_qct_tli.h                     | 8 +++-----
 CORE/VOSS/src/vos_nvitem.c                     | 7 +++----
 CORE/WDA/inc/legacy/wlan_qct_hal.h             | 7 +++----
 CORE/WDA/inc/wlan_qct_wda.h                    | 7 +++----
 CORE/WDA/src/wlan_qct_wda.c                    | 7 +++----
 CORE/WDA/src/wlan_qct_wda_ds.c                 | 7 +++----
 CORE/WDI/CP/inc/wlan_qct_wdi.h                 | 7 +++----
 CORE/WDI/CP/inc/wlan_qct_wdi_dp.h              | 7 +++----
 CORE/WDI/CP/inc/wlan_qct_wdi_i.h               | 7 +++----
 CORE/WDI/CP/src/wlan_qct_wdi.c                 | 7 +++----
 CORE/WDI/CP/src/wlan_qct_wdi_dp.c              | 7 +++----
 39 files changed, 116 insertions(+), 167 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 7d1e74e0b25d..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
 /**===========================================================================
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 6551ed83afe2..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
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 1c0d1e00cadb..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.
  */
 
 
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/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
@@ -19,19 +19,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * 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/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 8fc67f4288f8..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.
  */
 
 
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/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.
  */
 
 
-- 
cgit v1.2.3


From 94378dc7672bc3816cbbc1e08b3a8a34c111cc98 Mon Sep 17 00:00:00 2001
From: Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com>
Date: Thu, 24 Jul 2014 14:10:47 +0530
Subject: Cafstaging Release 1.0.0.154

Cafstaging Release 1.0.0.154

Change-Id: I555c4e78de02b6440f31cf89a828ecd1b363627d
CRs-Fixed: 688141
---
 CORE/MAC/inc/qwlan_version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
 
-- 
cgit v1.2.3