prima: WLAN Driver Release 3.2.0.10
diff --git a/CORE/BAP/inc/bapApi.h b/CORE/BAP/inc/bapApi.h
index 7de6ca2..570be8f 100644
--- a/CORE/BAP/inc/bapApi.h
+++ b/CORE/BAP/inc/bapApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/inc/btampHCI.h b/CORE/BAP/inc/btampHCI.h
index c7d3e97..d506417 100644
--- a/CORE/BAP/inc/btampHCI.h
+++ b/CORE/BAP/inc/btampHCI.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiData.c b/CORE/BAP/src/bapApiData.c
index 0875e31..5c35b4b 100644
--- a/CORE/BAP/src/bapApiData.c
+++ b/CORE/BAP/src/bapApiData.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiDebug.c b/CORE/BAP/src/bapApiDebug.c
index 5a334e3..00ffcfa 100644
--- a/CORE/BAP/src/bapApiDebug.c
+++ b/CORE/BAP/src/bapApiDebug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiExt.c b/CORE/BAP/src/bapApiExt.c
index 0a1bcab..5b9ba26 100644
--- a/CORE/BAP/src/bapApiExt.c
+++ b/CORE/BAP/src/bapApiExt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiExt.h b/CORE/BAP/src/bapApiExt.h
index df18071..7b714df 100644
--- a/CORE/BAP/src/bapApiExt.h
+++ b/CORE/BAP/src/bapApiExt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiHCBB.c b/CORE/BAP/src/bapApiHCBB.c
index c0c777c..dd21a59 100644
--- a/CORE/BAP/src/bapApiHCBB.c
+++ b/CORE/BAP/src/bapApiHCBB.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiInfo.c b/CORE/BAP/src/bapApiInfo.c
index 4e43c84..c622999 100644
--- a/CORE/BAP/src/bapApiInfo.c
+++ b/CORE/BAP/src/bapApiInfo.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiLinkCntl.c b/CORE/BAP/src/bapApiLinkCntl.c
index e52a33d..94876c4 100644
--- a/CORE/BAP/src/bapApiLinkCntl.c
+++ b/CORE/BAP/src/bapApiLinkCntl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiLinkSupervision.c b/CORE/BAP/src/bapApiLinkSupervision.c
index e446e12..b51b3b6 100644
--- a/CORE/BAP/src/bapApiLinkSupervision.c
+++ b/CORE/BAP/src/bapApiLinkSupervision.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiStatus.c b/CORE/BAP/src/bapApiStatus.c
index 26a3e5d..75e3012 100644
--- a/CORE/BAP/src/bapApiStatus.c
+++ b/CORE/BAP/src/bapApiStatus.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiTimer.c b/CORE/BAP/src/bapApiTimer.c
index 621507f..681800a 100644
--- a/CORE/BAP/src/bapApiTimer.c
+++ b/CORE/BAP/src/bapApiTimer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapApiTimer.h b/CORE/BAP/src/bapApiTimer.h
index 1d86dab..233de09 100644
--- a/CORE/BAP/src/bapApiTimer.h
+++ b/CORE/BAP/src/bapApiTimer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapInternal.h b/CORE/BAP/src/bapInternal.h
index 7cfdc03..ad752b5 100644
--- a/CORE/BAP/src/bapInternal.h
+++ b/CORE/BAP/src/bapInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapModule.c b/CORE/BAP/src/bapModule.c
index 3acdec2..1e78de6 100644
--- a/CORE/BAP/src/bapModule.c
+++ b/CORE/BAP/src/bapModule.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.c b/CORE/BAP/src/bapRsn8021xAuthFsm.c
index 9c89829..968c4f0 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.c
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.h b/CORE/BAP/src/bapRsn8021xAuthFsm.h
index f47d207..518daf9 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.h
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xFsm.h b/CORE/BAP/src/bapRsn8021xFsm.h
index 422c7ff..70a6fdd 100644
--- a/CORE/BAP/src/bapRsn8021xFsm.h
+++ b/CORE/BAP/src/bapRsn8021xFsm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xPrf.c b/CORE/BAP/src/bapRsn8021xPrf.c
index ffcf863..e319d76 100644
--- a/CORE/BAP/src/bapRsn8021xPrf.c
+++ b/CORE/BAP/src/bapRsn8021xPrf.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xPrf.h b/CORE/BAP/src/bapRsn8021xPrf.h
index e83ce38..a36de33 100644
--- a/CORE/BAP/src/bapRsn8021xPrf.h
+++ b/CORE/BAP/src/bapRsn8021xPrf.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
index 7a8a4cb..215e453 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
index 6c46a84..e95a8d9 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnAsfPacket.c b/CORE/BAP/src/bapRsnAsfPacket.c
index b45925e..c8037ad 100644
--- a/CORE/BAP/src/bapRsnAsfPacket.c
+++ b/CORE/BAP/src/bapRsnAsfPacket.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnAsfPacket.h b/CORE/BAP/src/bapRsnAsfPacket.h
index e8a933d..8f6dec6 100644
--- a/CORE/BAP/src/bapRsnAsfPacket.h
+++ b/CORE/BAP/src/bapRsnAsfPacket.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnErrors.h b/CORE/BAP/src/bapRsnErrors.h
index 1da6d59..7919859 100644
--- a/CORE/BAP/src/bapRsnErrors.h
+++ b/CORE/BAP/src/bapRsnErrors.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmAesKeyWrap.c b/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
index fa97b88..ec05ed4 100644
--- a/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
+++ b/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmAesKeyWrap.h b/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
index 428c1a3..226d20a 100644
--- a/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
+++ b/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmEapol.c b/CORE/BAP/src/bapRsnSsmEapol.c
index 6d12fdc..3112ecf 100644
--- a/CORE/BAP/src/bapRsnSsmEapol.c
+++ b/CORE/BAP/src/bapRsnSsmEapol.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmEapol.h b/CORE/BAP/src/bapRsnSsmEapol.h
index 24fed8e..fef99fe 100644
--- a/CORE/BAP/src/bapRsnSsmEapol.h
+++ b/CORE/BAP/src/bapRsnSsmEapol.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmReplayCtr.c b/CORE/BAP/src/bapRsnSsmReplayCtr.c
index db919a6..332d1bb 100644
--- a/CORE/BAP/src/bapRsnSsmReplayCtr.c
+++ b/CORE/BAP/src/bapRsnSsmReplayCtr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmReplayCtr.h b/CORE/BAP/src/bapRsnSsmReplayCtr.h
index 33c9f06..956e904 100644
--- a/CORE/BAP/src/bapRsnSsmReplayCtr.h
+++ b/CORE/BAP/src/bapRsnSsmReplayCtr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnSsmServices.h b/CORE/BAP/src/bapRsnSsmServices.h
index 023cf57..03d777d 100644
--- a/CORE/BAP/src/bapRsnSsmServices.h
+++ b/CORE/BAP/src/bapRsnSsmServices.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnTxRx.c b/CORE/BAP/src/bapRsnTxRx.c
index f13a65f..d0cad2d 100644
--- a/CORE/BAP/src/bapRsnTxRx.c
+++ b/CORE/BAP/src/bapRsnTxRx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/bapRsnTxRx.h b/CORE/BAP/src/bapRsnTxRx.h
index d460268..1829a1b 100644
--- a/CORE/BAP/src/bapRsnTxRx.h
+++ b/CORE/BAP/src/bapRsnTxRx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/btampFsm.c b/CORE/BAP/src/btampFsm.c
index 0842fc2..4819fe9 100644
--- a/CORE/BAP/src/btampFsm.c
+++ b/CORE/BAP/src/btampFsm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/btampFsm.h b/CORE/BAP/src/btampFsm.h
index d03c511..71a85fe 100644
--- a/CORE/BAP/src/btampFsm.h
+++ b/CORE/BAP/src/btampFsm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/btampFsm_ext.h b/CORE/BAP/src/btampFsm_ext.h
index 4570825..0a586b5 100644
--- a/CORE/BAP/src/btampFsm_ext.h
+++ b/CORE/BAP/src/btampFsm_ext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/btampHCI.c b/CORE/BAP/src/btampHCI.c
index a16f926..093e22f 100644
--- a/CORE/BAP/src/btampHCI.c
+++ b/CORE/BAP/src/btampHCI.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/BAP/src/fsmDefs.h b/CORE/BAP/src/fsmDefs.h
index 182fbee..3c5cc53 100644
--- a/CORE/BAP/src/fsmDefs.h
+++ b/CORE/BAP/src/fsmDefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/DXE/inc/wlan_qct_dxe.h b/CORE/DXE/inc/wlan_qct_dxe.h
index 80665b8..273a667 100644
--- a/CORE/DXE/inc/wlan_qct_dxe.h
+++ b/CORE/DXE/inc/wlan_qct_dxe.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index c12e22d..d5523c2 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1770,7 +1770,10 @@
descCtrl = currentDesc->descCtrl.ctrl;
}
- if(invalidatedFound)
+ /* Invalidated descriptor found, and that is not head descriptor
+ * This means HW/SW descriptor miss match happen, and we may recover with just resync
+ * Try re-sync here */
+ if((invalidatedFound) && (0 != descLoop))
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"Found New Sync location with HW, handle frames from there");
@@ -1779,6 +1782,16 @@
"re-sync routed %d frames to upper layer", (int)frameCount);
frameCount = 0;
}
+ /* Successive Empty interrupt
+ * But this case, first descriptor also invalidated, then it means head descriptor
+ * is linked with already handled RX frame, then could not unlock RX frame
+ * This is just Out of RX buffer pool, not need to anything here */
+ else if((invalidatedFound) && (0 == descLoop))
+ {
+ HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
+ "Out of RX Low resource, and INT came in, do nothing till get RX resource");
+ }
+ /* Critical error, reload driver */
else
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
@@ -1955,6 +1968,7 @@
{
HDXE_MSG(eWLAN_MODULE_DAL_DATA, eWLAN_PAL_TRACE_LEVEL_ERROR,
"RX Ready WLAN Driver re-loading in progress");
+ return;
}
/* Now try to refill the ring with empty Rx buffers to keep DXE busy */
@@ -2034,7 +2048,8 @@
{
/* Error Happen during transaction, Handle it */
}
- else if(WLANDXE_CH_STAT_INT_DONE_MASK & chHighStat)
+ else if((WLANDXE_CH_STAT_INT_DONE_MASK & chHighStat) ||
+ (WLANDXE_CH_STAT_INT_ED_MASK & chHighStat))
{
/* Handle RX Ready for high priority channel */
status = dxeRXFrameReady(dxeCtxt,
diff --git a/CORE/DXE/src/wlan_qct_dxe_cfg_i.c b/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
index 398bd67..f132532 100644
--- a/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
+++ b/CORE/DXE/src/wlan_qct_dxe_cfg_i.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/DXE/src/wlan_qct_dxe_i.h b/CORE/DXE/src/wlan_qct_dxe_i.h
index e29e18a..24d16ff 100644
--- a/CORE/DXE/src/wlan_qct_dxe_i.h
+++ b/CORE/DXE/src/wlan_qct_dxe_i.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/bap_hdd_main.h b/CORE/HDD/inc/bap_hdd_main.h
index fe0a707..bdd8664 100644
--- a/CORE/HDD/inc/bap_hdd_main.h
+++ b/CORE/HDD/inc/bap_hdd_main.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/bap_hdd_misc.h b/CORE/HDD/inc/bap_hdd_misc.h
index 8a92bde..822b603 100644
--- a/CORE/HDD/inc/bap_hdd_misc.h
+++ b/CORE/HDD/inc/bap_hdd_misc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/qc_sap_ioctl.h b/CORE/HDD/inc/qc_sap_ioctl.h
index 6efa7ad..3f6c2b6 100644
--- a/CORE/HDD/inc/qc_sap_ioctl.h
+++ b/CORE/HDD/inc/qc_sap_ioctl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_assoc.h b/CORE/HDD/inc/wlan_hdd_assoc.h
index d748cf3..f3945f6 100644
--- a/CORE/HDD/inc/wlan_hdd_assoc.h
+++ b/CORE/HDD/inc/wlan_hdd_assoc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h
index 554b857..32818fa 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -883,6 +883,71 @@
#define CFG_BTC_A2DP_DHCP_PROTECTION_MAX ( 0xFF )
#define CFG_BTC_A2DP_DHCP_PROTECTION_DEFAULT ( 7 )
+#define CFG_BTC_STATIC_LEN_INQ_BT_NAME "btcStaticLenInqBt"
+#define CFG_BTC_STATIC_LEN_INQ_BT_MIN ( 5000 )
+#define CFG_BTC_STATIC_LEN_INQ_BT_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_INQ_BT_DEFAULT ( 120000 )
+
+#define CFG_BTC_STATIC_LEN_PAGE_BT_NAME "btcStaticLenPageBt"
+#define CFG_BTC_STATIC_LEN_PAGE_BT_MIN ( 5000 )
+#define CFG_BTC_STATIC_LEN_PAGE_BT_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_PAGE_BT_DEFAULT ( 10000 )
+
+#define CFG_BTC_STATIC_LEN_CONN_BT_NAME "btcStaticLenConnBt"
+#define CFG_BTC_STATIC_LEN_CONN_BT_MIN ( 5000 )
+#define CFG_BTC_STATIC_LEN_CONN_BT_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_CONN_BT_DEFAULT ( 10000 )
+
+#define CFG_BTC_STATIC_LEN_LE_BT_NAME "btcStaticLenLeBt"
+#define CFG_BTC_STATIC_LEN_LE_BT_MIN ( 5000 )
+#define CFG_BTC_STATIC_LEN_LE_BT_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_LE_BT_DEFAULT ( 10000 )
+
+#define CFG_BTC_STATIC_LEN_INQ_WLAN_NAME "btcStaticLenInqWlan"
+#define CFG_BTC_STATIC_LEN_INQ_WLAN_MIN ( 0 )
+#define CFG_BTC_STATIC_LEN_INQ_WLAN_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_INQ_WLAN_DEFAULT ( 30000 )
+
+#define CFG_BTC_STATIC_LEN_PAGE_WLAN_NAME "btcStaticLenPageWlan"
+#define CFG_BTC_STATIC_LEN_PAGE_WLAN_MIN ( 0 )
+#define CFG_BTC_STATIC_LEN_PAGE_WLAN_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_PAGE_WLAN_DEFAULT ( 0 )
+
+#define CFG_BTC_STATIC_LEN_CONN_WLAN_NAME "btcStaticLenConnWlan"
+#define CFG_BTC_STATIC_LEN_CONN_WLAN_MIN ( 0 )
+#define CFG_BTC_STATIC_LEN_CONN_WLAN_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_CONN_WLAN_DEFAULT ( 0 )
+
+#define CFG_BTC_STATIC_LEN_LE_WLAN_NAME "btcStaticLenLeWlan"
+#define CFG_BTC_STATIC_LEN_LE_WLAN_MIN ( 0 )
+#define CFG_BTC_STATIC_LEN_LE_WLAN_MAX ( 500000 )
+#define CFG_BTC_STATIC_LEN_LE_WLAN_DEFAULT ( 0 )
+
+#define CFG_BTC_DYN_MAX_LEN_BT_NAME "btcDynMaxLenBt"
+#define CFG_BTC_DYN_MAX_LEN_BT_MIN ( 25000 )
+#define CFG_BTC_DYN_MAX_LEN_BT_MAX ( 500000 )
+#define CFG_BTC_DYN_MAX_LEN_BT_DEFAULT ( 250000 )
+
+#define CFG_BTC_DYN_MAX_LEN_WLAN_NAME "btcDynMaxLenWlan"
+#define CFG_BTC_DYN_MAX_LEN_WLAN_MIN ( 15000 )
+#define CFG_BTC_DYN_MAX_LEN_WLAN_MAX ( 500000 )
+#define CFG_BTC_DYN_MAX_LEN_WLAN_DEFAULT ( 45000 )
+
+#define CFG_BTC_MAX_SCO_BLOCK_PERC_NAME "btcMaxScoBlockPerc"
+#define CFG_BTC_MAX_SCO_BLOCK_PERC_MIN ( 0 )
+#define CFG_BTC_MAX_SCO_BLOCK_PERC_MAX ( 100 )
+#define CFG_BTC_MAX_SCO_BLOCK_PERC_DEFAULT ( 1 )
+
+#define CFG_BTC_DHCP_PROT_ON_A2DP_NAME "btcDhcpProtOnA2dp"
+#define CFG_BTC_DHCP_PROT_ON_A2DP_MIN ( 0 )
+#define CFG_BTC_DHCP_PROT_ON_A2DP_MAX ( 1 )
+#define CFG_BTC_DHCP_PROT_ON_A2DP_DEFAULT ( 1 )
+
+#define CFG_BTC_DHCP_PROT_ON_SCO_NAME "btcDhcpProtOnSco"
+#define CFG_BTC_DHCP_PROT_ON_SCO_MIN ( 0 )
+#define CFG_BTC_DHCP_PROT_ON_SCO_MAX ( 1 )
+#define CFG_BTC_DHCP_PROT_ON_SCO_DEFAULT ( 0 )
+
#if defined WLAN_FEATURE_VOWIFI_11R
#define CFG_FT_ENABLE_NAME "gFtEnabled"
#define CFG_FT_ENABLE_MIN (0)
@@ -1293,6 +1358,19 @@
v_U8_t btcExecutionMode;
v_U8_t btcConsBtSlotsToBlockDuringDhcp;
v_U8_t btcA2DPBtSubIntervalsDuringDhcp;
+ v_U32_t btcStaticLenInqBt;
+ v_U32_t btcStaticLenPageBt;
+ v_U32_t btcStaticLenConnBt;
+ v_U32_t btcStaticLenLeBt;
+ v_U32_t btcStaticLenInqWlan;
+ v_U32_t btcStaticLenPageWlan;
+ v_U32_t btcStaticLenConnWlan;
+ v_U32_t btcStaticLenLeWlan;
+ v_U32_t btcDynMaxLenBt;
+ v_U32_t btcDynMaxLenWlan;
+ v_U32_t btcMaxScoBlockPerc;
+ v_U32_t btcDhcpProtOnA2dp;
+ v_U32_t btcDhcpProtOnSco;
v_U32_t nImpsModSleepTime;
v_U32_t nImpsMaxSleepTime;
v_U32_t nImpsMinSleepTime;
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h
index fc0ef47..eb7d44c 100644
--- a/CORE/HDD/inc/wlan_hdd_cfg80211.h
+++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_dev_pwr.h b/CORE/HDD/inc/wlan_hdd_dev_pwr.h
index 27f55ef..a936bb6 100644
--- a/CORE/HDD/inc/wlan_hdd_dev_pwr.h
+++ b/CORE/HDD/inc/wlan_hdd_dev_pwr.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_dp_utils.h b/CORE/HDD/inc/wlan_hdd_dp_utils.h
index 33d9418..83b49d1 100644
--- a/CORE/HDD/inc/wlan_hdd_dp_utils.h
+++ b/CORE/HDD/inc/wlan_hdd_dp_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_ether.h b/CORE/HDD/inc/wlan_hdd_ether.h
index ef83bda..a8f9e45 100644
--- a/CORE/HDD/inc/wlan_hdd_ether.h
+++ b/CORE/HDD/inc/wlan_hdd_ether.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_ftm.h b/CORE/HDD/inc/wlan_hdd_ftm.h
index 7f0cff0..1185f8b 100644
--- a/CORE/HDD/inc/wlan_hdd_ftm.h
+++ b/CORE/HDD/inc/wlan_hdd_ftm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_host_offload.h b/CORE/HDD/inc/wlan_hdd_host_offload.h
index de0f3f7..9bc4477 100644
--- a/CORE/HDD/inc/wlan_hdd_host_offload.h
+++ b/CORE/HDD/inc/wlan_hdd_host_offload.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_hostapd.h b/CORE/HDD/inc/wlan_hdd_hostapd.h
index 00525a2..2141ebb 100644
--- a/CORE/HDD/inc/wlan_hdd_hostapd.h
+++ b/CORE/HDD/inc/wlan_hdd_hostapd.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_includes.h b/CORE/HDD/inc/wlan_hdd_includes.h
index 07155e3..7d5b0df 100644
--- a/CORE/HDD/inc/wlan_hdd_includes.h
+++ b/CORE/HDD/inc/wlan_hdd_includes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_keep_alive.h b/CORE/HDD/inc/wlan_hdd_keep_alive.h
index 7e19833..d23cce3 100644
--- a/CORE/HDD/inc/wlan_hdd_keep_alive.h
+++ b/CORE/HDD/inc/wlan_hdd_keep_alive.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_main.h b/CORE/HDD/inc/wlan_hdd_main.h
index c333556..a4cb046 100644
--- a/CORE/HDD/inc/wlan_hdd_main.h
+++ b/CORE/HDD/inc/wlan_hdd_main.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_mib.h b/CORE/HDD/inc/wlan_hdd_mib.h
index 0cb3dbe..85f198f 100644
--- a/CORE/HDD/inc/wlan_hdd_mib.h
+++ b/CORE/HDD/inc/wlan_hdd_mib.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_oemdata.h b/CORE/HDD/inc/wlan_hdd_oemdata.h
index e6815d6..76ca895 100644
--- a/CORE/HDD/inc/wlan_hdd_oemdata.h
+++ b/CORE/HDD/inc/wlan_hdd_oemdata.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_p2p.h b/CORE/HDD/inc/wlan_hdd_p2p.h
index ec256ff..f4d8cc3 100644
--- a/CORE/HDD/inc/wlan_hdd_p2p.h
+++ b/CORE/HDD/inc/wlan_hdd_p2p.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -94,6 +94,7 @@
void hdd_remainChanReadyHandler( hdd_adapter_t *pAdapter );
void hdd_sendActionCnf( hdd_adapter_t *pAdapter, tANI_BOOLEAN actionSendSuccess );
+int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev,
diff --git a/CORE/HDD/inc/wlan_hdd_packet_filtering.h b/CORE/HDD/inc/wlan_hdd_packet_filtering.h
index f4c2109..d052ac6 100644
--- a/CORE/HDD/inc/wlan_hdd_packet_filtering.h
+++ b/CORE/HDD/inc/wlan_hdd_packet_filtering.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_power.h b/CORE/HDD/inc/wlan_hdd_power.h
index 82b5008..df654b0 100644
--- a/CORE/HDD/inc/wlan_hdd_power.h
+++ b/CORE/HDD/inc/wlan_hdd_power.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
index 4f566d9..7a32214 100644
--- a/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_softap_tx_rx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_tx_rx.h b/CORE/HDD/inc/wlan_hdd_tx_rx.h
index d8bf1cd..669e216 100644
--- a/CORE/HDD/inc/wlan_hdd_tx_rx.h
+++ b/CORE/HDD/inc/wlan_hdd_tx_rx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_version.h b/CORE/HDD/inc/wlan_hdd_version.h
index dca987f..368ab9a 100644
--- a/CORE/HDD/inc/wlan_hdd_version.h
+++ b/CORE/HDD/inc/wlan_hdd_version.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_wext.h b/CORE/HDD/inc/wlan_hdd_wext.h
index 2e0a7ac..b1ea49a 100644
--- a/CORE/HDD/inc/wlan_hdd_wext.h
+++ b/CORE/HDD/inc/wlan_hdd_wext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_wmm.h b/CORE/HDD/inc/wlan_hdd_wmm.h
index 7c27ff7..f84fe65 100644
--- a/CORE/HDD/inc/wlan_hdd_wmm.h
+++ b/CORE/HDD/inc/wlan_hdd_wmm.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_hdd_wowl.h b/CORE/HDD/inc/wlan_hdd_wowl.h
index 8a4ed15..2376e10 100644
--- a/CORE/HDD/inc/wlan_hdd_wowl.h
+++ b/CORE/HDD/inc/wlan_hdd_wowl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/inc/wlan_qct_driver.h b/CORE/HDD/inc/wlan_qct_driver.h
index aaca28f..18b00d4 100644
--- a/CORE/HDD/inc/wlan_qct_driver.h
+++ b/CORE/HDD/inc/wlan_qct_driver.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/bap_hdd_main.c b/CORE/HDD/src/bap_hdd_main.c
index 60a42aa..6352be6 100644
--- a/CORE/HDD/src/bap_hdd_main.c
+++ b/CORE/HDD/src/bap_hdd_main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index 01e53cc..6359ba7 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1128,7 +1128,11 @@
hdd_context_t* pHddCtx = (hdd_context_t*)pAdapter->pHddCtx;
hdd_wext_state_t *pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
- pr_info("wlan: connection failed\n");
+ pr_info("wlan: connection failed with %02x:%02x:%02x:%02x:%02x:%02x"
+ " reason:%d and Status:%d\n", pWextState->req_bssId[0],
+ pWextState->req_bssId[1], pWextState->req_bssId[2],
+ pWextState->req_bssId[3], pWextState->req_bssId[4],
+ pWextState->req_bssId[5], roamResult, roamStatus);
/*Handle all failure conditions*/
hdd_connSetConnectionState( pHddStaCtx, eConnectionState_NotConnected);
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 9eea30f..5b31fb2 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1055,6 +1055,97 @@
CFG_BTC_A2DP_DHCP_PROTECTION_MIN,
CFG_BTC_A2DP_DHCP_PROTECTION_MAX ),
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_INQ_BT_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenInqBt,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_INQ_BT_DEFAULT,
+ CFG_BTC_STATIC_LEN_INQ_BT_MIN,
+ CFG_BTC_STATIC_LEN_INQ_BT_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_PAGE_BT_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenPageBt,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_PAGE_BT_DEFAULT,
+ CFG_BTC_STATIC_LEN_PAGE_BT_MIN,
+ CFG_BTC_STATIC_LEN_PAGE_BT_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_CONN_BT_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenConnBt,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_CONN_BT_DEFAULT,
+ CFG_BTC_STATIC_LEN_CONN_BT_MIN,
+ CFG_BTC_STATIC_LEN_CONN_BT_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_LE_BT_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenLeBt,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_LE_BT_DEFAULT,
+ CFG_BTC_STATIC_LEN_LE_BT_MIN,
+ CFG_BTC_STATIC_LEN_LE_BT_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_INQ_WLAN_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenInqWlan,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_INQ_WLAN_DEFAULT,
+ CFG_BTC_STATIC_LEN_INQ_WLAN_MIN,
+ CFG_BTC_STATIC_LEN_INQ_WLAN_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_PAGE_WLAN_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenPageWlan,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_PAGE_WLAN_DEFAULT,
+ CFG_BTC_STATIC_LEN_PAGE_WLAN_MIN,
+ CFG_BTC_STATIC_LEN_PAGE_WLAN_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_CONN_WLAN_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenConnWlan,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_CONN_WLAN_DEFAULT,
+ CFG_BTC_STATIC_LEN_CONN_WLAN_MIN,
+ CFG_BTC_STATIC_LEN_CONN_WLAN_MAX ),
+
+ REG_VARIABLE( CFG_BTC_STATIC_LEN_LE_WLAN_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcStaticLenLeWlan,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_STATIC_LEN_LE_WLAN_DEFAULT,
+ CFG_BTC_STATIC_LEN_LE_WLAN_MIN,
+ CFG_BTC_STATIC_LEN_LE_WLAN_MAX ),
+
+ REG_VARIABLE( CFG_BTC_DYN_MAX_LEN_BT_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcDynMaxLenBt,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_DYN_MAX_LEN_BT_DEFAULT,
+ CFG_BTC_DYN_MAX_LEN_BT_MIN,
+ CFG_BTC_DYN_MAX_LEN_BT_MAX ),
+
+ REG_VARIABLE( CFG_BTC_DYN_MAX_LEN_WLAN_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcDynMaxLenWlan,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_DYN_MAX_LEN_WLAN_DEFAULT,
+ CFG_BTC_DYN_MAX_LEN_WLAN_MIN,
+ CFG_BTC_DYN_MAX_LEN_WLAN_MAX ),
+
+ REG_VARIABLE( CFG_BTC_MAX_SCO_BLOCK_PERC_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcMaxScoBlockPerc,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_MAX_SCO_BLOCK_PERC_DEFAULT,
+ CFG_BTC_MAX_SCO_BLOCK_PERC_MIN,
+ CFG_BTC_MAX_SCO_BLOCK_PERC_MAX ),
+
+ REG_VARIABLE( CFG_BTC_DHCP_PROT_ON_A2DP_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcDhcpProtOnA2dp,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_DHCP_PROT_ON_A2DP_DEFAULT,
+ CFG_BTC_DHCP_PROT_ON_A2DP_MIN,
+ CFG_BTC_DHCP_PROT_ON_A2DP_MAX ),
+
+ REG_VARIABLE( CFG_BTC_DHCP_PROT_ON_SCO_NAME , WLAN_PARAM_Integer,
+ hdd_config_t, btcDhcpProtOnSco,
+ VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
+ CFG_BTC_DHCP_PROT_ON_SCO_DEFAULT,
+ CFG_BTC_DHCP_PROT_ON_SCO_MIN,
+ CFG_BTC_DHCP_PROT_ON_SCO_MAX ),
+
#ifdef WLAN_SOFTAP_FEATURE
REG_VARIABLE( CFG_AP_LISTEN_MODE_NAME , WLAN_PARAM_Integer,
hdd_config_t, nEnableListenMode,
@@ -2286,11 +2377,23 @@
sme_BtcGetConfig(pHddCtx->hHal, &btcParams);
btcParams.btcExecutionMode = pConfig->btcExecutionMode;
-
btcParams.btcConsBtSlotsToBlockDuringDhcp = pConfig->btcConsBtSlotsToBlockDuringDhcp;
-
btcParams.btcA2DPBtSubIntervalsDuringDhcp = pConfig->btcA2DPBtSubIntervalsDuringDhcp;
+ btcParams.btcStaticLenInqBt = pConfig->btcStaticLenInqBt;
+ btcParams.btcStaticLenPageBt = pConfig->btcStaticLenPageBt;
+ btcParams.btcStaticLenConnBt = pConfig->btcStaticLenConnBt;
+ btcParams.btcStaticLenLeBt = pConfig->btcStaticLenLeBt;
+ btcParams.btcStaticLenInqWlan = pConfig->btcStaticLenInqWlan;
+ btcParams.btcStaticLenPageWlan = pConfig->btcStaticLenPageWlan;
+ btcParams.btcStaticLenConnWlan = pConfig->btcStaticLenConnWlan;
+ btcParams.btcStaticLenLeWlan = pConfig->btcStaticLenLeWlan;
+ btcParams.btcDynMaxLenBt = pConfig->btcDynMaxLenBt;
+ btcParams.btcDynMaxLenWlan = pConfig->btcDynMaxLenWlan;
+ btcParams.btcMaxScoBlockPerc = pConfig->btcMaxScoBlockPerc;
+ btcParams.btcDhcpProtOnA2dp = pConfig->btcDhcpProtOnA2dp;
+ btcParams.btcDhcpProtOnSco = pConfig->btcDhcpProtOnSco;
+
sme_BtcSetConfig(pHddCtx->hHal, &btcParams);
}
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index ef35511..1b904ff 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1240,32 +1240,38 @@
pConfig->dtim_period);
- pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
+ if (pHostapdAdapter->device_mode == WLAN_HDD_SOFTAP)
+ {
+ pIe = wlan_hdd_cfg80211_get_ie_ptr(pBeacon->tail, pBeacon->tail_len,
WLAN_EID_COUNTRY);
- if(pIe)
- {
- tANI_BOOLEAN restartNeeded;
- tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
-
- pConfig->ieee80211d = 1;
- vos_mem_copy(pConfig->countryCode, &pIe[2], 3);
- sme_setRegInfo(hHal, pConfig->countryCode);
- sme_ResetCountryCodeInformation(hHal, &restartNeeded);
- /*
- * If auto channel is configured i.e. channel is 0,
- * so skip channel validation.
- */
- if( AUTO_CHANNEL_SELECT != pConfig->channel )
+ if(pIe)
{
- if(VOS_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pHostapdAdapter,pConfig->channel))
+ tANI_BOOLEAN restartNeeded;
+ tHalHandle hHal = WLAN_HDD_GET_HAL_CTX(pHostapdAdapter);
+ pConfig->ieee80211d = 1;
+ vos_mem_copy(pConfig->countryCode, &pIe[2], 3);
+ sme_setRegInfo(hHal, pConfig->countryCode);
+ sme_ResetCountryCodeInformation(hHal, &restartNeeded);
+ /*
+ * If auto channel is configured i.e. channel is 0,
+ * so skip channel validation.
+ */
+ if( AUTO_CHANNEL_SELECT != pConfig->channel )
{
- hddLog(VOS_TRACE_LEVEL_ERROR,
- "%s: Invalid Channel [%d] \n", __func__, pConfig->channel);
- return -EINVAL;
+ if(VOS_STATUS_SUCCESS != wlan_hdd_validate_operation_channel(pHostapdAdapter,pConfig->channel))
+ {
+ hddLog(VOS_TRACE_LEVEL_ERROR,
+ "%s: Invalid Channel [%d] \n", __func__, pConfig->channel);
+ return -EINVAL;
+ }
}
}
+ else
+ {
+ pConfig->ieee80211d = 0;
+ }
}
- else
+ else
{
pConfig->ieee80211d = 0;
}
@@ -2014,6 +2020,19 @@
#else
pAdapter->device_mode = WLAN_HDD_SOFTAP;
#endif
+
+ //Disable BMPS and IMPS if enabled
+ //before starting Go
+ if(WLAN_HDD_P2P_GO == pAdapter->device_mode)
+ {
+ if(VOS_STATUS_E_FAILURE ==
+ hdd_disable_bmps_imps(pHddCtx, WLAN_HDD_P2P_GO))
+ {
+ //Fail to Exit BMPS
+ VOS_ASSERT(0);
+ }
+ }
+
hdd_set_ap_ops( pAdapter->dev );
status = hdd_init_ap_mode(pAdapter);
@@ -2060,6 +2079,8 @@
case NL80211_IFTYPE_P2P_CLIENT:
#endif
case NL80211_IFTYPE_ADHOC:
+ hdd_stop_adapter( pHddCtx, pAdapter );
+ hdd_deinit_adapter( pHddCtx, pAdapter );
wdev->iftype = type;
#ifdef WLAN_FEATURE_P2P
pAdapter->device_mode = (type == NL80211_IFTYPE_STATION) ?
@@ -2067,8 +2088,6 @@
#endif
hdd_set_conparam(0);
pHddCtx->change_iface = type;
- hdd_stop_adapter( pHddCtx, pAdapter );
- hdd_deinit_adapter( pHddCtx, pAdapter );
memset(&pAdapter->sessionCtx, 0, sizeof(pAdapter->sessionCtx));
hdd_set_station_ops( pAdapter->dev );
status = hdd_init_station_mode( pAdapter );
@@ -3560,6 +3579,16 @@
return -EAGAIN;
}
+ //Don't Allow Scan and return busy if Remain On
+ //Channel and action frame is pending
+ //Otherwise Cancel Remain On Channel and allow Scan
+ //If no action frame pending
+ if(0 != wlan_hdd_check_remain_on_channel(pAdapter))
+ {
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: Remain On Channel Pending", __func__);
+ return -EBUSY;
+ }
+
if (mutex_lock_interruptible(&pHddCtx->tmInfo.tmOperationLock))
{
VOS_TRACE(VOS_MODULE_ID_HDD,VOS_TRACE_LEVEL_ERROR,
@@ -3586,7 +3615,7 @@
* Becasue of this, driver is assuming that this is not wildcard scan and so
* is not aging out the scan results.
*/
- if ('\0' == request->ssids->ssid[0])
+ if (request->ssids && '\0' == request->ssids->ssid[0])
{
request->n_ssids = 0;
}
@@ -3788,7 +3817,7 @@
* This function is used to start the association process
*/
int wlan_hdd_cfg80211_connect_start( hdd_adapter_t *pAdapter,
- const u8 *ssid, size_t ssid_len, const u8 *bssid)
+ const u8 *ssid, size_t ssid_len, const u8 *bssid, u8 operatingChannel)
{
int status = 0;
hdd_wext_state_t *pWextState;
@@ -3939,10 +3968,16 @@
#endif /* FEATURE_WLAN_WAPI */
pRoamProfile->csrPersona = pAdapter->device_mode;
+ if( operatingChannel )
+ {
+ pRoamProfile->ChannelInfo.ChannelList = &operatingChannel;
+ pRoamProfile->ChannelInfo.numOfChannels = 1;
+ }
+
status = sme_RoamConnect( WLAN_HDD_GET_HAL_CTX(pAdapter),
pAdapter->sessionId, pRoamProfile, &roamId);
- pRoamProfile->ChannelInfo.ChannelList = NULL;
+ pRoamProfile->ChannelInfo.ChannelList = NULL;
pRoamProfile->ChannelInfo.numOfChannels = 0;
}
else
@@ -4533,7 +4568,8 @@
}
status = wlan_hdd_cfg80211_connect_start(pAdapter, req->ssid,
- req->ssid_len, req->bssid);
+ req->ssid_len, req->bssid,
+ req->channel->hw_value);
if (0 > status)
{
@@ -4826,7 +4862,7 @@
/* Issue connect start */
status = wlan_hdd_cfg80211_connect_start(pAdapter, params->ssid,
- params->ssid_len, params->bssid);
+ params->ssid_len, params->bssid, 0);
if (0 > status)
{
diff --git a/CORE/HDD/src/wlan_hdd_dev_pwr.c b/CORE/HDD/src/wlan_hdd_dev_pwr.c
index da53ff3..ab1b423 100644
--- a/CORE/HDD/src/wlan_hdd_dev_pwr.c
+++ b/CORE/HDD/src/wlan_hdd_dev_pwr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_dp_utils.c b/CORE/HDD/src/wlan_hdd_dp_utils.c
index c7ee744..f5b3117 100644
--- a/CORE/HDD/src/wlan_hdd_dp_utils.c
+++ b/CORE/HDD/src/wlan_hdd_dp_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 3ad6fd0..bfb5a05 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2208,11 +2208,20 @@
goto success;
err_unregister_pmops:
+#ifdef CONFIG_HAS_EARLYSUSPEND
+ /* unregister suspend/resume callbacks */
+ if (pHddCtx->cfg_ini->nEnableSuspend)
+ unregister_wlan_suspend();
+#endif
hddDeregisterPmOps(pHddCtx);
err_bap_stop:
+#ifdef CONFIG_HAS_EARLYSUSPEND
+ hdd_unregister_mcast_bcast_filter(pHddCtx);
+#endif
+ hdd_close_all_adapters(pHddCtx);
#ifdef WLAN_BTAMP_FEATURE
- WLANBAP_Stop(pVosContext);
+ WLANBAP_Stop(pVosContext);
#endif
#ifdef WLAN_BTAMP_FEATURE
@@ -2228,17 +2237,11 @@
vos_sched_close(pVosContext);
if (pHddCtx)
{
-#ifdef CONFIG_HAS_EARLYSUSPEND
- /* unregister suspend/resume callbacks */
- if (pHddCtx->cfg_ini->nEnableSuspend)
- unregister_wlan_suspend();
-#endif
/* Unregister the Net Device Notifier */
unregister_netdevice_notifier(&hdd_netdev_notifier);
/* Clean up HDD Nlink Service */
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
nl_srv_exit();
- hdd_close_all_adapters(pHddCtx);
/* Free up dynamically allocated members inside HDD Adapter */
kfree(pHddCtx->cfg_ini);
pHddCtx->cfg_ini= NULL;
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index b6ba3d5..d7e8f14 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index b7e5166..ebf9598 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 9f59945..85044f5 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -141,8 +141,6 @@
/* the Android framework expects this param even though we don't use it */
#define BUF_LEN 20
static char fwpath[BUF_LEN];
-module_param_string(fwpath, fwpath, BUF_LEN,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
/*
* The rate at which the driver sends RESTART event to supplicant
@@ -397,7 +395,7 @@
ret = -EFAULT;
}
}
- if(strncmp(priv_data.buf, "SETBAND", 7) == 0)
+ else if(strncmp(priv_data.buf, "SETBAND", 7) == 0)
{
tANI_U8 *ptr = (tANI_U8*)priv_data.buf ;
int ret = 0 ;
@@ -412,6 +410,20 @@
/* Change band request received */
ret = hdd_setBand_helper(dev, ptr);
}
+ else if ( strncasecmp(command, "COUNTRY", 7) == 0 )
+ {
+ char *country_code;
+
+ country_code = command + 8;
+ ret = (int)sme_ChangeCountryCode(pHddCtx->hHal, NULL, country_code,
+ pAdapter, pHddCtx->pvosContext);
+ if( 0 != ret )
+ {
+ VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
+ "%s: SME Change Country code fail ret=%d\n",__func__, ret);
+
+ }
+ }
}
exit:
if (command)
@@ -3910,17 +3922,17 @@
/**---------------------------------------------------------------------------
- \brief hdd_module_init() - Init Function
+ \brief hdd_driver_init() - Core Driver Init Function
- This is the driver entry point (invoked when module is loaded using insmod)
+ This is the driver entry point - called in different timeline depending
+ on whether the driver is statically or dynamically linked
\param - None
\return - 0 for success, non zero for failure
--------------------------------------------------------------------------*/
-
-static int __init hdd_module_init ( void)
+static int hdd_driver_init( void)
{
VOS_STATUS status;
v_CONTEXT_t pVosContext = NULL;
@@ -4132,6 +4144,63 @@
return ret_status;
}
+/**---------------------------------------------------------------------------
+
+ \brief hdd_module_init() - Init Function
+
+ This is the driver entry point (invoked when module is loaded using insmod)
+
+ \param - None
+
+ \return - 0 for success, non zero for failure
+
+ --------------------------------------------------------------------------*/
+#ifdef MODULE
+static int __init hdd_module_init ( void)
+{
+ return hdd_driver_init();
+}
+
+static int fwpath_changed_handler(const char *kmessage,
+ struct kernel_param *kp)
+{
+ /* nothing to do when driver is DLKM */
+ return 0;
+}
+#else /* #ifdef MODULE */
+static int __init hdd_module_init ( void)
+{
+ /* Driver initialization is delayed to fwpath_changed_handler */
+ return 0;
+}
+
+/**---------------------------------------------------------------------------
+
+ \brief fwpath_changed_handler() - Handler Function
+
+ This is the driver entry point
+ - delayed driver initialization when driver is statically linked
+ - invoked when module parameter is modified from userpspace to signal
+ initializing the WLAN driver
+
+ \return - 0 for success, non zero for failure
+
+ --------------------------------------------------------------------------*/
+static int fwpath_changed_handler(const char *kmessage,
+ struct kernel_param *kp)
+{
+ static int drv_inited = 0;
+
+ if (drv_inited) {
+ return 0;
+ }
+
+ drv_inited = 1;
+
+ return hdd_driver_init();
+}
+#endif /* #ifdef MODULE */
+
/**---------------------------------------------------------------------------
@@ -4620,3 +4689,6 @@
#if defined(WLAN_SOFTAP_FEATURE) || defined(ANI_MANF_DIAG)
module_param(con_mode, int, 0);
#endif
+
+module_param_call(fwpath, fwpath_changed_handler, param_get_string, fwpath,
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
diff --git a/CORE/HDD/src/wlan_hdd_mib.c b/CORE/HDD/src/wlan_hdd_mib.c
index f6dbab2..94bcc82 100644
--- a/CORE/HDD/src/wlan_hdd_mib.c
+++ b/CORE/HDD/src/wlan_hdd_mib.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index 6243662..9643cba 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 418cc70..c16d17e 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -118,29 +118,18 @@
return eHAL_STATUS_SUCCESS;
}
-static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
- struct net_device *dev,
- struct ieee80211_channel *chan,
- enum nl80211_channel_type channel_type,
- unsigned int duration, u64 *cookie,
- rem_on_channel_request_type_t request_type )
+static void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter)
{
- hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
- hdd_remain_on_chan_ctx_t *pRemainChanCtx;
hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
int status = 0;
- hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d",
- __func__,pAdapter->device_mode);
- hddLog( LOG1,
- "chan(hw_val)0x%x chan(centerfreq) %d chan type 0x%x, duration %d",
- chan->hw_value, chan->center_freq, channel_type, duration );
-
- if( cfgState->remain_on_chan_ctx != NULL)
+ if(cfgState->remain_on_chan_ctx != NULL)
{
- /* Wait till remain on channel ready indication before issuing cancel
- * remain on channel request, otherwise if remain on channel not
- * received and if the driver issues cancel remain on channel then lim
+ hddLog( LOG1, "Cancel Existing Remain on Channel");
+
+ /* Wait till remain on channel ready indication before issuing cancel
+ * remain on channel request, otherwise if remain on channel not
+ * received and if the driver issues cancel remain on channel then lim
* will be in unknown state.
*/
status = wait_for_completion_interruptible_timeout(&pAdapter->rem_on_chan_ready_event,
@@ -153,7 +142,7 @@
}
INIT_COMPLETION(pAdapter->cancel_rem_on_chan_var);
-
+
/* Issue abort remain on chan request to sme.
* The remain on channel callback will make sure the remain_on_chan
* expired event is sent.
@@ -174,9 +163,63 @@
(WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
}
- wait_for_completion_interruptible_timeout(&pAdapter->cancel_rem_on_chan_var,
+ status = wait_for_completion_interruptible_timeout(&pAdapter->cancel_rem_on_chan_var,
msecs_to_jiffies(WAIT_CANCEL_REM_CHAN));
+
+ if (!status)
+ {
+ hddLog( LOGE,
+ "%s: timeout waiting for cancel remain on channel ready indication",
+ __func__);
+ }
}
+}
+
+int wlan_hdd_check_remain_on_channel(hdd_adapter_t *pAdapter)
+{
+ int status = 0;
+ hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
+
+ if(WLAN_HDD_P2P_GO != pAdapter->device_mode)
+ {
+ //Cancel Existing Remain On Channel
+ //If no action frame is pending
+ if( cfgState->remain_on_chan_ctx != NULL)
+ {
+ //Check whether Action Frame is pending or not
+ if( cfgState->buf == NULL)
+ {
+ wlan_hdd_cancel_existing_remain_on_channel(pAdapter);
+ }
+ else
+ {
+ hddLog( LOG1, "Cannot Cancel Existing Remain on Channel");
+ status = -EBUSY;
+ }
+ }
+ }
+ return status;
+}
+
+static int wlan_hdd_request_remain_on_channel( struct wiphy *wiphy,
+ struct net_device *dev,
+ struct ieee80211_channel *chan,
+ enum nl80211_channel_type channel_type,
+ unsigned int duration, u64 *cookie,
+ rem_on_channel_request_type_t request_type )
+{
+ hdd_adapter_t *pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
+ hdd_remain_on_chan_ctx_t *pRemainChanCtx;
+ hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
+ hddLog(VOS_TRACE_LEVEL_INFO, "%s: device_mode = %d",
+ __func__,pAdapter->device_mode);
+
+ hddLog( LOG1,
+ "chan(hw_val)0x%x chan(centerfreq) %d chan type 0x%x, duration %d",
+ chan->hw_value, chan->center_freq, channel_type, duration );
+
+ //Cancel existing remain On Channel if any
+ wlan_hdd_cancel_existing_remain_on_channel(pAdapter);
/* When P2P-GO and if we are trying to unload the driver then
* wlan driver is keep on receiving the remain on channel command
diff --git a/CORE/HDD/src/wlan_hdd_scan.c b/CORE/HDD/src/wlan_hdd_scan.c
index ed13968..6f6bb50 100644
--- a/CORE/HDD/src/wlan_hdd_scan.c
+++ b/CORE/HDD/src/wlan_hdd_scan.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
index b218471..579b414 100644
--- a/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_softap_tx_rx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_tx_rx.c b/CORE/HDD/src/wlan_hdd_tx_rx.c
index e8ecc88..999b8fe 100644
--- a/CORE/HDD/src/wlan_hdd_tx_rx.c
+++ b/CORE/HDD/src/wlan_hdd_tx_rx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 3041f23..d514ec3 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_wmm.c b/CORE/HDD/src/wlan_hdd_wmm.c
index c8da218..85e528d 100644
--- a/CORE/HDD/src/wlan_hdd_wmm.c
+++ b/CORE/HDD/src/wlan_hdd_wmm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/HDD/src/wlan_hdd_wowl.c b/CORE/HDD/src/wlan_hdd_wowl.c
index fa41a23..f581d99 100644
--- a/CORE/HDD/src/wlan_hdd_wowl.c
+++ b/CORE/HDD/src/wlan_hdd_wowl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/aniCompiler.h b/CORE/MAC/inc/aniCompiler.h
index 91b6b1e..a1c4288 100644
--- a/CORE/MAC/inc/aniCompiler.h
+++ b/CORE/MAC/inc/aniCompiler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/aniDbgTest.h b/CORE/MAC/inc/aniDbgTest.h
index e80b1b9..2949acd 100644
--- a/CORE/MAC/inc/aniDbgTest.h
+++ b/CORE/MAC/inc/aniDbgTest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
index 7e55f06..e8cf4d5 100644
--- a/CORE/MAC/inc/aniGlobal.h
+++ b/CORE/MAC/inc/aniGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/aniParam.h b/CORE/MAC/inc/aniParam.h
index b9a361d..44b7a32 100644
--- a/CORE/MAC/inc/aniParam.h
+++ b/CORE/MAC/inc/aniParam.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/aniSystemDefs.h b/CORE/MAC/inc/aniSystemDefs.h
index f8b1f9f..f585893 100644
--- a/CORE/MAC/inc/aniSystemDefs.h
+++ b/CORE/MAC/inc/aniSystemDefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/logDump.h b/CORE/MAC/inc/logDump.h
index 4af9cdd..b17fb66 100644
--- a/CORE/MAC/inc/logDump.h
+++ b/CORE/MAC/inc/logDump.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/macInitApi.h b/CORE/MAC/inc/macInitApi.h
index 91d0c32..8fe0d1c 100644
--- a/CORE/MAC/inc/macInitApi.h
+++ b/CORE/MAC/inc/macInitApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/macTrace.h b/CORE/MAC/inc/macTrace.h
index 6de267c..6ccbd3e 100644
--- a/CORE/MAC/inc/macTrace.h
+++ b/CORE/MAC/inc/macTrace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
index 2244955..df6292f 100644
--- a/CORE/MAC/inc/qwlan_version.h
+++ b/CORE/MAC/inc/qwlan_version.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -40,8 +40,8 @@
#define QWLAN_VERSION_MINOR 2
#define QWLAN_VERSION_PATCH 0
#define QWLAN_VERSION_EXTRA ""
-#define QWLAN_VERSION_BUILD 9
+#define QWLAN_VERSION_BUILD 10
-#define QWLAN_VERSIONSTR "3.2.0.9"
+#define QWLAN_VERSIONSTR "3.2.0.10"
#endif /* QWLAN_VERSION_H */
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h
index 1723072..997c99c 100644
--- a/CORE/MAC/inc/sirApi.h
+++ b/CORE/MAC/inc/sirApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/sirMacPropExts.h b/CORE/MAC/inc/sirMacPropExts.h
index 1b7deba..dab6064 100644
--- a/CORE/MAC/inc/sirMacPropExts.h
+++ b/CORE/MAC/inc/sirMacPropExts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/sirMacProtDef.h b/CORE/MAC/inc/sirMacProtDef.h
index 0b15872..cd7b19a 100644
--- a/CORE/MAC/inc/sirMacProtDef.h
+++ b/CORE/MAC/inc/sirMacProtDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/sirTypes.h b/CORE/MAC/inc/sirTypes.h
index 467dcc7..897733e 100644
--- a/CORE/MAC/inc/sirTypes.h
+++ b/CORE/MAC/inc/sirTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/wniApi.h b/CORE/MAC/inc/wniApi.h
index dc3cd0b..9ef410d 100644
--- a/CORE/MAC/inc/wniApi.h
+++ b/CORE/MAC/inc/wniApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/wniCfgAp.h b/CORE/MAC/inc/wniCfgAp.h
index 7c944cc..221f551 100644
--- a/CORE/MAC/inc/wniCfgAp.h
+++ b/CORE/MAC/inc/wniCfgAp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/wniCfgSta.h b/CORE/MAC/inc/wniCfgSta.h
index bdf146c..0495641 100644
--- a/CORE/MAC/inc/wniCfgSta.h
+++ b/CORE/MAC/inc/wniCfgSta.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/inc/wniStat.h b/CORE/MAC/inc/wniStat.h
index 2a6b4bb..1bae538 100644
--- a/CORE/MAC/inc/wniStat.h
+++ b/CORE/MAC/inc/wniStat.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgApi.c b/CORE/MAC/src/cfg/cfgApi.c
index a857343..81740ef 100644
--- a/CORE/MAC/src/cfg/cfgApi.c
+++ b/CORE/MAC/src/cfg/cfgApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgDebug.c b/CORE/MAC/src/cfg/cfgDebug.c
index 6e37c73..053768c 100644
--- a/CORE/MAC/src/cfg/cfgDebug.c
+++ b/CORE/MAC/src/cfg/cfgDebug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgDebug.h b/CORE/MAC/src/cfg/cfgDebug.h
index 49d0533..2046ffa 100644
--- a/CORE/MAC/src/cfg/cfgDebug.h
+++ b/CORE/MAC/src/cfg/cfgDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgDef.h b/CORE/MAC/src/cfg/cfgDef.h
index b942f3f..b3d689d 100644
--- a/CORE/MAC/src/cfg/cfgDef.h
+++ b/CORE/MAC/src/cfg/cfgDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgParamName.c b/CORE/MAC/src/cfg/cfgParamName.c
index 5c1580b..7b3d5a3 100644
--- a/CORE/MAC/src/cfg/cfgParamName.c
+++ b/CORE/MAC/src/cfg/cfgParamName.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgPriv.h b/CORE/MAC/src/cfg/cfgPriv.h
index b8f3be7..5bed155 100644
--- a/CORE/MAC/src/cfg/cfgPriv.h
+++ b/CORE/MAC/src/cfg/cfgPriv.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgProcMsg.c b/CORE/MAC/src/cfg/cfgProcMsg.c
index 30bcbd8..432af33 100644
--- a/CORE/MAC/src/cfg/cfgProcMsg.c
+++ b/CORE/MAC/src/cfg/cfgProcMsg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgSendMsg.c b/CORE/MAC/src/cfg/cfgSendMsg.c
index 8f83143..72f9c01 100644
--- a/CORE/MAC/src/cfg/cfgSendMsg.c
+++ b/CORE/MAC/src/cfg/cfgSendMsg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/cfgUtil/cfg.txt b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
index ed4e62d..9102981 100644
--- a/CORE/MAC/src/cfg/cfgUtil/cfg.txt
+++ b/CORE/MAC/src/cfg/cfgUtil/cfg.txt
@@ -1,4 +1,4 @@
-* Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+* Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/cfg/polFile.h b/CORE/MAC/src/cfg/polFile.h
index 68e673c..7800b87 100644
--- a/CORE/MAC/src/cfg/polFile.h
+++ b/CORE/MAC/src/cfg/polFile.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/dph/dphHashTable.c b/CORE/MAC/src/dph/dphHashTable.c
index 73791f6..f6bc4ff 100644
--- a/CORE/MAC/src/dph/dphHashTable.c
+++ b/CORE/MAC/src/dph/dphHashTable.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/dph/dphHashTable.h b/CORE/MAC/src/dph/dphHashTable.h
index af40d3b..b671112 100644
--- a/CORE/MAC/src/dph/dphHashTable.h
+++ b/CORE/MAC/src/dph/dphHashTable.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/cfgApi.h b/CORE/MAC/src/include/cfgApi.h
index 7820782..f277e07 100644
--- a/CORE/MAC/src/include/cfgApi.h
+++ b/CORE/MAC/src/include/cfgApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/cfgGlobal.h b/CORE/MAC/src/include/cfgGlobal.h
index 9956dc4..7824d8c 100644
--- a/CORE/MAC/src/include/cfgGlobal.h
+++ b/CORE/MAC/src/include/cfgGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/dot11f.h b/CORE/MAC/src/include/dot11f.h
index d4657b1..d04fa7d 100644
--- a/CORE/MAC/src/include/dot11f.h
+++ b/CORE/MAC/src/include/dot11f.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/dphGlobal.h b/CORE/MAC/src/include/dphGlobal.h
index 9a53caf..01a4ab4 100644
--- a/CORE/MAC/src/include/dphGlobal.h
+++ b/CORE/MAC/src/include/dphGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/parserApi.h b/CORE/MAC/src/include/parserApi.h
index a28f43d..6716251 100644
--- a/CORE/MAC/src/include/parserApi.h
+++ b/CORE/MAC/src/include/parserApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/phyGlobal.h b/CORE/MAC/src/include/phyGlobal.h
index 60dafcf..27cad41 100644
--- a/CORE/MAC/src/include/phyGlobal.h
+++ b/CORE/MAC/src/include/phyGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/sirCommon.h b/CORE/MAC/src/include/sirCommon.h
index cc8737f..7ff6279 100644
--- a/CORE/MAC/src/include/sirCommon.h
+++ b/CORE/MAC/src/include/sirCommon.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/sirDebug.h b/CORE/MAC/src/include/sirDebug.h
index e1680d3..d583e75 100644
--- a/CORE/MAC/src/include/sirDebug.h
+++ b/CORE/MAC/src/include/sirDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
index 02bec73..8c73bdc 100644
--- a/CORE/MAC/src/include/sirParams.h
+++ b/CORE/MAC/src/include/sirParams.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/sirWrapper.h b/CORE/MAC/src/include/sirWrapper.h
index 8410162..4517733 100644
--- a/CORE/MAC/src/include/sirWrapper.h
+++ b/CORE/MAC/src/include/sirWrapper.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/sysGlobal.h b/CORE/MAC/src/include/sysGlobal.h
index 24ffaa6..d69e3ac 100644
--- a/CORE/MAC/src/include/sysGlobal.h
+++ b/CORE/MAC/src/include/sysGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/utilsApi.h b/CORE/MAC/src/include/utilsApi.h
index f8b71dd..3cece2d 100644
--- a/CORE/MAC/src/include/utilsApi.h
+++ b/CORE/MAC/src/include/utilsApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/include/utilsGlobal.h b/CORE/MAC/src/include/utilsGlobal.h
index 3006082..1e93d2a 100644
--- a/CORE/MAC/src/include/utilsGlobal.h
+++ b/CORE/MAC/src/include/utilsGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limAdmitControl.h b/CORE/MAC/src/pe/include/limAdmitControl.h
index 123564a..2de2866 100644
--- a/CORE/MAC/src/pe/include/limAdmitControl.h
+++ b/CORE/MAC/src/pe/include/limAdmitControl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limApi.h b/CORE/MAC/src/pe/include/limApi.h
index 7e1a88a..ef3ffba 100644
--- a/CORE/MAC/src/pe/include/limApi.h
+++ b/CORE/MAC/src/pe/include/limApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limFT.h b/CORE/MAC/src/pe/include/limFT.h
index 45dbaa4..f065b8d 100644
--- a/CORE/MAC/src/pe/include/limFT.h
+++ b/CORE/MAC/src/pe/include/limFT.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limFTDefs.h b/CORE/MAC/src/pe/include/limFTDefs.h
index b069bc1..6a71a87 100644
--- a/CORE/MAC/src/pe/include/limFTDefs.h
+++ b/CORE/MAC/src/pe/include/limFTDefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limGlobal.h b/CORE/MAC/src/pe/include/limGlobal.h
index 7061a68..89d8116 100644
--- a/CORE/MAC/src/pe/include/limGlobal.h
+++ b/CORE/MAC/src/pe/include/limGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limSession.h b/CORE/MAC/src/pe/include/limSession.h
index b98ac47..f0058ec 100644
--- a/CORE/MAC/src/pe/include/limSession.h
+++ b/CORE/MAC/src/pe/include/limSession.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/limTrace.h b/CORE/MAC/src/pe/include/limTrace.h
index 062ddb3..981510e 100644
--- a/CORE/MAC/src/pe/include/limTrace.h
+++ b/CORE/MAC/src/pe/include/limTrace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/pmmApi.h b/CORE/MAC/src/pe/include/pmmApi.h
index 8ca992c..c495f39 100644
--- a/CORE/MAC/src/pe/include/pmmApi.h
+++ b/CORE/MAC/src/pe/include/pmmApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/pmmGlobal.h b/CORE/MAC/src/pe/include/pmmGlobal.h
index e98a344..b49743e 100644
--- a/CORE/MAC/src/pe/include/pmmGlobal.h
+++ b/CORE/MAC/src/pe/include/pmmGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/rrmApi.h b/CORE/MAC/src/pe/include/rrmApi.h
index 1855ed5..f341b66 100644
--- a/CORE/MAC/src/pe/include/rrmApi.h
+++ b/CORE/MAC/src/pe/include/rrmApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/rrmGlobal.h b/CORE/MAC/src/pe/include/rrmGlobal.h
index 5e240b2..00270e4 100644
--- a/CORE/MAC/src/pe/include/rrmGlobal.h
+++ b/CORE/MAC/src/pe/include/rrmGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/schApi.h b/CORE/MAC/src/pe/include/schApi.h
index 9d76898..a3fd17a 100644
--- a/CORE/MAC/src/pe/include/schApi.h
+++ b/CORE/MAC/src/pe/include/schApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/schGlobal.h b/CORE/MAC/src/pe/include/schGlobal.h
index 176ce65..1848b61 100644
--- a/CORE/MAC/src/pe/include/schGlobal.h
+++ b/CORE/MAC/src/pe/include/schGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/include/wmmApsd.h b/CORE/MAC/src/pe/include/wmmApsd.h
index f133104..5410d74 100644
--- a/CORE/MAC/src/pe/include/wmmApsd.h
+++ b/CORE/MAC/src/pe/include/wmmApsd.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limAIDmgmt.c b/CORE/MAC/src/pe/lim/limAIDmgmt.c
index 7e78eb6..c1e1a4e 100644
--- a/CORE/MAC/src/pe/lim/limAIDmgmt.c
+++ b/CORE/MAC/src/pe/lim/limAIDmgmt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limAdmitControl.c b/CORE/MAC/src/pe/lim/limAdmitControl.c
index ec69451..0f8413c 100644
--- a/CORE/MAC/src/pe/lim/limAdmitControl.c
+++ b/CORE/MAC/src/pe/lim/limAdmitControl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limApi.c b/CORE/MAC/src/pe/lim/limApi.c
index aac103b..9a0fd9d 100644
--- a/CORE/MAC/src/pe/lim/limApi.c
+++ b/CORE/MAC/src/pe/lim/limApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.c b/CORE/MAC/src/pe/lim/limAssocUtils.c
index 60a1591..4412981 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.c
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3291,10 +3291,17 @@
tpAddBssParams pAddBssParams = NULL;
tANI_U32 retCode;
tANI_U8 i;
- tSchBeaconStruct beaconStruct;
+ tSchBeaconStruct *pBeaconStruct;
tANI_U8 chanWidthSupp = 0;
tpSirBssDescription bssDescription = &psessionEntry->pLimJoinReq->bssDescription;
+ if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
+ (void **)&pBeaconStruct, sizeof(tSchBeaconStruct)))
+ {
+ limLog(pMac, LOGE, FL("Unable to PAL allocate memory during ADD_BSS\n") );
+ return eSIR_MEM_ALLOC_FAILED;
+ }
+
// Package SIR_HAL_ADD_BSS_REQ message parameters
if( eHAL_STATUS_SUCCESS != palAllocateMemory( pMac->hHdd,
@@ -3313,10 +3320,10 @@
limExtractApCapabilities( pMac,
(tANI_U8 *) bssDescription->ieFields,
limGetIElenFromBssDescription( bssDescription ),
- &beaconStruct );
+ pBeaconStruct );
if(pMac->lim.gLimProtectionControl != WNI_CFG_FORCE_POLICY_PROTECTION_DISABLE)
- limDecideStaProtectionOnAssoc(pMac, &beaconStruct, psessionEntry);
+ limDecideStaProtectionOnAssoc(pMac, pBeaconStruct, psessionEntry);
palCopyMemory( pMac->hHdd, pAddBssParams->bssId,bssDescription->bssId,
sizeof( tSirMacAddr ));
@@ -3335,67 +3342,67 @@
pAddBssParams->beaconInterval = bssDescription->beaconInterval;
- pAddBssParams->dtimPeriod = beaconStruct.tim.dtimPeriod;
+ pAddBssParams->dtimPeriod = pBeaconStruct->tim.dtimPeriod;
pAddBssParams->updateBss = updateEntry;
- pAddBssParams->cfParamSet.cfpCount = beaconStruct.cfParamSet.cfpCount;
- pAddBssParams->cfParamSet.cfpPeriod = beaconStruct.cfParamSet.cfpPeriod;
- pAddBssParams->cfParamSet.cfpMaxDuration = beaconStruct.cfParamSet.cfpMaxDuration;
- pAddBssParams->cfParamSet.cfpDurRemaining = beaconStruct.cfParamSet.cfpDurRemaining;
+ pAddBssParams->cfParamSet.cfpCount = pBeaconStruct->cfParamSet.cfpCount;
+ pAddBssParams->cfParamSet.cfpPeriod = pBeaconStruct->cfParamSet.cfpPeriod;
+ pAddBssParams->cfParamSet.cfpMaxDuration = pBeaconStruct->cfParamSet.cfpMaxDuration;
+ pAddBssParams->cfParamSet.cfpDurRemaining = pBeaconStruct->cfParamSet.cfpDurRemaining;
- pAddBssParams->rateSet.numRates = beaconStruct.supportedRates.numRates;
+ pAddBssParams->rateSet.numRates = pBeaconStruct->supportedRates.numRates;
palCopyMemory( pMac->hHdd, pAddBssParams->rateSet.rate,
- beaconStruct.supportedRates.rate, beaconStruct.supportedRates.numRates );
+ pBeaconStruct->supportedRates.rate, pBeaconStruct->supportedRates.numRates );
pAddBssParams->nwType = bssDescription->nwType;
- pAddBssParams->shortSlotTimeSupported = (tANI_U8)beaconStruct.capabilityInfo.shortSlotTime;
+ pAddBssParams->shortSlotTimeSupported = (tANI_U8)pBeaconStruct->capabilityInfo.shortSlotTime;
pAddBssParams->llaCoexist = (tANI_U8) psessionEntry->beaconParams.llaCoexist;
pAddBssParams->llbCoexist = (tANI_U8) psessionEntry->beaconParams.llbCoexist;
pAddBssParams->llgCoexist = (tANI_U8) psessionEntry->beaconParams.llgCoexist;
pAddBssParams->ht20Coexist = (tANI_U8) psessionEntry->beaconParams.ht20Coexist;
// Use the advertised capabilities from the received beacon/PR
- if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && ( beaconStruct.HTCaps.present ))
+ if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && ( pBeaconStruct->HTCaps.present ))
{
- pAddBssParams->htCapable = beaconStruct.HTCaps.present;
+ pAddBssParams->htCapable = pBeaconStruct->HTCaps.present;
- if ( beaconStruct.HTInfo.present )
+ if ( pBeaconStruct->HTInfo.present )
{
- pAddBssParams->htOperMode = (tSirMacHTOperatingMode)beaconStruct.HTInfo.opMode;
- pAddBssParams->dualCTSProtection = ( tANI_U8 ) beaconStruct.HTInfo.dualCTSProtection;
+ pAddBssParams->htOperMode = (tSirMacHTOperatingMode)pBeaconStruct->HTInfo.opMode;
+ pAddBssParams->dualCTSProtection = ( tANI_U8 ) pBeaconStruct->HTInfo.dualCTSProtection;
#ifdef WLAN_SOFTAP_FEATURE
chanWidthSupp = limGetHTCapability( pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET, psessionEntry);
#else
chanWidthSupp = limGetHTCapability( pMac, eHT_SUPPORTED_CHANNEL_WIDTH_SET);
#endif
- if( (beaconStruct.HTCaps.supportedChannelWidthSet) &&
+ if( (pBeaconStruct->HTCaps.supportedChannelWidthSet) &&
(chanWidthSupp) )
{
- pAddBssParams->txChannelWidthSet = ( tANI_U8 ) beaconStruct.HTInfo.recommendedTxWidthSet;
- pAddBssParams->currentExtChannel = beaconStruct.HTInfo.secondaryChannelOffset;
+ pAddBssParams->txChannelWidthSet = ( tANI_U8 ) pBeaconStruct->HTInfo.recommendedTxWidthSet;
+ pAddBssParams->currentExtChannel = pBeaconStruct->HTInfo.secondaryChannelOffset;
}
else
{
pAddBssParams->txChannelWidthSet = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
pAddBssParams->currentExtChannel = PHY_SINGLE_CHANNEL_CENTERED;
}
- pAddBssParams->llnNonGFCoexist = (tANI_U8)beaconStruct.HTInfo.nonGFDevicesPresent;
- pAddBssParams->fLsigTXOPProtectionFullSupport = (tANI_U8)beaconStruct.HTInfo.lsigTXOPProtectionFullSupport;
- pAddBssParams->fRIFSMode = beaconStruct.HTInfo.rifsMode;
+ pAddBssParams->llnNonGFCoexist = (tANI_U8)pBeaconStruct->HTInfo.nonGFDevicesPresent;
+ pAddBssParams->fLsigTXOPProtectionFullSupport = (tANI_U8)pBeaconStruct->HTInfo.lsigTXOPProtectionFullSupport;
+ pAddBssParams->fRIFSMode = pBeaconStruct->HTInfo.rifsMode;
}
}
pAddBssParams->currentOperChannel = bssDescription->channelId;
#ifdef WLAN_FEATURE_11AC
- if (psessionEntry->vhtCapability && ( beaconStruct.VHTCaps.present ))
+ if (psessionEntry->vhtCapability && ( pBeaconStruct->VHTCaps.present ))
{
- pAddBssParams->vhtCapable = beaconStruct.VHTCaps.present;
- pAddBssParams->vhtTxChannelWidthSet = beaconStruct.VHTOperation.chanWidth;
+ pAddBssParams->vhtCapable = pBeaconStruct->VHTCaps.present;
+ pAddBssParams->vhtTxChannelWidthSet = pBeaconStruct->VHTOperation.chanWidth;
pAddBssParams->currentExtChannel = limGet11ACPhyCBState ( pMac,
pAddBssParams->currentOperChannel,
pAddBssParams->currentExtChannel );
@@ -3419,24 +3426,24 @@
pAddBssParams->staContext.assocId = 0; // Is SMAC OK with this?
pAddBssParams->staContext.uAPSD = 0;
pAddBssParams->staContext.maxSPLen = 0;
- pAddBssParams->staContext.shortPreambleSupported = (tANI_U8)beaconStruct.capabilityInfo.shortPreamble;
+ pAddBssParams->staContext.shortPreambleSupported = (tANI_U8)pBeaconStruct->capabilityInfo.shortPreamble;
pAddBssParams->staContext.updateSta = updateEntry;
- if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && ( beaconStruct.HTCaps.present ))
+ if (IS_DOT11_MODE_HT(psessionEntry->dot11mode) && ( pBeaconStruct->HTCaps.present ))
{
pAddBssParams->staContext.us32MaxAmpduDuration = 0;
pAddBssParams->staContext.htCapable = 1;
- pAddBssParams->staContext.greenFieldCapable = ( tANI_U8 ) beaconStruct.HTCaps.greenField;
- pAddBssParams->staContext.lsigTxopProtection = ( tANI_U8 ) beaconStruct.HTCaps.lsigTXOPProtection;
- if( (beaconStruct.HTCaps.supportedChannelWidthSet) &&
+ pAddBssParams->staContext.greenFieldCapable = ( tANI_U8 ) pBeaconStruct->HTCaps.greenField;
+ pAddBssParams->staContext.lsigTxopProtection = ( tANI_U8 ) pBeaconStruct->HTCaps.lsigTXOPProtection;
+ if( (pBeaconStruct->HTCaps.supportedChannelWidthSet) &&
(chanWidthSupp) )
{
- pAddBssParams->staContext.txChannelWidthSet = ( tANI_U8 )beaconStruct.HTInfo.recommendedTxWidthSet;
+ pAddBssParams->staContext.txChannelWidthSet = ( tANI_U8 )pBeaconStruct->HTInfo.recommendedTxWidthSet;
#ifdef WLAN_FEATURE_11AC
- if (psessionEntry->vhtCapability && ( beaconStruct.VHTCaps.present ))
+ if (psessionEntry->vhtCapability && ( pBeaconStruct->VHTCaps.present ))
{
pAddBssParams->staContext.vhtCapable = 1;
- pAddBssParams->staContext.vhtTxChannelWidthSet = beaconStruct.VHTOperation.chanWidth;
+ pAddBssParams->staContext.vhtTxChannelWidthSet = pBeaconStruct->VHTOperation.chanWidth;
}
#endif
}
@@ -3444,21 +3451,21 @@
{
pAddBssParams->staContext.txChannelWidthSet = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
}
- pAddBssParams->staContext.mimoPS = (tSirMacHTMIMOPowerSaveState)beaconStruct.HTCaps.mimoPowerSave;
- pAddBssParams->staContext.delBASupport = ( tANI_U8 ) beaconStruct.HTCaps.delayedBA;
- pAddBssParams->staContext.maxAmsduSize = ( tANI_U8 ) beaconStruct.HTCaps.maximalAMSDUsize;
- pAddBssParams->staContext.maxAmpduDensity = beaconStruct.HTCaps.mpduDensity;
- pAddBssParams->staContext.fDsssCckMode40Mhz = (tANI_U8)beaconStruct.HTCaps.dsssCckMode40MHz;
- pAddBssParams->staContext.fShortGI20Mhz = (tANI_U8)beaconStruct.HTCaps.shortGI20MHz;
- pAddBssParams->staContext.fShortGI40Mhz = (tANI_U8)beaconStruct.HTCaps.shortGI40MHz;
- pAddBssParams->staContext.maxAmpduSize= beaconStruct.HTCaps.maxRxAMPDUFactor;
+ pAddBssParams->staContext.mimoPS = (tSirMacHTMIMOPowerSaveState)pBeaconStruct->HTCaps.mimoPowerSave;
+ pAddBssParams->staContext.delBASupport = ( tANI_U8 ) pBeaconStruct->HTCaps.delayedBA;
+ pAddBssParams->staContext.maxAmsduSize = ( tANI_U8 ) pBeaconStruct->HTCaps.maximalAMSDUsize;
+ pAddBssParams->staContext.maxAmpduDensity = pBeaconStruct->HTCaps.mpduDensity;
+ pAddBssParams->staContext.fDsssCckMode40Mhz = (tANI_U8)pBeaconStruct->HTCaps.dsssCckMode40MHz;
+ pAddBssParams->staContext.fShortGI20Mhz = (tANI_U8)pBeaconStruct->HTCaps.shortGI20MHz;
+ pAddBssParams->staContext.fShortGI40Mhz = (tANI_U8)pBeaconStruct->HTCaps.shortGI40MHz;
+ pAddBssParams->staContext.maxAmpduSize= pBeaconStruct->HTCaps.maxRxAMPDUFactor;
- if( beaconStruct.HTInfo.present )
- pAddBssParams->staContext.rifsMode = beaconStruct.HTInfo.rifsMode;
+ if( pBeaconStruct->HTInfo.present )
+ pAddBssParams->staContext.rifsMode = pBeaconStruct->HTInfo.rifsMode;
}
- if ((psessionEntry->limWmeEnabled && beaconStruct.wmeEdcaPresent) ||
- (psessionEntry->limQosEnabled && beaconStruct.edcaPresent))
+ if ((psessionEntry->limWmeEnabled && pBeaconStruct->wmeEdcaPresent) ||
+ (psessionEntry->limQosEnabled && pBeaconStruct->edcaPresent))
pAddBssParams->staContext.wmmEnabled = 1;
else
pAddBssParams->staContext.wmmEnabled = 0;
@@ -3466,11 +3473,11 @@
//Update the rates
#ifdef WLAN_FEATURE_11AC
limPopulateOwnRateSet(pMac, &pAddBssParams->staContext.supportedRates,
- beaconStruct.HTCaps.supportedMCSSet, false,psessionEntry,
- &beaconStruct.VHTCaps);
+ pBeaconStruct->HTCaps.supportedMCSSet, false,psessionEntry,
+ &pBeaconStruct->VHTCaps);
#else
limPopulateOwnRateSet(pMac, &pAddBssParams->staContext.supportedRates,
- beaconStruct.HTCaps.supportedMCSSet, false,psessionEntry);
+ pBeaconStruct->HTCaps.supportedMCSSet, false,psessionEntry);
#endif
limFillSupportedRatesInfo(pMac, NULL, &pAddBssParams->staContext.supportedRates,psessionEntry);
@@ -3537,10 +3544,14 @@
}
else
+ {
+ palFreeMemory(pMac->hHdd, pBeaconStruct);
return retCode;
+ }
returnFailure:
// Clean-up will be done by the caller...
+ palFreeMemory(pMac->hHdd, pBeaconStruct);
return retCode;
}
diff --git a/CORE/MAC/src/pe/lim/limAssocUtils.h b/CORE/MAC/src/pe/lim/limAssocUtils.h
index 8b123fe..fee788d 100644
--- a/CORE/MAC/src/pe/lim/limAssocUtils.h
+++ b/CORE/MAC/src/pe/lim/limAssocUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limDebug.c b/CORE/MAC/src/pe/lim/limDebug.c
index bece3ae..817771d 100644
--- a/CORE/MAC/src/pe/lim/limDebug.c
+++ b/CORE/MAC/src/pe/lim/limDebug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limDebug.h b/CORE/MAC/src/pe/lim/limDebug.h
index 9715fb6..d6b49f8 100644
--- a/CORE/MAC/src/pe/lim/limDebug.h
+++ b/CORE/MAC/src/pe/lim/limDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limFT.c b/CORE/MAC/src/pe/lim/limFT.c
index ceff4da..b752858 100644
--- a/CORE/MAC/src/pe/lim/limFT.c
+++ b/CORE/MAC/src/pe/lim/limFT.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
index 6b118a3..d980ded 100644
--- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
+++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.h b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.h
index 4b3a39f..b10a5ca 100644
--- a/CORE/MAC/src/pe/lim/limIbssPeerMgmt.h
+++ b/CORE/MAC/src/pe/lim/limIbssPeerMgmt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
index 810dd9e..4737356 100644
--- a/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
+++ b/CORE/MAC/src/pe/lim/limLinkMonitoringAlgo.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index f15c80e..7484537 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limP2P.c b/CORE/MAC/src/pe/lim/limP2P.c
index 1b99e87..1faddbe 100644
--- a/CORE/MAC/src/pe/lim/limP2P.c
+++ b/CORE/MAC/src/pe/lim/limP2P.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -60,8 +60,8 @@
#define BSSID_OFFSET 16
#define ADDR2_OFFSET 10
#define ACTION_OFFSET 24
-#define LIM_MIN_REM_TIME_FOR_TX_ACTION_FRAME 30
-#define LIM_MIN_REM_TIME_EXT_FOR_TX_ACTION_FRAME 40
+#define LIM_MIN_REM_TIME_FOR_TX_ACTION_FRAME 50
+#define LIM_MIN_REM_TIME_EXT_FOR_TX_ACTION_FRAME 60
@@ -582,7 +582,7 @@
pMac->lim.p2pRemOnChanTimeStamp = vos_timer_get_system_time();
pMac->lim.gTotalScanDuration = LIM_MIN_REM_TIME_EXT_FOR_TX_ACTION_FRAME;
- chanWaitTime = SYS_MS_TO_TICKS(40);
+ chanWaitTime = SYS_MS_TO_TICKS(LIM_MIN_REM_TIME_EXT_FOR_TX_ACTION_FRAME);
vStatus = tx_timer_deactivate(&pMac->lim.limTimers.gLimRemainOnChannelTimer);
if (VOS_STATUS_SUCCESS != vStatus)
diff --git a/CORE/MAC/src/pe/lim/limProcessActionFrame.c b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
index 016cc10..73d3729 100644
--- a/CORE/MAC/src/pe/lim/limProcessActionFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessActionFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
index 5754e5e..b08edb8 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocReqFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
index 77cf321..38c98d1 100644
--- a/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAssocRspFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
index 5049af5..6979848 100644
--- a/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessAuthFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
index 5b2e128..cb3263d 100644
--- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -75,7 +75,7 @@
limProcessBeaconFrame(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo,tpPESession psessionEntry)
{
tpSirMacMgmtHdr pHdr;
- tSchBeaconStruct beacon;
+ tSchBeaconStruct *pBeacon;
pMac->lim.gLimNumBeaconsRcvd++;
@@ -93,6 +93,7 @@
if (limDeactivateMinChannelTimerDuringScan(pMac) != eSIR_SUCCESS)
return;
+
/**
* Expect Beacon only when
* 1. STA is in Scan mode waiting for Beacon/Probe response or
@@ -105,9 +106,16 @@
(pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE) ||
(psessionEntry->limMlmState == eLIM_MLM_WT_JOIN_BEACON_STATE))
{
+ if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
+ (void **)&pBeacon, sizeof(tSchBeaconStruct)))
+ {
+ limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessBeaconFrame\n") );
+ return;
+ }
+
// Parse received Beacon
if (sirConvertBeaconFrame2Struct(pMac, (tANI_U8 *) pRxPacketInfo,
- &beacon) != eSIR_SUCCESS)
+ pBeacon) != eSIR_SUCCESS)
{
// Received wrongly formatted/invalid Beacon.
// Ignore it and move on.
@@ -115,12 +123,13 @@
FL("Received invalid Beacon in state %X\n"),
psessionEntry->limMlmState);
limPrintMlmState(pMac, LOGW, psessionEntry->limMlmState);
+ palFreeMemory(pMac->hHdd, pBeacon);
return;
}
- MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_TSF, psessionEntry->peSessionId, beacon.timeStamp[0]);)
- MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_TSF, psessionEntry->peSessionId, beacon.timeStamp[1]);)
+ MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_TSF, 0, pBeacon->timeStamp[0]);)
+ MTRACE(macTrace(pMac, TRACE_CODE_RX_MGMT_TSF, 0, pBeacon->timeStamp[1]);)
if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) ||
@@ -132,7 +141,7 @@
|| !pMac->lim.gpLimMlmScanReq->p2pSearch )
#endif
{
- limCheckAndAddBssDescription(pMac, &beacon, pRxPacketInfo,
+ limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo,
((pMac->lim.gLimHalScanState == eLIM_HAL_SCANNING_STATE) ? eANI_BOOLEAN_TRUE : eANI_BOOLEAN_FALSE),
eANI_BOOLEAN_FALSE);
}
@@ -145,10 +154,10 @@
* uncommented. Also when we tested enabling this, there is a crash as soon as the station
* comes up which needs to be fixed*/
//if (pMac->lim.gLimSystemRole == eLIM_STA_ROLE)
- // limCheckAndAddBssDescription(pMac, &beacon, pRxPacketInfo, eANI_BOOLEAN_TRUE);
- limCollectMeasurementData(pMac, pRxPacketInfo, &beacon);
+ // limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo, eANI_BOOLEAN_TRUE);
+ limCollectMeasurementData(pMac, pRxPacketInfo, pBeacon);
PELOG3(limLog(pMac, LOG3, FL("Parsed WDS info in Beacon frames: wdsLength=%d\n"),
- beacon.propIEinfo.wdsLength);)
+ pBeacon->propIEinfo.wdsLength);)
#endif
}
else
@@ -171,8 +180,9 @@
}
// STA in WT_JOIN_BEACON_STATE (IBSS)
- limCheckAndAnnounceJoinSuccess(pMac, &beacon, pHdr,psessionEntry);
+ limCheckAndAnnounceJoinSuccess(pMac, pBeacon, pHdr,psessionEntry);
} // if (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE)
+ palFreeMemory(pMac->hHdd, pBeacon);
} // if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) || ...
else
{
@@ -221,7 +231,7 @@
limProcessBeaconFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo)
{
tpSirMacMgmtHdr pHdr;
- tSchBeaconStruct beacon;
+ tSchBeaconStruct *pBeacon;
pMac->lim.gLimNumBeaconsRcvd++;
pHdr = WDA_GET_RX_MAC_HEADER(pRxPacketInfo);
@@ -233,6 +243,7 @@
if (limDeactivateMinChannelTimerDuringScan(pMac) != eSIR_SUCCESS)
return;
+
/**
* No session has been established. Expect Beacon only when
* 1. STA is in Scan mode waiting for Beacon/Probe response or
@@ -242,11 +253,19 @@
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) ||
(pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE))
{
- if (sirConvertBeaconFrame2Struct(pMac, (tANI_U8 *) pRxPacketInfo, &beacon) != eSIR_SUCCESS)
+ if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
+ (void **)&pBeacon, sizeof(tSchBeaconStruct)))
+ {
+ limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessBeaconFrameNoSession\n") );
+ return;
+ }
+
+ if (sirConvertBeaconFrame2Struct(pMac, (tANI_U8 *) pRxPacketInfo, pBeacon) != eSIR_SUCCESS)
{
// Received wrongly formatted/invalid Beacon. Ignore and move on.
limLog(pMac, LOGW, FL("Received invalid Beacon in global MLM state %X\n"), pMac->lim.gLimMlmState);
limPrintMlmState(pMac, LOGW, pMac->lim.gLimMlmState);
+ palFreeMemory(pMac->hHdd, pBeacon);
return;
}
@@ -259,7 +278,7 @@
|| !pMac->lim.gpLimMlmScanReq->p2pSearch )
#endif
{
- limCheckAndAddBssDescription(pMac, &beacon, pRxPacketInfo, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
+ limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_FALSE);
}
}
else if (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE)
@@ -270,12 +289,13 @@
* uncommented. Also when we tested enabling this, there is a crash as soon as the station
* comes up which needs to be fixed*/
//if (pMac->lim.gLimSystemRole == eLIM_STA_ROLE)
- // limCheckAndAddBssDescription(pMac, &beacon, pRxPacketInfo, eANI_BOOLEAN_TRUE);
- limCollectMeasurementData(pMac, pRxPacketInfo, &beacon);
+ // limCheckAndAddBssDescription(pMac, pBeacon, pRxPacketInfo, eANI_BOOLEAN_TRUE);
+ limCollectMeasurementData(pMac, pRxPacketInfo, pBeacon);
limLog(pMac, LOG3, FL("Parsed WDS info in Beacon frames: wdsLength=%d\n"),
- beacon.propIEinfo.wdsLength);
+ pBeacon->propIEinfo.wdsLength);
#endif
} // end of eLIM_MLM_LEARN_STATE)
+ palFreeMemory(pMac->hHdd, pBeacon);
} // end of (eLIM_MLM_WT_PROBE_RESP_STATE) || (eLIM_MLM_PASSIVE_SCAN_STATE)
else
{
diff --git a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
index 0e82c0d..4c33113 100644
--- a/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
+++ b/CORE/MAC/src/pe/lim/limProcessCfgUpdates.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
index 79cfe66..ca5186a 100644
--- a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index ff1697a..17eb32a 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c b/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
index b95251e..0ec72ee 100644
--- a/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessLmmMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
index 1639fdb..23c75a4 100644
--- a/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
+++ b/CORE/MAC/src/pe/lim/limProcessMessageQueue.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 91e6898..00d5d34 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1184,8 +1184,9 @@
{
for(i=0;i<pMac->lim.maxBssId;i++)
{
- if((pMac->lim.gpSession[i].valid == TRUE) &&
- (eLIM_MLM_LINK_ESTABLISHED_STATE == pMac->lim.gpSession[i].limMlmState))
+ if((peFindSessionBySessionId(pMac,i) != NULL) &&
+ (pMac->lim.gpSession[i].valid == TRUE) &&
+ (eLIM_MLM_LINK_ESTABLISHED_STATE == pMac->lim.gpSession[i].limMlmState))
{
limReactivateHeartBeatTimer(pMac, peFindSessionBySessionId(pMac,i));
}
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
index f3256a8..514f373 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmRspMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
index 48f839c..d1c22e4 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeReqFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
index 3d63939..fdd976a 100644
--- a/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessProbeRspFrame.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -85,16 +85,23 @@
tANI_U32 frameLen = 0;
tSirMacAddr currentBssId;
tpSirMacMgmtHdr pHdr;
- tSirProbeRespBeacon probeRsp;
+ tSirProbeRespBeacon *pProbeRsp;
tANI_U8 qosEnabled = false;
tANI_U8 wmeEnabled = false;
- probeRsp.ssId.length = 0;
- probeRsp.wpa.length = 0;
- probeRsp.propIEinfo.apName.length = 0;
+ if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
+ (void **)&pProbeRsp, sizeof(tSirProbeRespBeacon)))
+ {
+ limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessProbeRspFrame\n") );
+ return;
+ }
+
+ pProbeRsp->ssId.length = 0;
+ pProbeRsp->wpa.length = 0;
+ pProbeRsp->propIEinfo.apName.length = 0;
#if (WNI_POLARIS_FW_PACKAGE == ADVANCED)
- probeRsp.propIEinfo.aniIndicator = 0;
- probeRsp.propIEinfo.wdsLength = 0;
+ pProbeRsp->propIEinfo.aniIndicator = 0;
+ pProbeRsp->propIEinfo.wdsLength = 0;
#endif
@@ -107,7 +114,10 @@
limPrintMacAddr(pMac, pHdr->sa, LOG2);)
if (limDeactivateMinChannelTimerDuringScan(pMac) != eSIR_SUCCESS)
- return;
+ {
+ palFreeMemory(pMac->hHdd, pProbeRsp);
+ return;
+ }
/**
@@ -140,18 +150,19 @@
// Get pointer to Probe Response frame body
pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
- if (sirConvertProbeFrame2Struct(pMac, pBody, frameLen, &probeRsp)
+ if (sirConvertProbeFrame2Struct(pMac, pBody, frameLen, pProbeRsp)
==eSIR_FAILURE)
{
PELOG1(limLog(pMac, LOG1,
FL("PArse error ProbeResponse, length=%d\n"),
frameLen);)
+ palFreeMemory(pMac->hHdd, pProbeRsp);
return;
}
//To Support BT-AMP
if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) || //mlm state check should be global - 18th oct
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE))
- limCheckAndAddBssDescription(pMac, &probeRsp, pRxPacketInfo,
+ limCheckAndAddBssDescription(pMac, pProbeRsp, pRxPacketInfo,
((pMac->lim.gLimHalScanState == eLIM_HAL_SCANNING_STATE) ? eANI_BOOLEAN_TRUE : eANI_BOOLEAN_FALSE), eANI_BOOLEAN_TRUE);
else if (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE) //mlm state check should be global - 18th oct
{
@@ -161,11 +172,11 @@
* uncommented. Also when we tested enabling this, there is a crash as soon as the station
* comes up which needs to be fixed*/
//if (pMac->lim.gLimSystemRole == eLIM_STA_ROLE)
- // limCheckAndAddBssDescription(pMac, &probeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE);
- limCollectMeasurementData(pMac, pRxPacketInfo, &probeRsp);
+ // limCheckAndAddBssDescription(pMac, pProbeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE);
+ limCollectMeasurementData(pMac, pRxPacketInfo, pProbeRsp);
PELOG3(limLog(pMac, LOG3,
FL("Parsed WDS info in ProbeRsp frames: wdsLength=%d\n"),
- probeRsp.propIEinfo.wdsLength);)
+ pProbeRsp->propIEinfo.wdsLength);)
#endif
}
else if (psessionEntry->limMlmState ==
@@ -193,7 +204,7 @@
}
// STA in WT_JOIN_BEACON_STATE
- limCheckAndAnnounceJoinSuccess(pMac, &probeRsp, pHdr,psessionEntry);
+ limCheckAndAnnounceJoinSuccess(pMac, pProbeRsp, pHdr, psessionEntry);
}
else if(psessionEntry->limMlmState == eLIM_MLM_LINK_ESTABLISHED_STATE)
{
@@ -216,26 +227,29 @@
sirCopyMacAddr(currentBssId,psessionEntry->bssId);
if ( !palEqualMemory( pMac->hHdd,currentBssId, pHdr->bssId, sizeof(tSirMacAddr)) )
+ {
+ palFreeMemory(pMac->hHdd, pProbeRsp);
return;
+ }
if (!LIM_IS_CONNECTION_ACTIVE(psessionEntry))
{
limLog(pMac, LOGW,
FL("Received Probe Resp from AP. So it is alive!!\n"));
- if (probeRsp.HTInfo.present)
- limReceivedHBHandler(pMac, (tANI_U8)probeRsp.HTInfo.primaryChannel, psessionEntry);
+ if (pProbeRsp->HTInfo.present)
+ limReceivedHBHandler(pMac, (tANI_U8)pProbeRsp->HTInfo.primaryChannel, psessionEntry);
else
- limReceivedHBHandler(pMac, (tANI_U8)probeRsp.channelNumber, psessionEntry);
+ limReceivedHBHandler(pMac, (tANI_U8)pProbeRsp->channelNumber, psessionEntry);
}
#if defined ANI_PRODUCT_TYPE_CLIENT || defined (ANI_AP_CLIENT_SDK)
if (psessionEntry->limSystemRole == eLIM_STA_ROLE)
{
- if (probeRsp.quietIEPresent)
+ if (pProbeRsp->quietIEPresent)
{
- limUpdateQuietIEFromBeacon(pMac, &(probeRsp.quietIE), psessionEntry);
+ limUpdateQuietIEFromBeacon(pMac, &(pProbeRsp->quietIE), psessionEntry);
}
else if ((psessionEntry->gLimSpecMgmt.quietState == eLIM_QUIET_BEGIN) ||
(psessionEntry->gLimSpecMgmt.quietState == eLIM_QUIET_RUNNING))
@@ -244,10 +258,10 @@
limCancelDot11hQuiet(pMac, psessionEntry);
}
- if (probeRsp.channelSwitchPresent ||
- probeRsp.propIEinfo.propChannelSwitchPresent)
+ if (pProbeRsp->channelSwitchPresent ||
+ pProbeRsp->propIEinfo.propChannelSwitchPresent)
{
- limUpdateChannelSwitch(pMac, &probeRsp, psessionEntry);
+ limUpdateChannelSwitch(pMac, pProbeRsp, psessionEntry);
}
else if (psessionEntry->gLimSpecMgmt.dot11hChanSwState == eLIM_11H_CHANSW_RUNNING)
{
@@ -271,13 +285,13 @@
limGetWmeMode(psessionEntry, &wmeEnabled);
PELOG2(limLog(pMac, LOG2,
FL("wmeEdcaPresent: %d wmeEnabled: %d, edcaPresent: %d, qosEnabled: %d, edcaParams.qosInfo.count: %d schObject.gLimEdcaParamSetCount: %d\n"),
- probeRsp.wmeEdcaPresent, wmeEnabled, probeRsp.edcaPresent, qosEnabled,
- probeRsp.edcaParams.qosInfo.count, psessionEntry->gLimEdcaParamSetCount);)
- if (((probeRsp.wmeEdcaPresent && wmeEnabled) ||
- (probeRsp.edcaPresent && qosEnabled)) &&
- (probeRsp.edcaParams.qosInfo.count != psessionEntry->gLimEdcaParamSetCount))
+ pProbeRsp->wmeEdcaPresent, wmeEnabled, pProbeRsp->edcaPresent, qosEnabled,
+ pProbeRsp->edcaParams.qosInfo.count, psessionEntry->gLimEdcaParamSetCount);)
+ if (((pProbeRsp->wmeEdcaPresent && wmeEnabled) ||
+ (pProbeRsp->edcaPresent && qosEnabled)) &&
+ (pProbeRsp->edcaParams.qosInfo.count != psessionEntry->gLimEdcaParamSetCount))
{
- if (schBeaconEdcaProcess(pMac, &probeRsp.edcaParams, psessionEntry) != eSIR_SUCCESS)
+ if (schBeaconEdcaProcess(pMac, &pProbeRsp->edcaParams, psessionEntry) != eSIR_SUCCESS)
PELOGE(limLog(pMac, LOGE, FL("EDCA parameter processing error\n"));)
else if (pStaDs != NULL)
{
@@ -296,9 +310,10 @@
}
else if ((psessionEntry->limSystemRole == eLIM_STA_IN_IBSS_ROLE) &&
(psessionEntry->limMlmState == eLIM_MLM_BSS_STARTED_STATE))
- limHandleIBSScoalescing(pMac, &probeRsp, pRxPacketInfo,psessionEntry);
+ limHandleIBSScoalescing(pMac, pProbeRsp, pRxPacketInfo,psessionEntry);
} // if ((pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) || ...
+ palFreeMemory(pMac->hHdd, pProbeRsp);
// Ignore Probe Response frame in all other states
return;
} /*** end limProcessProbeRspFrame() ***/
@@ -310,14 +325,21 @@
tANI_U8 *pBody;
tANI_U32 frameLen = 0;
tpSirMacMgmtHdr pHdr;
- tSirProbeRespBeacon probeRsp;
+ tSirProbeRespBeacon *pProbeRsp;
- probeRsp.ssId.length = 0;
- probeRsp.wpa.length = 0;
- probeRsp.propIEinfo.apName.length = 0;
+ if(eHAL_STATUS_SUCCESS != palAllocateMemory(pMac->hHdd,
+ (void **)&pProbeRsp, sizeof(tSirProbeRespBeacon)))
+ {
+ limLog(pMac, LOGE, FL("Unable to PAL allocate memory in limProcessProbeRspFrameNoSession\n") );
+ return;
+ }
+
+ pProbeRsp->ssId.length = 0;
+ pProbeRsp->wpa.length = 0;
+ pProbeRsp->propIEinfo.apName.length = 0;
#if (WNI_POLARIS_FW_PACKAGE == ADVANCED)
- probeRsp.propIEinfo.aniIndicator = 0;
- probeRsp.propIEinfo.wdsLength = 0;
+ pProbeRsp->propIEinfo.aniIndicator = 0;
+ pProbeRsp->propIEinfo.wdsLength = 0;
#endif
@@ -330,7 +352,10 @@
limPrintMacAddr(pMac, pHdr->sa, LOG2);
if (limDeactivateMinChannelTimerDuringScan(pMac) != eSIR_SUCCESS)
+ {
+ palFreeMemory(pMac->hHdd, pProbeRsp);
return;
+ }
/* Since there is no psessionEntry, PE cannot be in the following states:
* - eLIM_MLM_WT_JOIN_BEACON_STATE
@@ -350,15 +375,16 @@
// Get pointer to Probe Response frame body
pBody = WDA_GET_RX_MPDU_DATA(pRxPacketInfo);
- if (sirConvertProbeFrame2Struct(pMac, pBody, frameLen, &probeRsp) == eSIR_FAILURE)
+ if (sirConvertProbeFrame2Struct(pMac, pBody, frameLen, pProbeRsp) == eSIR_FAILURE)
{
limLog(pMac, LOG1, FL("Parse error ProbeResponse, length=%d\n"), frameLen);
+ palFreeMemory(pMac->hHdd, pProbeRsp);
return;
}
if( (pMac->lim.gLimMlmState == eLIM_MLM_WT_PROBE_RESP_STATE) ||
(pMac->lim.gLimMlmState == eLIM_MLM_PASSIVE_SCAN_STATE) )
- limCheckAndAddBssDescription(pMac, &probeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
+ limCheckAndAddBssDescription(pMac, pProbeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE, eANI_BOOLEAN_TRUE);
else if (pMac->lim.gLimMlmState == eLIM_MLM_LEARN_STATE)
{
#if defined(ANI_PRODUCT_TYPE_AP) && (WNI_POLARIS_FW_PACKAGE == ADVANCED)
@@ -367,13 +393,14 @@
* uncommented. Also when we tested enabling this, there is a crash as soon as the station
* comes up which needs to be fixed*/
//if (pMac->lim.gLimSystemRole == eLIM_STA_ROLE)
- // limCheckAndAddBssDescription(pMac, &probeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE);
- limCollectMeasurementData(pMac, pRxPacketInfo, &probeRsp);
+ // limCheckAndAddBssDescription(pMac, pProbeRsp, pRxPacketInfo, eANI_BOOLEAN_TRUE);
+ limCollectMeasurementData(pMac, pRxPacketInfo, pProbeRsp);
limLog(pMac, LOG3,
FL("Parsed WDS info in ProbeRsp frames: wdsLength=%d\n"),
- probeRsp.propIEinfo.wdsLength);
+ pProbeRsp->propIEinfo.wdsLength);
#endif
}
}
+ palFreeMemory(pMac->hHdd, pProbeRsp);
return;
} /*** end limProcessProbeRspFrameNew() ***/
diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
index 9c8fd60..7dab059 100644
--- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1186,7 +1186,8 @@
{
for(i=0;i<pMac->lim.maxBssId;i++)
{
- if((pMac->lim.gpSession[i].valid == TRUE) &&
+ if((peFindSessionBySessionId(pMac,i) != NULL) &&
+ (pMac->lim.gpSession[i].valid == TRUE) &&
(eLIM_MLM_LINK_ESTABLISHED_STATE == pMac->lim.gpSession[i].limMlmState))
{
limHeartBeatDeactivateAndChangeTimer(pMac, peFindSessionBySessionId(pMac,i));
@@ -1529,7 +1530,7 @@
psessionEntry->nwType = pSmeJoinReq->bssDescription.nwType;
#ifdef WLAN_FEATURE_11AC
psessionEntry->vhtCapability = IS_DOT11_MODE_VHT(psessionEntry->dot11mode);
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_FATAL,
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED,
"***__limProcessSmeJoinReq: vhtCapability=%d****\n",psessionEntry->vhtCapability);
#endif
diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.c b/CORE/MAC/src/pe/lim/limPropExtsUtils.c
index 2419782..a990d00 100644
--- a/CORE/MAC/src/pe/lim/limPropExtsUtils.c
+++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -139,7 +139,7 @@
pMac->lim.htCapabilityPresentInBeacon = 0;
#ifdef WLAN_FEATURE_11AC
- VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_FATAL,
+ VOS_TRACE(VOS_MODULE_ID_PE, VOS_TRACE_LEVEL_INFO_MED,
"***beacon.VHTCaps.present*****=%d\n",beaconStruct.VHTCaps.present);
if ( beaconStruct.VHTCaps.present && beaconStruct.VHTOperation.present)
diff --git a/CORE/MAC/src/pe/lim/limPropExtsUtils.h b/CORE/MAC/src/pe/lim/limPropExtsUtils.h
index 4294424..274294b 100644
--- a/CORE/MAC/src/pe/lim/limPropExtsUtils.h
+++ b/CORE/MAC/src/pe/lim/limPropExtsUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limRoamingAlgo.c b/CORE/MAC/src/pe/lim/limRoamingAlgo.c
index a77140a..94b7d7f 100644
--- a/CORE/MAC/src/pe/lim/limRoamingAlgo.c
+++ b/CORE/MAC/src/pe/lim/limRoamingAlgo.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.c b/CORE/MAC/src/pe/lim/limScanResultUtils.c
index ee76b57..511c1f1 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.c
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limScanResultUtils.h b/CORE/MAC/src/pe/lim/limScanResultUtils.h
index 0913ea6..cbb08cd 100644
--- a/CORE/MAC/src/pe/lim/limScanResultUtils.h
+++ b/CORE/MAC/src/pe/lim/limScanResultUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.c b/CORE/MAC/src/pe/lim/limSecurityUtils.c
index d7385ed..994fcf2 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.c
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSecurityUtils.h b/CORE/MAC/src/pe/lim/limSecurityUtils.h
index da1e908..d7a4238 100644
--- a/CORE/MAC/src/pe/lim/limSecurityUtils.h
+++ b/CORE/MAC/src/pe/lim/limSecurityUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index 4c50af6..3366b21 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSendMessages.c b/CORE/MAC/src/pe/lim/limSendMessages.c
index 7dff6e0..8596da6 100644
--- a/CORE/MAC/src/pe/lim/limSendMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSendMessages.h b/CORE/MAC/src/pe/lim/limSendMessages.h
index 71b07ed..4b402f5 100644
--- a/CORE/MAC/src/pe/lim/limSendMessages.h
+++ b/CORE/MAC/src/pe/lim/limSendMessages.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
index 1ceed6b..d7050dd 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -409,23 +409,22 @@
if(IS_MCC_SUPPORTED && limIsLinkSuspended( pMac ) )
{
- ePhyChanBondState htSecondaryChannelOffset;
if( psessionEntry && psessionEntry->limSmeState == eLIM_SME_LINK_EST_STATE )
{
#ifdef WLAN_FEATURE_11AC
if (psessionEntry->vhtCapability)
{
+ ePhyChanBondState htSecondaryChannelOffset;
/*Get 11ac cbState from 11n cbState*/
htSecondaryChannelOffset = limGet11ACPhyCBState(pMac,
psessionEntry->currentOperChannel,
psessionEntry->htSecondaryChannelOffset);
peSetResumeChannel( pMac, psessionEntry->currentOperChannel, htSecondaryChannelOffset);
}
- else {
+ else
#endif
- peSetResumeChannel( pMac, psessionEntry->currentOperChannel, psessionEntry->htSecondaryChannelOffset);
- }
+ peSetResumeChannel( pMac, psessionEntry->currentOperChannel, psessionEntry->htSecondaryChannelOffset);
}
else
{
diff --git a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
index 8554d9b..b777e38 100644
--- a/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
+++ b/CORE/MAC/src/pe/lim/limSendSmeRspMessages.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.c b/CORE/MAC/src/pe/lim/limSerDesUtils.c
index f9df7ec..a626965 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.c
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSerDesUtils.h b/CORE/MAC/src/pe/lim/limSerDesUtils.h
index 6de920b..a660b23 100644
--- a/CORE/MAC/src/pe/lim/limSerDesUtils.h
+++ b/CORE/MAC/src/pe/lim/limSerDesUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSession.c b/CORE/MAC/src/pe/lim/limSession.c
index 6348bf8..a4c5c2a 100644
--- a/CORE/MAC/src/pe/lim/limSession.c
+++ b/CORE/MAC/src/pe/lim/limSession.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSessionUtils.c b/CORE/MAC/src/pe/lim/limSessionUtils.c
index bc53e77..e193ed9 100644
--- a/CORE/MAC/src/pe/lim/limSessionUtils.c
+++ b/CORE/MAC/src/pe/lim/limSessionUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSessionUtils.h b/CORE/MAC/src/pe/lim/limSessionUtils.h
index 47484b0..df72a90 100644
--- a/CORE/MAC/src/pe/lim/limSessionUtils.h
+++ b/CORE/MAC/src/pe/lim/limSessionUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSmeReqUtils.c b/CORE/MAC/src/pe/lim/limSmeReqUtils.c
index 653a76d..679ef12 100644
--- a/CORE/MAC/src/pe/lim/limSmeReqUtils.c
+++ b/CORE/MAC/src/pe/lim/limSmeReqUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limSmeReqUtils.h b/CORE/MAC/src/pe/lim/limSmeReqUtils.h
index 91edf54..7cfebd6 100644
--- a/CORE/MAC/src/pe/lim/limSmeReqUtils.h
+++ b/CORE/MAC/src/pe/lim/limSmeReqUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limStaHashApi.c b/CORE/MAC/src/pe/lim/limStaHashApi.c
index 27a4078..017a9af 100644
--- a/CORE/MAC/src/pe/lim/limStaHashApi.c
+++ b/CORE/MAC/src/pe/lim/limStaHashApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limStaHashApi.h b/CORE/MAC/src/pe/lim/limStaHashApi.h
index 9b9a6be..03a5495 100644
--- a/CORE/MAC/src/pe/lim/limStaHashApi.h
+++ b/CORE/MAC/src/pe/lim/limStaHashApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.c b/CORE/MAC/src/pe/lim/limTimerUtils.c
index e2003cf..a219f1e 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.c
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limTimerUtils.h b/CORE/MAC/src/pe/lim/limTimerUtils.h
index 1719977..176d857 100644
--- a/CORE/MAC/src/pe/lim/limTimerUtils.h
+++ b/CORE/MAC/src/pe/lim/limTimerUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limTrace.c b/CORE/MAC/src/pe/lim/limTrace.c
index 8e13a02..b15f7ce 100644
--- a/CORE/MAC/src/pe/lim/limTrace.c
+++ b/CORE/MAC/src/pe/lim/limTrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limTypes.h b/CORE/MAC/src/pe/lim/limTypes.h
index 3f08943..388e7d7 100644
--- a/CORE/MAC/src/pe/lim/limTypes.h
+++ b/CORE/MAC/src/pe/lim/limTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c
index d0f8d04..7120bcf 100644
--- a/CORE/MAC/src/pe/lim/limUtils.c
+++ b/CORE/MAC/src/pe/lim/limUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/lim/limUtils.h b/CORE/MAC/src/pe/lim/limUtils.h
index c8dd8bd..3f1687d 100644
--- a/CORE/MAC/src/pe/lim/limUtils.h
+++ b/CORE/MAC/src/pe/lim/limUtils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/pmm/pmmAP.c b/CORE/MAC/src/pe/pmm/pmmAP.c
index 8117d24..3008627 100644
--- a/CORE/MAC/src/pe/pmm/pmmAP.c
+++ b/CORE/MAC/src/pe/pmm/pmmAP.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/pmm/pmmApi.c b/CORE/MAC/src/pe/pmm/pmmApi.c
index 79a4d12..1eeed18 100644
--- a/CORE/MAC/src/pe/pmm/pmmApi.c
+++ b/CORE/MAC/src/pe/pmm/pmmApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1963,7 +1963,7 @@
PELOGE(pmmLog(pMac, LOGE,
FL("pmmUapsd: Waking up from UAPSD mode failed, Ret Code: %d, Next State: %d\n"),
retStatus, pMac->pmm.gPmmState);)
- limSendSmeRsp(pMac, eWNI_PMC_EXIT_IMPS_RSP, resultCode, 0, 0);
+ limSendSmeRsp(pMac, eWNI_PMC_EXIT_UAPSD_RSP, resultCode, 0, 0);
}
diff --git a/CORE/MAC/src/pe/pmm/pmmDebug.c b/CORE/MAC/src/pe/pmm/pmmDebug.c
index 5169eb5..ef4da26 100644
--- a/CORE/MAC/src/pe/pmm/pmmDebug.c
+++ b/CORE/MAC/src/pe/pmm/pmmDebug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/pmm/pmmDebug.h b/CORE/MAC/src/pe/pmm/pmmDebug.h
index 1f9be6a..5924664 100644
--- a/CORE/MAC/src/pe/pmm/pmmDebug.h
+++ b/CORE/MAC/src/pe/pmm/pmmDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/rrm/rrmApi.c b/CORE/MAC/src/pe/rrm/rrmApi.c
index 5ac52ba..eca163f 100644
--- a/CORE/MAC/src/pe/rrm/rrmApi.c
+++ b/CORE/MAC/src/pe/rrm/rrmApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schApi.c b/CORE/MAC/src/pe/sch/schApi.c
index fa85478..82d378a 100644
--- a/CORE/MAC/src/pe/sch/schApi.c
+++ b/CORE/MAC/src/pe/sch/schApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schBeaconGen.c b/CORE/MAC/src/pe/sch/schBeaconGen.c
index 0921d00..77858e6 100644
--- a/CORE/MAC/src/pe/sch/schBeaconGen.c
+++ b/CORE/MAC/src/pe/sch/schBeaconGen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schBeaconProcess.c b/CORE/MAC/src/pe/sch/schBeaconProcess.c
index 1157847..3997d95 100644
--- a/CORE/MAC/src/pe/sch/schBeaconProcess.c
+++ b/CORE/MAC/src/pe/sch/schBeaconProcess.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schDebug.c b/CORE/MAC/src/pe/sch/schDebug.c
index c6b3473..ae59a43 100644
--- a/CORE/MAC/src/pe/sch/schDebug.c
+++ b/CORE/MAC/src/pe/sch/schDebug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schDebug.h b/CORE/MAC/src/pe/sch/schDebug.h
index 6cd523e..f08ab1d 100644
--- a/CORE/MAC/src/pe/sch/schDebug.h
+++ b/CORE/MAC/src/pe/sch/schDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schMessage.c b/CORE/MAC/src/pe/sch/schMessage.c
index 58bb1b0..6803f4c 100644
--- a/CORE/MAC/src/pe/sch/schMessage.c
+++ b/CORE/MAC/src/pe/sch/schMessage.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/MAC/src/pe/sch/schSysParams.h b/CORE/MAC/src/pe/sch/schSysParams.h
index 18da485..f577d73 100644
--- a/CORE/MAC/src/pe/sch/schSysParams.h
+++ b/CORE/MAC/src/pe/sch/schSysParams.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/inc/sapApi.h b/CORE/SAP/inc/sapApi.h
index 5ecc24b..6b7bd29a 100644
--- a/CORE/SAP/inc/sapApi.h
+++ b/CORE/SAP/inc/sapApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index e57d493..cb19212 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 33c109d..9d4a012 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapChSelect.h b/CORE/SAP/src/sapChSelect.h
index af0ad75..0721d39 100644
--- a/CORE/SAP/src/sapChSelect.h
+++ b/CORE/SAP/src/sapChSelect.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index 9f0aecf..d4490df 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapFsm_ext.h b/CORE/SAP/src/sapFsm_ext.h
index ca0b9f3..6f2603b 100644
--- a/CORE/SAP/src/sapFsm_ext.h
+++ b/CORE/SAP/src/sapFsm_ext.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapInternal.h b/CORE/SAP/src/sapInternal.h
index a148656..f4068ad 100644
--- a/CORE/SAP/src/sapInternal.h
+++ b/CORE/SAP/src/sapInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index 0210cdb..686722a 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/btcApi.h b/CORE/SME/inc/btcApi.h
index 9cd2466..44fa1f7 100644
--- a/CORE/SME/inc/btcApi.h
+++ b/CORE/SME/inc/btcApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -110,6 +110,21 @@
#define BT_MAX_NUM_EVENT_ACL_DEFERRED 4 //We may need to defer these many BT events for ACL
#define BT_MAX_NUM_EVENT_SCO_DEFERRED 4 //We may need to defer these many BT events for SYNC
+/** Default values for the BTC tunables parameters
+*/
+#define BTC_STATIC_BT_LEN_INQ_DEF (120000) // 120 msec
+#define BTC_STATIC_BT_LEN_PAGE_DEF (10000) // 10 msec (don't care)
+#define BTC_STATIC_BT_LEN_CONN_DEF (10000) // 10 msec (don't care)
+#define BTC_STATIC_BT_LEN_LE_DEF (10000) // 10 msec (don't care)
+#define BTC_STATIC_WLAN_LEN_INQ_DEF (30000) // 30 msec
+#define BTC_STATIC_WLAN_LEN_PAGE_DEF (0) // 0 msec (BT takes all)
+#define BTC_STATIC_WLAN_LEN_CONN_DEF (0) // 0 msec (BT takes all)
+#define BTC_STATIC_WLAN_LEN_LE_DEF (0) // 0 msec (BT takes all)
+#define BTC_DYNAMIC_BT_LEN_MAX_DEF (250000) // 250 msec
+#define BTC_DYNAMIC_WLAN_LEN_MAX_DEF (45000) // 45 msec
+#define BTC_SCO_BLOCK_PERC_DEF (1) // 1 percent
+#define BTC_DHCP_ON_A2DP_DEF (1) // ON
+#define BTC_DHCP_ON_SCO_DEF (0) // OFF
/** Enumeration of all the different kinds of BT events
*/
@@ -243,6 +258,19 @@
v_U8_t btcBtIntervalMode1;
v_U8_t btcWlanIntervalMode1;
+ v_U32_t btcStaticLenInqBt;
+ v_U32_t btcStaticLenPageBt;
+ v_U32_t btcStaticLenConnBt;
+ v_U32_t btcStaticLenLeBt;
+ v_U32_t btcStaticLenInqWlan;
+ v_U32_t btcStaticLenPageWlan;
+ v_U32_t btcStaticLenConnWlan;
+ v_U32_t btcStaticLenLeWlan;
+ v_U32_t btcDynMaxLenBt;
+ v_U32_t btcDynMaxLenWlan;
+ v_U32_t btcMaxScoBlockPerc;
+ v_U32_t btcDhcpProtOnA2dp;
+ v_U32_t btcDhcpProtOnSco;
} tSmeBtcConfig, *tpSmeBtcConfig;
diff --git a/CORE/SME/inc/ccmApi.h b/CORE/SME/inc/ccmApi.h
index 5195459..ef08028 100644
--- a/CORE/SME/inc/ccmApi.h
+++ b/CORE/SME/inc/ccmApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/csrApi.h b/CORE/SME/inc/csrApi.h
index b8391ed..34dc3aa 100644
--- a/CORE/SME/inc/csrApi.h
+++ b/CORE/SME/inc/csrApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/csrInternal.h b/CORE/SME/inc/csrInternal.h
index 8d9b406..122f02e 100644
--- a/CORE/SME/inc/csrInternal.h
+++ b/CORE/SME/inc/csrInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/csrLinkList.h b/CORE/SME/inc/csrLinkList.h
index 569ca14..bc88449 100644
--- a/CORE/SME/inc/csrLinkList.h
+++ b/CORE/SME/inc/csrLinkList.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/csrNeighborRoam.h b/CORE/SME/inc/csrNeighborRoam.h
index 0eef2b8..d95b299 100644
--- a/CORE/SME/inc/csrNeighborRoam.h
+++ b/CORE/SME/inc/csrNeighborRoam.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/csrSupport.h b/CORE/SME/inc/csrSupport.h
index 3a2368e..e4fa512 100644
--- a/CORE/SME/inc/csrSupport.h
+++ b/CORE/SME/inc/csrSupport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/oemDataApi.h b/CORE/SME/inc/oemDataApi.h
index 0c665db..aeb01ce 100644
--- a/CORE/SME/inc/oemDataApi.h
+++ b/CORE/SME/inc/oemDataApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/oemDataInternal.h b/CORE/SME/inc/oemDataInternal.h
index 82c9197..f7b9cc8 100644
--- a/CORE/SME/inc/oemDataInternal.h
+++ b/CORE/SME/inc/oemDataInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/p2p_Api.h b/CORE/SME/inc/p2p_Api.h
index 47449bc..ffe7755 100644
--- a/CORE/SME/inc/p2p_Api.h
+++ b/CORE/SME/inc/p2p_Api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/pmc.h b/CORE/SME/inc/pmc.h
index e2e3c7f..033a6a6 100644
--- a/CORE/SME/inc/pmc.h
+++ b/CORE/SME/inc/pmc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/pmcApi.h b/CORE/SME/inc/pmcApi.h
index fc01a98..185cc3c 100644
--- a/CORE/SME/inc/pmcApi.h
+++ b/CORE/SME/inc/pmcApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/smeInside.h b/CORE/SME/inc/smeInside.h
index c89f4eb..1c2b361 100644
--- a/CORE/SME/inc/smeInside.h
+++ b/CORE/SME/inc/smeInside.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/smeInternal.h b/CORE/SME/inc/smeInternal.h
index 2494651..fe54444 100644
--- a/CORE/SME/inc/smeInternal.h
+++ b/CORE/SME/inc/smeInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/smeQosInternal.h b/CORE/SME/inc/smeQosInternal.h
index f318af1..54276c4 100644
--- a/CORE/SME/inc/smeQosInternal.h
+++ b/CORE/SME/inc/smeQosInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/smeRrmInternal.h b/CORE/SME/inc/smeRrmInternal.h
index 072a5e0..21398b8 100644
--- a/CORE/SME/inc/smeRrmInternal.h
+++ b/CORE/SME/inc/smeRrmInternal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h
index 8ccdf97..da8e6d8 100644
--- a/CORE/SME/inc/sme_Api.h
+++ b/CORE/SME/inc/sme_Api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/sme_FTApi.h b/CORE/SME/inc/sme_FTApi.h
index 30465c6..314069b 100644
--- a/CORE/SME/inc/sme_FTApi.h
+++ b/CORE/SME/inc/sme_FTApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/sme_QosApi.h b/CORE/SME/inc/sme_QosApi.h
index d6614fd..f7b8dba 100644
--- a/CORE/SME/inc/sme_QosApi.h
+++ b/CORE/SME/inc/sme_QosApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/sme_RrmApi.h b/CORE/SME/inc/sme_RrmApi.h
index 9b105b2..530e83e 100644
--- a/CORE/SME/inc/sme_RrmApi.h
+++ b/CORE/SME/inc/sme_RrmApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/smsDebug.h b/CORE/SME/inc/smsDebug.h
index 9d91493..d2984e1 100644
--- a/CORE/SME/inc/smsDebug.h
+++ b/CORE/SME/inc/smsDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/inc/wlan_ps_wow_diag.h b/CORE/SME/inc/wlan_ps_wow_diag.h
index 0291923..8195fc0 100644
--- a/CORE/SME/inc/wlan_ps_wow_diag.h
+++ b/CORE/SME/inc/wlan_ps_wow_diag.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c
index a3a2091..f80f29d 100644
--- a/CORE/SME/src/QoS/sme_Qos.c
+++ b/CORE/SME/src/QoS/sme_Qos.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/btc/btcApi.c b/CORE/SME/src/btc/btcApi.c
index 36d1fbe..d92e03c 100644
--- a/CORE/SME/src/btc/btcApi.c
+++ b/CORE/SME/src/btc/btcApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -70,6 +70,21 @@
pMac->btc.btcConfig.btcBtIntervalMode1 = BTC_BT_INTERVAL_MODE1_DEFAULT;
pMac->btc.btcConfig.btcWlanIntervalMode1 = BTC_WLAN_INTERVAL_MODE1_DEFAULT;
pMac->btc.btcConfig.btcActionOnPmFail = BTC_START_NEXT;
+
+ pMac->btc.btcConfig.btcStaticLenInqBt = BTC_STATIC_BT_LEN_INQ_DEF;
+ pMac->btc.btcConfig.btcStaticLenPageBt = BTC_STATIC_BT_LEN_PAGE_DEF;
+ pMac->btc.btcConfig.btcStaticLenConnBt = BTC_STATIC_BT_LEN_CONN_DEF;
+ pMac->btc.btcConfig.btcStaticLenLeBt = BTC_STATIC_BT_LEN_LE_DEF;
+ pMac->btc.btcConfig.btcStaticLenInqWlan = BTC_STATIC_WLAN_LEN_INQ_DEF;
+ pMac->btc.btcConfig.btcStaticLenPageWlan = BTC_STATIC_WLAN_LEN_PAGE_DEF;
+ pMac->btc.btcConfig.btcStaticLenConnWlan = BTC_STATIC_WLAN_LEN_CONN_DEF;
+ pMac->btc.btcConfig.btcStaticLenLeWlan = BTC_STATIC_WLAN_LEN_LE_DEF;
+ pMac->btc.btcConfig.btcDynMaxLenBt = BTC_DYNAMIC_BT_LEN_MAX_DEF;
+ pMac->btc.btcConfig.btcDynMaxLenWlan = BTC_DYNAMIC_WLAN_LEN_MAX_DEF;
+ pMac->btc.btcConfig.btcMaxScoBlockPerc = BTC_SCO_BLOCK_PERC_DEF;
+ pMac->btc.btcConfig.btcDhcpProtOnA2dp = BTC_DHCP_ON_A2DP_DEF;
+ pMac->btc.btcConfig.btcDhcpProtOnSco = BTC_DHCP_ON_SCO_DEF;
+
pMac->btc.btcReady = VOS_FALSE;
pMac->btc.btcEventState = 0;
pMac->btc.btcHBActive = VOS_TRUE;
diff --git a/CORE/SME/src/ccm/ccmApi.c b/CORE/SME/src/ccm/ccmApi.c
index ac50aff..005183e 100644
--- a/CORE/SME/src/ccm/ccmApi.c
+++ b/CORE/SME/src/ccm/ccmApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/ccm/ccmLogDump.c b/CORE/SME/src/ccm/ccmLogDump.c
index 975bf68..3d08f8c 100644
--- a/CORE/SME/src/ccm/ccmLogDump.c
+++ b/CORE/SME/src/ccm/ccmLogDump.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 3381d94..3d0d4a4 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -617,6 +617,12 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tANI_U32 size = 0;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
if(pProfile)
{
@@ -1909,6 +1915,12 @@
tCsrBssid bssId = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
tANI_U16 reasonCode;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
//Restore AC weight in case we change it
if ( csrIsConnStateConnectedInfra( pMac, sessionId ) )
@@ -2139,6 +2151,12 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrBssid bssId = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if (!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
if(pSession->pConnectBssDesc)
{
@@ -2159,6 +2177,12 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_U32 size;
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
// If no BSS description was found in this connection (happens with start IBSS), then
// nix the BSS description that we keep around for the connected BSS) and get out...
@@ -3195,6 +3219,13 @@
eHalStatus status;
tBssConfigParam *pBssConfig;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
status = palAllocateMemory(pMac->hHdd, (void **)&pBssConfig, sizeof(tBssConfigParam));
if(HAL_STATUS_SUCCESS(status))
{
@@ -3275,6 +3306,13 @@
tSirBssDescription *pBssDesc = &pScanResult->BssDescriptor;
tDot11fBeaconIEs *pIesLocal = (tDot11fBeaconIEs *)( pScanResult->pvIes ); //This may be NULL
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return (eCsrStopRoaming);
+ }
+
if( CSR_IS_WDS_STA( pProfile ) )
{
status = csrRoamStartWds( pMac, sessionId, pProfile, pBssDesc );
@@ -3429,7 +3467,13 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tCsrRoamProfile *pProfile = &pCommand->u.roamCmd.roamProfile;
tANI_U8 concurrentChannel = 0;
-
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return (eCsrStopRoaming);
+ }
+
do
{
// Check for Cardbus eject condition, before trying to Roam to any BSS
@@ -3762,6 +3806,13 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
sessionId = pCommand->sessionId;
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming)
{
//the roaming is cancelled. Simply complete the command
@@ -3792,6 +3843,12 @@
tCsrRoamInfo roamInfo;
tANI_U32 sessionId = pCommand->sessionId;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
switch ( pCommand->u.roamCmd.roamReason )
{
@@ -3976,6 +4033,11 @@
void csrResetPMKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId )
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
palZeroMemory( pMac->hHdd, &(pSession->PmkidCandidateInfo[0]), sizeof(tPmkidCandidateInfo) * CSR_MAX_PMKID_ALLOWED );
pSession->NumPmkidCandidate = 0;
}
@@ -3983,6 +4045,11 @@
void csrResetBKIDCandidateList( tpAniSirGlobal pMac, tANI_U32 sessionId )
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
palZeroMemory( pMac->hHdd, &(pSession->BkidCandidateInfo[0]), sizeof(tBkidCandidateInfo) * CSR_MAX_BKID_ALLOWED );
pSession->NumBkidCandidate = 0;
}
@@ -3996,6 +4063,13 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tDot11fBeaconIEs *pIesLocal = pIes;
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if((eCSR_AUTH_TYPE_WPA == authType) ||
(eCSR_AUTH_TYPE_WPA_PSK == authType) ||
(eCSR_AUTH_TYPE_RSN == authType) ||
@@ -4283,6 +4357,12 @@
tSirSmeStartBssRsp *pSmeStartBssRsp = NULL;
#endif
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eANI_BOOLEAN_FALSE;
+ }
+
smsLog( pMac, LOG1, FL("Processing ROAM results...\n"));
switch( Result )
{
@@ -5648,6 +5728,13 @@
tANI_U32 roamId;
tCsrRoamProfile *pProfile = NULL;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
do
{
if(pSession->pCurRoamProfile)
@@ -5927,6 +6014,13 @@
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
#ifdef FEATURE_WLAN_BTAMP_UT_RF
//Stop te retry
pSession->maxRetryCount = 0;
@@ -5948,6 +6042,13 @@
eHalStatus csrRoamDisconnect(tpAniSirGlobal pMac, tANI_U32 sessionId, eCsrRoamDisconnectReason reason)
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
csrRoamCancelRoaming(pMac, sessionId);
pSession->ibss_join_pending = FALSE;
csrRoamStopIbssJoinTimer(pMac, sessionId);
@@ -5964,6 +6065,12 @@
tANI_U8 index;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tCsrRoamConnectedProfile *pConnectProfile = &pSession->connectedProfile;
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
palZeroMemory(pMac->hHdd, &pSession->connectedProfile, sizeof(tCsrRoamConnectedProfile));
pConnectProfile->AuthType = pProfile->negotiatedAuthType;
@@ -6078,6 +6185,12 @@
{
tANI_U32 roamId = 0;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, pSmeJoinRsp->sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), pSmeJoinRsp->sessionId);
+ return;
+ }
+
//The head of the active list is the request we sent
//Try to get back the same profile and roam again
@@ -6166,6 +6279,13 @@
{
sessionId = pCommand->sessionId;
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if( pCommand->u.roamCmd.fStopWds )
{
palZeroMemory(pMac->hHdd, &roamInfo, sizeof(tCsrRoamInfo));
@@ -6375,6 +6495,13 @@
pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
sessionId = pCommand->sessionId;
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if(CSR_IS_ROAMING(pSession) && pSession->fCancelRoaming)
{
//the roaming is cancelled. Simply complete the command
@@ -6673,6 +6800,13 @@
pMac->roam.roamSession[sessionId].connectState = eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
}
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if ( CSR_IS_ROAM_SUBSTATE_DISASSOC_NO_JOIN( pMac, sessionId ) )
{
csrRoamComplete( pMac, eCsrNothingToJoin, NULL );
@@ -7011,6 +7145,13 @@
pUpperLayerAssocCnf = (tSirSmeAssocIndToUpperLayerCnf *)pMsgBuf;
status = csrRoamGetSessionIdFromBSSID( pMac, (tCsrBssid *)pUpperLayerAssocCnf->bssId, &sessionId );
pSession = CSR_GET_SESSION(pMac, sessionId);
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
pRoamInfo->statusCode = eSIR_SME_SUCCESS; //send the status code as Success
pRoamInfo->u.pConnectedProfile = &pSession->connectedProfile;
pRoamInfo->staId = (tANI_U8)pUpperLayerAssocCnf->aid;
@@ -7730,6 +7871,12 @@
{
pSession = CSR_GET_SESSION(pMac, sessionId);
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
pRoamInfo = &roamInfo;
// Required for indicating the frames to upper layer
@@ -7827,6 +7974,12 @@
#endif
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if ( csrIsConnStateInfra( pMac, sessionId ) )
{
pSession->connectState = eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
@@ -7885,6 +8038,12 @@
#endif
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if ( csrIsConnStateInfra( pMac, sessionId ) )
{
pSession->connectState = eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED;
@@ -7923,6 +8082,11 @@
if( HAL_STATUS_SUCCESS( status ) )
{
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
pSession->connectedProfile.operationChannel = (tANI_U8)pSwitchChnInd->newChannelId;
if(pSession->pConnectBssDesc)
{
@@ -7940,6 +8104,11 @@
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
pSession = CSR_GET_SESSION(pMac, sessionId);
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
{
pRoamInfo = &roamInfo;
@@ -7963,6 +8132,11 @@
if( CSR_IS_SESSION_VALID(pMac, sessionId) )
{
pSession = CSR_GET_SESSION(pMac, sessionId);
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
if ( CSR_IS_INFRA_AP(&pSession->connectedProfile) )
{
pRoamInfo = &roamInfo;
@@ -7984,6 +8158,11 @@
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
WLAN_VOS_DIAG_EVENT_DEF(secEvent, vos_event_wlan_security_payload_type);
palZeroMemory(pMac->hHdd, &secEvent, sizeof(vos_event_wlan_security_payload_type));
secEvent.eventId = WLAN_SECURITY_EVENT_MIC_ERROR;
@@ -8043,6 +8222,11 @@
if( CSR_SESSION_ID_INVALID != sessionId )
{
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
pSession->connectState = eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED;
if(pSession->pConnectBssDesc)
{
@@ -8063,6 +8247,11 @@
if( CSR_SESSION_ID_INVALID != sessionId )
{
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
pSession->connectState = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED;
result = eCSR_ROAM_RESULT_IBSS_INACTIVE;
roamStatus = eCSR_ROAM_CONNECT_STATUS_UPDATE;
@@ -8073,6 +8262,11 @@
if( CSR_SESSION_ID_INVALID != sessionId )
{
pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
// update the connection state information
pNewBss = &pStatusChangeMsg->statusChangeInfo.newBssInfo;
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
@@ -8167,6 +8361,12 @@
if( CSR_SESSION_ID_INVALID != sessionId )
{
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
// Issue the set Context request to LIM to establish the Unicast STA context for the new peer...
if(pSession->pConnectBssDesc)
{
@@ -8285,6 +8485,12 @@
{
sessionId = pCommand->sessionId;
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
if(eCSR_ENCRYPT_TYPE_NONE != pSession->connectedProfile.EncryptionType)
@@ -8397,6 +8603,12 @@
{
sessionId = pCommand->sessionId;
pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
{
WLAN_VOS_DIAG_EVENT_DEF(removeKeyEvent, vos_event_wlan_security_payload_type);
@@ -8577,6 +8789,13 @@
void csrRoamCancelRoaming(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if(CSR_IS_ROAMING(pSession))
{
smsLog(pMac, LOGW, " Cancelling roaming\n");
@@ -8604,6 +8823,12 @@
tpAniSirGlobal pMac = pInfo->pMac;
tANI_U32 sessionId = pInfo->sessionId;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
if(eANI_BOOLEAN_FALSE == pSession->fCancelRoaming)
{
@@ -8619,6 +8844,12 @@
{
eHalStatus status;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
smsLog(pMac, LOG1, " csrScanStartRoamingTimer \n ");
pSession->roamingTimerInfo.sessionId = (tANI_U8)sessionId;
@@ -8667,6 +8898,12 @@
eCsrRoamDisconnectReason reason = eCSR_DISCONNECT_REASON_IBSS_JOIN_FAILURE;
tANI_U32 sessionId = pInfo->sessionId;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
pSession->ibss_join_pending = FALSE;
// JEZ100225: As of main/latest "tip", we are no longer doing this. Check on this.
@@ -8678,6 +8915,12 @@
{
eHalStatus status;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
smsLog(pMac, LOG1, " csrRoamStartIbssJoinTimer \n ");
pSession->ibssJoinTimerInfo.sessionId = (tANI_U8)sessionId;
@@ -8861,6 +9104,13 @@
tListElem *pEntry = NULL;
tSmeCmd *pCommand = NULL;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
pSession->fCancelRoaming = eANI_BOOLEAN_FALSE;
//Only remove the connected BSS in infrastructure mode
csrRoamRemoveConnectedBssFromScanCache(pMac, &pSession->connectedProfile);
@@ -8935,6 +9185,13 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tSirSmeRsp *pSirSmeMsg;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, pCommand->sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), pCommand->sessionId);
+ return;
+ }
+
switch ( pCommand->u.wmStatusChangeCmd.Type )
{
case eCsrDisassociated:
@@ -9101,7 +9358,12 @@
{
eHalStatus status;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
-
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
#ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
{
@@ -9792,6 +10054,13 @@
ePhyChanBondState cbMode = PHY_SINGLE_CHANNEL_CENTERED;
eCsrCBChoice cbChoice;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if( pBssDesc )
{
csrRoamGetBssStartParmsFromBssDesc( pMac, pBssDesc, pIes, &pSession->bssParams );
@@ -9973,6 +10242,13 @@
tSirSmeNewBssInfo *pNewBss )
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
if( pNewBss )
{
// Set the operating channel.
@@ -10054,6 +10330,13 @@
{
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, "csrRoamSetPMKIDCache called, numItems = %d\n", numItems);
if(numItems <= CSR_MAX_PMKID_ALLOWED)
{
@@ -10093,6 +10376,13 @@
{
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(pNum && pPmkidCache)
{
if(pSession->NumPmkidCache == 0)
@@ -10122,6 +10412,13 @@
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tANI_U32 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(pLen)
{
len = *pLen;
@@ -10142,6 +10439,13 @@
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tANI_U32 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(pLen)
{
len = *pLen;
@@ -10162,6 +10466,13 @@
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tANI_U32 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(pLen)
{
len = *pLen;
@@ -10181,6 +10492,13 @@
eHalStatus status = eHAL_STATUS_INVALID_PARAMETER;
tANI_U32 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(pLen)
{
len = *pLen;
@@ -10200,6 +10518,13 @@
{
eRoamCmdStatus retStatus = eCSR_ROAM_CONNECT_COMPLETION;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return (retStatus);
+ }
+
if(CSR_IS_ROAMING(pSession))
{
retStatus = eCSR_ROAM_ROAMING_COMPLETION;
@@ -10325,6 +10650,13 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tBssConfigParam bssConfig;
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if ( csrIsConnStateIbss( pMac, sessionId ) )
{
status = csrRoamIssueStopBss( pMac, sessionId, eCSR_ROAM_SUBSTATE_DISCONNECT_CONTINUE_ROAMING );
@@ -10464,6 +10796,13 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_U32 dwTmp;
tANI_U8 wpaRsnIE[DOT11F_IE_RSN_MAX_LEN]; //RSN MAX is bigger than WPA MAX
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
do {
pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS;
pSession->joinFailStatusCode.reasonCode = 0;
@@ -10856,6 +11195,13 @@
tSirMacRateSet ExRateSet;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_U8 wpaRsnIE[DOT11F_IE_RSN_MAX_LEN]; //RSN MAX is bigger than WPA MAX
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
/* To satisfy klockworks */
if (pBssDescription == NULL)
{
@@ -11777,6 +12123,13 @@
tANI_U32 authType;
#endif
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
do {
pSession->joinFailStatusCode.statusCode = eSIR_SME_SUCCESS;
pSession->joinFailStatusCode.reasonCode = 0;
@@ -11948,6 +12301,13 @@
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
tANI_U8 *pBuf;
tANI_U16 msgLen;
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
do {
status = palAllocateMemory(pMac, (void **)&pMsg, sizeof(tSirSmeStopBssReq));
if ( !HAL_STATUS_SUCCESS(status) ) break;
@@ -12408,6 +12768,13 @@
static void csrInitSession( tpAniSirGlobal pMac, tANI_U32 sessionId )
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
pSession->sessionActive = eANI_BOOLEAN_FALSE;
pSession->sessionId = CSR_SESSION_ID_INVALID;
pSession->callback = NULL;
@@ -12532,6 +12899,13 @@
static void csrRoamLinkDown(tpAniSirGlobal pMac, tANI_U32 sessionId)
{
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return;
+ }
+
//Only to handle the case for Handover on infra link
if( eCSR_BSS_TYPE_INFRASTRUCTURE != pSession->connectedProfile.BSSType )
{
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index 477e635..2cb8635 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -84,6 +84,8 @@
#define CSR_SCAN_MAX_SCORE_VAL 0xFF
#define CSR_SCAN_MIN_SCORE_VAL 0x0
#define CSR_SCAN_HANDOFF_DELTA 10
+#define MAX_ACTIVE_SCAN_FOR_ONE_CHANNEL 140
+#define MIN_ACTIVE_SCAN_FOR_ONE_CHANNEL 120
#define CSR_SCAN_OVERALL_SCORE( rssi ) \
( rssi < CSR_SCAN_MAX_SCORE_VAL )\
? (CSR_SCAN_MAX_SCORE_VAL-rssi) : CSR_SCAN_MIN_SCORE_VAL
@@ -535,6 +537,7 @@
{
eHalStatus status = eHAL_STATUS_FAILURE;
tSmeCmd *pScanCmd = NULL;
+ eCsrConnectState ConnectState;
do
{
@@ -593,6 +596,20 @@
pScanRequest->minChnTime = pMac->roam.configParam.nPassiveMinChnTime;
}
}
+ /*For Standalone wlan : channel time will remain the same.
+ For BTC with A2DP up: Channel time = Channel time * 2 , if station is not already associated.
+ This has been done to provide a larger scan window for faster connection during btc.Else Scan is seen
+ to take a long time.
+ For BTC with A2DP up: Channel time will not be doubled, if station is already associated.
+ */
+ status = csrRoamGetConnectState(pMac,sessionId,&ConnectState);
+ if(pMac->btc.fA2DPUp &&
+ (eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED != ConnectState) &&
+ (eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED != ConnectState))
+ {
+ pScanRequest->maxChnTime = pScanRequest->maxChnTime << 1;
+ pScanRequest->minChnTime = pScanRequest->minChnTime << 1;
+ }
//Need to make the following atomic
pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
@@ -809,6 +826,12 @@
tCsrRoamProfile *pProfile = NULL;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
do
{
smsLog(pMac, LOG1, " csrIssueRoamAfterLostlinkScan called\n");
@@ -877,7 +900,7 @@
}
-eHalStatus csrScanGetScanChnInfo(tpAniSirGlobal pMac)
+eHalStatus csrScanGetScanChnInfo(tpAniSirGlobal pMac, void *callback, void *pContext)
{
eHalStatus status = eHAL_STATUS_SUCCESS;
tSmeCmd *pScanCmd;
@@ -889,8 +912,8 @@
{
pScanCmd->command = eSmeCommandScan;
palZeroMemory(pMac->hHdd, &pScanCmd->u.scanCmd, sizeof(tScanCmd));
- pScanCmd->u.scanCmd.callback = NULL;
- pScanCmd->u.scanCmd.pContext = NULL;
+ pScanCmd->u.scanCmd.callback = callback;
+ pScanCmd->u.scanCmd.pContext = pContext;
pScanCmd->u.scanCmd.reason = eCsrScanGetScanChnInfo;
//Need to make the following atomic
pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
@@ -918,6 +941,12 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, " Lostlink scan 1 failed\n");
if(pSession->fCancelRoaming)
{
@@ -963,6 +992,12 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, " Lostlink scan 2 failed\n");
if(pSession->fCancelRoaming)
{
@@ -1017,6 +1052,12 @@
tCsrScanResultInfo *pScanResult = NULL;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, FL(" called\n"));
do
{
@@ -1171,6 +1212,12 @@
tSmeCmd *pCommand = NULL;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, FL(" called\n"));
do
{
@@ -1404,6 +1451,12 @@
tCsrRoamProfile *pProfile = pCommand->u.scanCmd.pToRoamProfile;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
#if defined(WLAN_DEBUG)
if(pCommand->u.scanCmd.u.scanRequest.SSIDs.numOfSSIDs == 1)
{
@@ -2157,6 +2210,12 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, "csrAddPMKIDCandidateList called pMac->scan.NumPmkidCandidate = %d\n", pSession->NumPmkidCandidate);
if( pIes )
{
@@ -2258,6 +2317,12 @@
eHalStatus status = eHAL_STATUS_FAILURE;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, "csrAddBKIDCandidateList called pMac->scan.NumBkidCandidate = %d\n", pSession->NumBkidCandidate);
if( pIes )
{
@@ -4229,7 +4294,15 @@
if( csrScanIsWildCardScan( pMac, pCommand ) && (!pCommand->u.scanCmd.u.scanRequest.p2pSearch) )
{
//Get the list of channels scanned
- csrScanGetScanChnInfo(pMac);
+ if( pCommand->u.scanCmd.reason != eCsrScanUserRequest)
+ {
+ csrScanGetScanChnInfo(pMac, NULL, NULL);
+ }
+ else
+ {
+ csrScanGetScanChnInfo(pMac, pCommand->u.scanCmd.callback, pCommand->u.scanCmd.pContext);
+ pCommand->u.scanCmd.callback = NULL;
+ }
}
}
break;
@@ -4414,12 +4487,12 @@
pResult = GET_BASE_ADDR( pEntry, tCsrScanResult, Link );
if(pResult->Result.BssDescriptor.channelId == pChnInfo->channelId)
{
- pResult->AgingCount--;
if(pResult->AgingCount <= 0)
{
smsLog(pMac, LOGW, " age out due to ref count");
csrScanAgeOutBss(pMac, pResult);
}
+ pResult->AgingCount--;
}
pEntry = tmpEntry;
}
@@ -5787,6 +5860,12 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, " pMac->scan.NumPmkidCandidate = %d\n ", pSession->NumPmkidCandidate);
csrResetPMKIDCandidateList(pMac, sessionId);
if(csrIsConnStateConnected(pMac, sessionId) && pSession->pCurRoamProfile)
@@ -5840,6 +5919,12 @@
eHalStatus status = eHAL_STATUS_SUCCESS;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
smsLog(pMac, LOGW, " pMac->scan.NumBkidCandidate = %d\n ", pSession->NumBkidCandidate);
csrResetBKIDCandidateList(pMac, sessionId);
if(csrIsConnStateConnected(pMac, sessionId) && pSession->pCurRoamProfile)
@@ -5927,8 +6012,6 @@
pScanCmd->u.scanCmd.scanID = pMac->scan.nextScanID++; //let it wrap around
palZeroMemory(pMac->hHdd, &pScanCmd->u.scanCmd.u.scanRequest, sizeof(tCsrScanRequest));
pScanCmd->u.scanCmd.u.scanRequest.scanType = eSIR_ACTIVE_SCAN;
- pScanCmd->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
- pScanCmd->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
pScanCmd->u.scanCmd.u.scanRequest.BSSType = pProfile->BSSType;
// To avoid 11b rate in probe request Set p2pSearch flag as 1 for P2P Client Mode
if(VOS_P2P_CLIENT_MODE == pProfile->csrPersona)
@@ -5955,6 +6038,17 @@
{
pScanCmd->u.scanCmd.u.scanRequest.uIEFieldLen = 0;
}
+ /* For one channel be good enpugh time to receive beacon atleast */
+ if( 1 == pProfile->ChannelInfo.numOfChannels )
+ {
+ pScanCmd->u.scanCmd.u.scanRequest.maxChnTime = MAX_ACTIVE_SCAN_FOR_ONE_CHANNEL;
+ pScanCmd->u.scanCmd.u.scanRequest.minChnTime = MIN_ACTIVE_SCAN_FOR_ONE_CHANNEL;
+ }
+ else
+ {
+ pScanCmd->u.scanCmd.u.scanRequest.maxChnTime = pMac->roam.configParam.nActiveMaxChnTime;
+ pScanCmd->u.scanCmd.u.scanRequest.minChnTime = pMac->roam.configParam.nActiveMinChnTime;
+ }
if(pProfile->BSSIDs.numOfBSSIDs == 1)
{
palCopyMemory(pMac->hHdd, pScanCmd->u.scanCmd.u.scanRequest.bssid, pProfile->BSSIDs.bssid, sizeof(tCsrBssid));
diff --git a/CORE/SME/src/csr/csrCmdProcess.c b/CORE/SME/src/csr/csrCmdProcess.c
index cd99696..5bd7808 100644
--- a/CORE/SME/src/csr/csrCmdProcess.c
+++ b/CORE/SME/src/csr/csrCmdProcess.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrInsideApi.h b/CORE/SME/src/csr/csrInsideApi.h
index 90d6b22..fdd7f12 100644
--- a/CORE/SME/src/csr/csrInsideApi.h
+++ b/CORE/SME/src/csr/csrInsideApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrLinkList.c b/CORE/SME/src/csr/csrLinkList.c
index a2b08e8..74d940f 100644
--- a/CORE/SME/src/csr/csrLinkList.c
+++ b/CORE/SME/src/csr/csrLinkList.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrLogDump.c b/CORE/SME/src/csr/csrLogDump.c
index 26fb3eb..aeb2b0b 100644
--- a/CORE/SME/src/csr/csrLogDump.c
+++ b/CORE/SME/src/csr/csrLogDump.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrNeighborRoam.c b/CORE/SME/src/csr/csrNeighborRoam.c
index e2919d1..809e79c 100644
--- a/CORE/SME/src/csr/csrNeighborRoam.c
+++ b/CORE/SME/src/csr/csrNeighborRoam.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c
index 079becc..101ede3 100644
--- a/CORE/SME/src/csr/csrUtil.c
+++ b/CORE/SME/src/csr/csrUtil.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3486,6 +3486,12 @@
tANI_U32 Index;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return FALSE;
+ }
+
do
{
for( Index=0; Index < pSession->NumPmkidCache; Index++ )
@@ -3738,6 +3744,12 @@
tANI_U32 Index;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return FALSE;
+ }
+
do
{
for( Index=0; Index < pSession->NumBkidCache; Index++ )
diff --git a/CORE/SME/src/oemData/oemDataApi.c b/CORE/SME/src/oemData/oemDataApi.c
index 1020373..38b4ffa 100644
--- a/CORE/SME/src/oemData/oemDataApi.c
+++ b/CORE/SME/src/oemData/oemDataApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/p2p/p2p_Api.c b/CORE/SME/src/p2p/p2p_Api.c
index c0948d1..8b45b1d 100644
--- a/CORE/SME/src/p2p/p2p_Api.c
+++ b/CORE/SME/src/p2p/p2p_Api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -59,6 +59,13 @@
tSirRemainOnChnReq* pMsg;
tANI_U16 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, p2pRemainonChn->sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), p2pRemainonChn->sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
#ifdef WLAN_FEATURE_P2P_INTERNAL
tANI_U8 P2PsessionId = getP2PSessionIdFromSMESessionId(pMac, p2pRemainonChn->sessionId);
tp2pContext *p2pContext = &pMac->p2pContext[P2PsessionId];
diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c
index 56e2d11..11f29ef 100644
--- a/CORE/SME/src/pmc/pmc.c
+++ b/CORE/SME/src/pmc/pmc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/pmc/pmcApi.c b/CORE/SME/src/pmc/pmcApi.c
index a8fe6f6..24f5292 100644
--- a/CORE/SME/src/pmc/pmcApi.c
+++ b/CORE/SME/src/pmc/pmcApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/pmc/pmcLogDump.c b/CORE/SME/src/pmc/pmcLogDump.c
index 463ea21..bb8a077 100644
--- a/CORE/SME/src/pmc/pmcLogDump.c
+++ b/CORE/SME/src/pmc/pmcLogDump.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/rrm/sme_rrm.c b/CORE/SME/src/rrm/sme_rrm.c
index 7e9d91c..7d18bb6 100644
--- a/CORE/SME/src/rrm/sme_rrm.c
+++ b/CORE/SME/src/rrm/sme_rrm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 2dac130..671904a 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -3572,6 +3572,12 @@
pSession = CSR_GET_SESSION(pMac, sessionId);
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
+
if(CSR_IS_INFRA_AP(&pSession->connectedProfile))
{
if(pSetKey->keyDirection == eSIR_TX_DEFAULT)
@@ -5274,6 +5280,12 @@
tSirRegisterMgmtFrame *pMsg;
tANI_U16 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
if( !pSession->sessionActive )
{
@@ -5325,6 +5337,12 @@
tSirRegisterMgmtFrame *pMsg;
tANI_U16 len;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
if( !pSession->sessionActive )
{
@@ -6457,6 +6475,12 @@
{
tpSirUpdateParams pMsg;
tCsrRoamSession *pSession = CSR_GET_SESSION( pMac, sessionId );
+
+ if(!pSession)
+ {
+ smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
+ return eHAL_STATUS_FAILURE;
+ }
if( !pSession->sessionActive )
VOS_ASSERT(0);
diff --git a/CORE/SME/src/sme_common/sme_FTApi.c b/CORE/SME/src/sme_common/sme_FTApi.c
index ce76b7e..29a7acd 100644
--- a/CORE/SME/src/sme_common/sme_FTApi.c
+++ b/CORE/SME/src/sme_common/sme_FTApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/external/wlan_nlink_common.h b/CORE/SVC/external/wlan_nlink_common.h
index 89c0745..d5ac745 100644
--- a/CORE/SVC/external/wlan_nlink_common.h
+++ b/CORE/SVC/external/wlan_nlink_common.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/inc/wlan_btc_svc.h b/CORE/SVC/inc/wlan_btc_svc.h
index 620cb22..73f0543 100644
--- a/CORE/SVC/inc/wlan_btc_svc.h
+++ b/CORE/SVC/inc/wlan_btc_svc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/inc/wlan_nlink_srv.h b/CORE/SVC/inc/wlan_nlink_srv.h
index 788ffb3..bc121f4 100644
--- a/CORE/SVC/inc/wlan_nlink_srv.h
+++ b/CORE/SVC/inc/wlan_nlink_srv.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/inc/wlan_ptt_sock_svc.h b/CORE/SVC/inc/wlan_ptt_sock_svc.h
index cca58d5..9daa5fb 100644
--- a/CORE/SVC/inc/wlan_ptt_sock_svc.h
+++ b/CORE/SVC/inc/wlan_ptt_sock_svc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/src/btc/wlan_btc_svc.c b/CORE/SVC/src/btc/wlan_btc_svc.c
index 6643fab..54a654a 100644
--- a/CORE/SVC/src/btc/wlan_btc_svc.c
+++ b/CORE/SVC/src/btc/wlan_btc_svc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/src/nlink/wlan_nlink_srv.c b/CORE/SVC/src/nlink/wlan_nlink_srv.c
index b2951f2..31144f5 100644
--- a/CORE/SVC/src/nlink/wlan_nlink_srv.c
+++ b/CORE/SVC/src/nlink/wlan_nlink_srv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
index a63d473..eaa45e5 100644
--- a/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
+++ b/CORE/SVC/src/ptt/wlan_ptt_sock_svc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/common/inc/wlan_qct_sys.h b/CORE/SYS/common/inc/wlan_qct_sys.h
index b5800d9..ef22994 100644
--- a/CORE/SYS/common/inc/wlan_qct_sys.h
+++ b/CORE/SYS/common/inc/wlan_qct_sys.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/common/src/wlan_qct_sys.c b/CORE/SYS/common/src/wlan_qct_sys.c
index 9479442..b4084f9 100644
--- a/CORE/SYS/common/src/wlan_qct_sys.c
+++ b/CORE/SYS/common/src/wlan_qct_sys.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/pal/inc/palApi.h b/CORE/SYS/legacy/src/pal/inc/palApi.h
index f3e4edf..ce24278 100644
--- a/CORE/SYS/legacy/src/pal/inc/palApi.h
+++ b/CORE/SYS/legacy/src/pal/inc/palApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/pal/inc/palPipes.h b/CORE/SYS/legacy/src/pal/inc/palPipes.h
index 363d9b2..8278ba7 100644
--- a/CORE/SYS/legacy/src/pal/inc/palPipes.h
+++ b/CORE/SYS/legacy/src/pal/inc/palPipes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/pal/inc/palTimer.h b/CORE/SYS/legacy/src/pal/inc/palTimer.h
index 984684e..8cf0cf1 100644
--- a/CORE/SYS/legacy/src/pal/inc/palTimer.h
+++ b/CORE/SYS/legacy/src/pal/inc/palTimer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/pal/src/palApiComm.c b/CORE/SYS/legacy/src/pal/src/palApiComm.c
index 1a21e3a..c3fc9f6 100644
--- a/CORE/SYS/legacy/src/pal/src/palApiComm.c
+++ b/CORE/SYS/legacy/src/pal/src/palApiComm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/pal/src/palTimer.c b/CORE/SYS/legacy/src/pal/src/palTimer.c
index 72bb084..bb1b170 100644
--- a/CORE/SYS/legacy/src/pal/src/palTimer.c
+++ b/CORE/SYS/legacy/src/pal/src/palTimer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
index b5ef51a..92711f0 100644
--- a/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
+++ b/CORE/SYS/legacy/src/platform/inc/VossWrapper.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/platform/src/VossWrapper.c b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
index 25a6d44..4b689fa 100644
--- a/CORE/SYS/legacy/src/platform/src/VossWrapper.c
+++ b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/inc/sysDebug.h b/CORE/SYS/legacy/src/system/inc/sysDebug.h
index 6ac7143..161d563 100644
--- a/CORE/SYS/legacy/src/system/inc/sysDebug.h
+++ b/CORE/SYS/legacy/src/system/inc/sysDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/inc/sysDef.h b/CORE/SYS/legacy/src/system/inc/sysDef.h
index fdb9c08..01b5435 100644
--- a/CORE/SYS/legacy/src/system/inc/sysDef.h
+++ b/CORE/SYS/legacy/src/system/inc/sysDef.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/inc/sysEntryFunc.h b/CORE/SYS/legacy/src/system/inc/sysEntryFunc.h
index aed10ec..d7836d8 100644
--- a/CORE/SYS/legacy/src/system/inc/sysEntryFunc.h
+++ b/CORE/SYS/legacy/src/system/inc/sysEntryFunc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/inc/sysStartup.h b/CORE/SYS/legacy/src/system/inc/sysStartup.h
index 1f1558f..366daff 100644
--- a/CORE/SYS/legacy/src/system/inc/sysStartup.h
+++ b/CORE/SYS/legacy/src/system/inc/sysStartup.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/src/macInitApi.c b/CORE/SYS/legacy/src/system/src/macInitApi.c
index 6946036..dfd29ed 100644
--- a/CORE/SYS/legacy/src/system/src/macInitApi.c
+++ b/CORE/SYS/legacy/src/system/src/macInitApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
index bb64322..fb886c3 100644
--- a/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
+++ b/CORE/SYS/legacy/src/system/src/sysEntryFunc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/system/src/sysWinStartup.c b/CORE/SYS/legacy/src/system/src/sysWinStartup.c
index dcd14b8..95c8af5 100644
--- a/CORE/SYS/legacy/src/system/src/sysWinStartup.c
+++ b/CORE/SYS/legacy/src/system/src/sysWinStartup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/inc/dot11fdefs.h b/CORE/SYS/legacy/src/utils/inc/dot11fdefs.h
index 845c967..427ab75 100644
--- a/CORE/SYS/legacy/src/utils/inc/dot11fdefs.h
+++ b/CORE/SYS/legacy/src/utils/inc/dot11fdefs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/inc/utilsParser.h b/CORE/SYS/legacy/src/utils/inc/utilsParser.h
index 556d9eb..c72197f 100644
--- a/CORE/SYS/legacy/src/utils/inc/utilsParser.h
+++ b/CORE/SYS/legacy/src/utils/inc/utilsParser.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/dot11f.c b/CORE/SYS/legacy/src/utils/src/dot11f.c
index b2df4bd..70c129e 100644
--- a/CORE/SYS/legacy/src/utils/src/dot11f.c
+++ b/CORE/SYS/legacy/src/utils/src/dot11f.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/logApi.c b/CORE/SYS/legacy/src/utils/src/logApi.c
index 48e9fd3..7fc70e0 100644
--- a/CORE/SYS/legacy/src/utils/src/logApi.c
+++ b/CORE/SYS/legacy/src/utils/src/logApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/logDump.c b/CORE/SYS/legacy/src/utils/src/logDump.c
index 4dcc38e..e5a3ab6 100644
--- a/CORE/SYS/legacy/src/utils/src/logDump.c
+++ b/CORE/SYS/legacy/src/utils/src/logDump.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/macTrace.c b/CORE/SYS/legacy/src/utils/src/macTrace.c
index dc72941..619b1eb 100644
--- a/CORE/SYS/legacy/src/utils/src/macTrace.c
+++ b/CORE/SYS/legacy/src/utils/src/macTrace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 106fa55..24aa251 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -1870,20 +1870,28 @@
tpSirProbeRespBeacon pProbeResp)
{
tANI_U32 status;
- tDot11fProbeResponse pr;
+ tDot11fProbeResponse *pr;
// Ok, zero-init our [out] parameter,
palZeroMemory( pMac->hHdd, ( tANI_U8* )pProbeResp, sizeof(tSirProbeRespBeacon) );
- palZeroMemory( pMac->hHdd, ( tANI_U8* )&pr, sizeof(tDot11fProbeResponse) );
-
+ status = palAllocateMemory(pMac->hHdd, (void **)&pr, sizeof(tDot11fProbeResponse));
+ if(!HAL_STATUS_SUCCESS(status))
+ {
+ limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
+ return eSIR_FAILURE;
+ }
+
+ palZeroMemory( pMac->hHdd, ( tANI_U8* )pr, sizeof(tDot11fProbeResponse) );
+
// delegate to the framesc-generated code,
- status = dot11fUnpackProbeResponse( pMac, pFrame, nFrame, &pr );
+ status = dot11fUnpackProbeResponse( pMac, pFrame, nFrame, pr );
if ( DOT11F_FAILED( status ) )
{
limLog(pMac, LOGE, FL("Failed to parse a Probe Response (0x%08x, %d bytes):\n"),
status, nFrame);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
+ palFreeMemory(pMac->hHdd, pr);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -1896,171 +1904,171 @@
// & "transliterate" from a 'tDot11fProbeResponse' to a 'tSirProbeRespBeacon'...
// Timestamp
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pProbeResp->timeStamp, ( tANI_U8* )&pr.TimeStamp, sizeof(tSirMacTimeStamp) );
+ palCopyMemory( pMac->hHdd, ( tANI_U8* )pProbeResp->timeStamp, ( tANI_U8* )&pr->TimeStamp, sizeof(tSirMacTimeStamp) );
// Beacon Interval
- pProbeResp->beaconInterval = pr.BeaconInterval.interval;
+ pProbeResp->beaconInterval = pr->BeaconInterval.interval;
// Capabilities
- pProbeResp->capabilityInfo.ess = pr.Capabilities.ess;
- pProbeResp->capabilityInfo.ibss = pr.Capabilities.ibss;
- pProbeResp->capabilityInfo.cfPollable = pr.Capabilities.cfPollable;
- pProbeResp->capabilityInfo.cfPollReq = pr.Capabilities.cfPollReq;
- pProbeResp->capabilityInfo.privacy = pr.Capabilities.privacy;
- pProbeResp->capabilityInfo.shortPreamble = pr.Capabilities.shortPreamble;
- pProbeResp->capabilityInfo.pbcc = pr.Capabilities.pbcc;
- pProbeResp->capabilityInfo.channelAgility = pr.Capabilities.channelAgility;
- pProbeResp->capabilityInfo.spectrumMgt = pr.Capabilities.spectrumMgt;
- pProbeResp->capabilityInfo.qos = pr.Capabilities.qos;
- pProbeResp->capabilityInfo.shortSlotTime = pr.Capabilities.shortSlotTime;
- pProbeResp->capabilityInfo.apsd = pr.Capabilities.apsd;
- pProbeResp->capabilityInfo.rrm = pr.Capabilities.rrm;
- pProbeResp->capabilityInfo.dsssOfdm = pr.Capabilities.dsssOfdm;
- pProbeResp->capabilityInfo.delayedBA = pr.Capabilities.delayedBA;
- pProbeResp->capabilityInfo.immediateBA = pr.Capabilities.immediateBA;
+ pProbeResp->capabilityInfo.ess = pr->Capabilities.ess;
+ pProbeResp->capabilityInfo.ibss = pr->Capabilities.ibss;
+ pProbeResp->capabilityInfo.cfPollable = pr->Capabilities.cfPollable;
+ pProbeResp->capabilityInfo.cfPollReq = pr->Capabilities.cfPollReq;
+ pProbeResp->capabilityInfo.privacy = pr->Capabilities.privacy;
+ pProbeResp->capabilityInfo.shortPreamble = pr->Capabilities.shortPreamble;
+ pProbeResp->capabilityInfo.pbcc = pr->Capabilities.pbcc;
+ pProbeResp->capabilityInfo.channelAgility = pr->Capabilities.channelAgility;
+ pProbeResp->capabilityInfo.spectrumMgt = pr->Capabilities.spectrumMgt;
+ pProbeResp->capabilityInfo.qos = pr->Capabilities.qos;
+ pProbeResp->capabilityInfo.shortSlotTime = pr->Capabilities.shortSlotTime;
+ pProbeResp->capabilityInfo.apsd = pr->Capabilities.apsd;
+ pProbeResp->capabilityInfo.rrm = pr->Capabilities.rrm;
+ pProbeResp->capabilityInfo.dsssOfdm = pr->Capabilities.dsssOfdm;
+ pProbeResp->capabilityInfo.delayedBA = pr->Capabilities.delayedBA;
+ pProbeResp->capabilityInfo.immediateBA = pr->Capabilities.immediateBA;
- if ( ! pr.SSID.present )
+ if ( ! pr->SSID.present )
{
PELOGW(limLog(pMac, LOGW, FL("Mandatory IE SSID not present!\n"));)
}
else
{
pProbeResp->ssidPresent = 1;
- ConvertSSID( pMac, &pProbeResp->ssId, &pr.SSID );
+ ConvertSSID( pMac, &pProbeResp->ssId, &pr->SSID );
}
- if ( ! pr.SuppRates.present )
+ if ( ! pr->SuppRates.present )
{
PELOGW(limLog(pMac, LOGW, FL("Mandatory IE Supported Rates not present!\n"));)
}
else
{
pProbeResp->suppRatesPresent = 1;
- ConvertSuppRates( pMac, &pProbeResp->supportedRates, &pr.SuppRates );
+ ConvertSuppRates( pMac, &pProbeResp->supportedRates, &pr->SuppRates );
}
- if ( pr.ExtSuppRates.present )
+ if ( pr->ExtSuppRates.present )
{
pProbeResp->extendedRatesPresent = 1;
- ConvertExtSuppRates( pMac, &pProbeResp->extendedRates, &pr.ExtSuppRates );
+ ConvertExtSuppRates( pMac, &pProbeResp->extendedRates, &pr->ExtSuppRates );
}
- if ( pr.CFParams.present )
+ if ( pr->CFParams.present )
{
pProbeResp->cfPresent = 1;
- ConvertCFParams( pMac, &pProbeResp->cfParamSet, &pr.CFParams );
+ ConvertCFParams( pMac, &pProbeResp->cfParamSet, &pr->CFParams );
}
- if ( pr.Country.present )
+ if ( pr->Country.present )
{
pProbeResp->countryInfoPresent = 1;
- ConvertCountry( pMac, &pProbeResp->countryInfoParam, &pr.Country );
+ ConvertCountry( pMac, &pProbeResp->countryInfoParam, &pr->Country );
}
- if ( pr.EDCAParamSet.present )
+ if ( pr->EDCAParamSet.present )
{
pProbeResp->edcaPresent = 1;
- ConvertEDCAParam( pMac, &pProbeResp->edcaParams, &pr.EDCAParamSet );
+ ConvertEDCAParam( pMac, &pProbeResp->edcaParams, &pr->EDCAParamSet );
}
- if ( pr.ChanSwitchAnn.present )
+ if ( pr->ChanSwitchAnn.present )
{
pProbeResp->channelSwitchPresent = 1;
- palCopyMemory( pMac, &pProbeResp->channelSwitchIE, &pr.ChanSwitchAnn,
+ palCopyMemory( pMac, &pProbeResp->channelSwitchIE, &pr->ChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
- if ( pr.ExtChanSwitchAnn.present )
+ if ( pr->ExtChanSwitchAnn.present )
{
pProbeResp->extChannelSwitchPresent = 1;
- palCopyMemory( pMac, &pProbeResp->extChannelSwitchIE, &pr.ExtChanSwitchAnn,
+ palCopyMemory( pMac, &pProbeResp->extChannelSwitchIE, &pr->ExtChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
- if( pr.TPCReport.present)
+ if( pr->TPCReport.present)
{
pProbeResp->tpcReportPresent = 1;
- palCopyMemory(pMac->hHdd, &pProbeResp->tpcReport, &pr.TPCReport, sizeof(tDot11fIETPCReport));
+ palCopyMemory(pMac->hHdd, &pProbeResp->tpcReport, &pr->TPCReport, sizeof(tDot11fIETPCReport));
}
- if( pr.PowerConstraints.present)
+ if( pr->PowerConstraints.present)
{
pProbeResp->powerConstraintPresent = 1;
- palCopyMemory(pMac->hHdd, &pProbeResp->localPowerConstraint, &pr.PowerConstraints, sizeof(tDot11fIEPowerConstraints));
+ palCopyMemory(pMac->hHdd, &pProbeResp->localPowerConstraint, &pr->PowerConstraints, sizeof(tDot11fIEPowerConstraints));
}
- if ( pr.Quiet.present )
+ if ( pr->Quiet.present )
{
pProbeResp->quietIEPresent = 1;
- palCopyMemory( pMac, &pProbeResp->quietIE, &pr.Quiet, sizeof(tDot11fIEQuiet) );
+ palCopyMemory( pMac, &pProbeResp->quietIE, &pr->Quiet, sizeof(tDot11fIEQuiet) );
}
- if ( pr.HTCaps.present )
+ if ( pr->HTCaps.present )
{
- palCopyMemory( pMac, &pProbeResp->HTCaps, &pr.HTCaps, sizeof( tDot11fIEHTCaps ) );
+ palCopyMemory( pMac, &pProbeResp->HTCaps, &pr->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
- if ( pr.HTInfo.present )
+ if ( pr->HTInfo.present )
{
- palCopyMemory( pMac, &pProbeResp->HTInfo, &pr.HTInfo, sizeof( tDot11fIEHTInfo ) );
+ palCopyMemory( pMac, &pProbeResp->HTInfo, &pr->HTInfo, sizeof( tDot11fIEHTInfo ) );
}
- if ( pr.DSParams.present )
+ if ( pr->DSParams.present )
{
pProbeResp->dsParamsPresent = 1;
- pProbeResp->channelNumber = pr.DSParams.curr_channel;
+ pProbeResp->channelNumber = pr->DSParams.curr_channel;
}
- else if(pr.HTInfo.present)
+ else if(pr->HTInfo.present)
{
- pProbeResp->channelNumber = pr.HTInfo.primaryChannel;
+ pProbeResp->channelNumber = pr->HTInfo.primaryChannel;
}
- if ( pr.RSN.present )
+ if ( pr->RSN.present )
{
pProbeResp->rsnPresent = 1;
- ConvertRSN( pMac, &pProbeResp->rsn, &pr.RSN );
+ ConvertRSN( pMac, &pProbeResp->rsn, &pr->RSN );
}
- if ( pr.WPA.present )
+ if ( pr->WPA.present )
{
pProbeResp->wpaPresent = 1;
- ConvertWPA( pMac, &pProbeResp->wpa, &pr.WPA );
+ ConvertWPA( pMac, &pProbeResp->wpa, &pr->WPA );
}
- if ( pr.WMMParams.present )
+ if ( pr->WMMParams.present )
{
pProbeResp->wmeEdcaPresent = 1;
- ConvertWMMParams( pMac, &pProbeResp->edcaParams, &pr.WMMParams );
+ ConvertWMMParams( pMac, &pProbeResp->edcaParams, &pr->WMMParams );
PELOG1(limLog(pMac, LOG1, FL("WMM Parameter present in Probe Response Frame!\n"));
- __printWMMParams(pMac, &pr.WMMParams);)
+ __printWMMParams(pMac, &pr->WMMParams);)
}
- if ( pr.WMMInfoAp.present )
+ if ( pr->WMMInfoAp.present )
{
pProbeResp->wmeInfoPresent = 1;
PELOG1(limLog(pMac, LOG1, FL("WMM Information Element present in Probe Response Frame!\n"));)
}
- if ( pr.WMMCaps.present )
+ if ( pr->WMMCaps.present )
{
pProbeResp->wsmCapablePresent = 1;
}
- if ( pr.ERPInfo.present )
+ if ( pr->ERPInfo.present )
{
pProbeResp->erpPresent = 1;
- ConvertERPInfo( pMac, &pProbeResp->erpIEInfo, &pr.ERPInfo );
+ ConvertERPInfo( pMac, &pProbeResp->erpIEInfo, &pr->ERPInfo );
}
#ifdef WLAN_FEATURE_VOWIFI_11R
- if (pr.MobilityDomain.present)
+ if (pr->MobilityDomain.present)
{
// MobilityDomain
pProbeResp->mdiePresent = 1;
- palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pProbeResp->mdie[0]), (tANI_U8 *)&(pr.MobilityDomain.MDID), sizeof(tANI_U16) );
- pProbeResp->mdie[2] = ((pr.MobilityDomain.overDSCap << 0) | (pr.MobilityDomain.resourceReqCap << 1));
+ palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pProbeResp->mdie[0]), (tANI_U8 *)&(pr->MobilityDomain.MDID), sizeof(tANI_U16) );
+ pProbeResp->mdie[2] = ((pr->MobilityDomain.overDSCap << 0) | (pr->MobilityDomain.resourceReqCap << 1));
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
limLog(pMac, LOGE, FL("mdie=%02x%02x%02x\n"), (unsigned int)pProbeResp->mdie[0],
(unsigned int)pProbeResp->mdie[1], (unsigned int)pProbeResp->mdie[2]);
@@ -2069,30 +2077,30 @@
#endif
#if defined FEATURE_WLAN_CCX
- if (pr.QBSSLoad.present)
+ if (pr->QBSSLoad.present)
{
- palCopyMemory(pMac->hHdd, &pProbeResp->QBSSLoad, &pr.QBSSLoad, sizeof(tDot11fIEQBSSLoad));
+ palCopyMemory(pMac->hHdd, &pProbeResp->QBSSLoad, &pr->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
}
#endif
#ifdef WLAN_FEATURE_P2P
- if (pr.P2PProbeRes.present)
+ if (pr->P2PProbeRes.present)
{
- palCopyMemory( pMac, &pProbeResp->P2PProbeRes, &pr.P2PProbeRes,
+ palCopyMemory( pMac, &pProbeResp->P2PProbeRes, &pr->P2PProbeRes,
sizeof(tDot11fIEP2PProbeRes) );
}
#endif
#ifdef WLAN_FEATURE_11AC
- if ( pr.VHTCaps.present )
+ if ( pr->VHTCaps.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTCaps, &pr.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ palCopyMemory( pMac, &pProbeResp->VHTCaps, &pr->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
- if ( pr.VHTOperation.present )
+ if ( pr->VHTOperation.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTOperation, &pr.VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ palCopyMemory( pMac, &pProbeResp->VHTOperation, &pr->VHTOperation, sizeof( tDot11fIEVHTOperation) );
}
- if ( pr.VHTExtBssLoad.present )
+ if ( pr->VHTExtBssLoad.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTExtBssLoad, &pr.VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
+ palCopyMemory( pMac, &pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
}
#endif
return eSIR_SUCCESS;
@@ -2849,7 +2857,7 @@
tANI_U8 *pFrame,
tpSirProbeRespBeacon pBeaconStruct)
{
- tDot11fBeacon beacon;
+ tDot11fBeacon *pBeacon;
tANI_U32 status, nPayload;
tANI_U8 *pPayload;
tpSirMacMgmtHdr pHdr;
@@ -2862,18 +2870,27 @@
// Zero-init our [out] parameter,
palZeroMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon) );
- palZeroMemory( pMac->hHdd, ( tANI_U8* )&beacon, sizeof(tDot11fBeacon) );
+
+ status = palAllocateMemory(pMac->hHdd, (void **)&pBeacon, sizeof(tDot11fBeacon));
+ if(!HAL_STATUS_SUCCESS(status))
+ {
+ limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
+ return eSIR_FAILURE;
+ }
+
+ palZeroMemory( pMac->hHdd, ( tANI_U8* )pBeacon, sizeof(tDot11fBeacon) );
// get the MAC address out of the BD,
palCopyMemory( pMac->hHdd, pBeaconStruct->bssid, pHdr->sa, 6 );
// delegate to the framesc-generated code,
- status = dot11fUnpackBeacon( pMac, pPayload, nPayload, &beacon );
+ status = dot11fUnpackBeacon( pMac, pPayload, nPayload, pBeacon );
if ( DOT11F_FAILED( status ) )
{
limLog(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):\n"),
status, nPayload);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);)
+ palFreeMemory(pMac->hHdd, pBeacon);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -2885,219 +2902,210 @@
// & "transliterate" from a 'tDot11fBeacon' to a 'tSirProbeRespBeacon'...
// Timestamp
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct->timeStamp, ( tANI_U8* )&beacon.TimeStamp, sizeof(tSirMacTimeStamp) );
+ palCopyMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct->timeStamp, ( tANI_U8* )&pBeacon->TimeStamp, sizeof(tSirMacTimeStamp) );
// Beacon Interval
- pBeaconStruct->beaconInterval = beacon.BeaconInterval.interval;
+ pBeaconStruct->beaconInterval = pBeacon->BeaconInterval.interval;
// Capabilities
- pBeaconStruct->capabilityInfo.ess = beacon.Capabilities.ess;
- pBeaconStruct->capabilityInfo.ibss = beacon.Capabilities.ibss;
- pBeaconStruct->capabilityInfo.cfPollable = beacon.Capabilities.cfPollable;
- pBeaconStruct->capabilityInfo.cfPollReq = beacon.Capabilities.cfPollReq;
- pBeaconStruct->capabilityInfo.privacy = beacon.Capabilities.privacy;
- pBeaconStruct->capabilityInfo.shortPreamble = beacon.Capabilities.shortPreamble;
- pBeaconStruct->capabilityInfo.pbcc = beacon.Capabilities.pbcc;
- pBeaconStruct->capabilityInfo.channelAgility = beacon.Capabilities.channelAgility;
- pBeaconStruct->capabilityInfo.spectrumMgt = beacon.Capabilities.spectrumMgt;
- pBeaconStruct->capabilityInfo.qos = beacon.Capabilities.qos;
- pBeaconStruct->capabilityInfo.shortSlotTime = beacon.Capabilities.shortSlotTime;
- pBeaconStruct->capabilityInfo.apsd = beacon.Capabilities.apsd;
- pBeaconStruct->capabilityInfo.rrm = beacon.Capabilities.rrm;
- pBeaconStruct->capabilityInfo.dsssOfdm = beacon.Capabilities.dsssOfdm;
- pBeaconStruct->capabilityInfo.delayedBA = beacon.Capabilities.delayedBA;
- pBeaconStruct->capabilityInfo.immediateBA = beacon.Capabilities.immediateBA;
+ pBeaconStruct->capabilityInfo.ess = pBeacon->Capabilities.ess;
+ pBeaconStruct->capabilityInfo.ibss = pBeacon->Capabilities.ibss;
+ pBeaconStruct->capabilityInfo.cfPollable = pBeacon->Capabilities.cfPollable;
+ pBeaconStruct->capabilityInfo.cfPollReq = pBeacon->Capabilities.cfPollReq;
+ pBeaconStruct->capabilityInfo.privacy = pBeacon->Capabilities.privacy;
+ pBeaconStruct->capabilityInfo.shortPreamble = pBeacon->Capabilities.shortPreamble;
+ pBeaconStruct->capabilityInfo.pbcc = pBeacon->Capabilities.pbcc;
+ pBeaconStruct->capabilityInfo.channelAgility = pBeacon->Capabilities.channelAgility;
+ pBeaconStruct->capabilityInfo.spectrumMgt = pBeacon->Capabilities.spectrumMgt;
+ pBeaconStruct->capabilityInfo.qos = pBeacon->Capabilities.qos;
+ pBeaconStruct->capabilityInfo.shortSlotTime = pBeacon->Capabilities.shortSlotTime;
+ pBeaconStruct->capabilityInfo.apsd = pBeacon->Capabilities.apsd;
+ pBeaconStruct->capabilityInfo.rrm = pBeacon->Capabilities.rrm;
+ pBeaconStruct->capabilityInfo.dsssOfdm = pBeacon->Capabilities.dsssOfdm;
+ pBeaconStruct->capabilityInfo.delayedBA = pBeacon->Capabilities.delayedBA;
+ pBeaconStruct->capabilityInfo.immediateBA = pBeacon->Capabilities.immediateBA;
- if ( ! beacon.SSID.present )
+ if ( ! pBeacon->SSID.present )
{
PELOGW(limLog(pMac, LOGW, FL("Mandatory IE SSID not present!\n"));)
}
else
{
pBeaconStruct->ssidPresent = 1;
- ConvertSSID( pMac, &pBeaconStruct->ssId, &beacon.SSID );
+ ConvertSSID( pMac, &pBeaconStruct->ssId, &pBeacon->SSID );
}
- if ( ! beacon.SuppRates.present )
+ if ( ! pBeacon->SuppRates.present )
{
PELOGW(limLog(pMac, LOGW, FL("Mandatory IE Supported Rates not present!\n"));)
}
else
{
pBeaconStruct->suppRatesPresent = 1;
- ConvertSuppRates( pMac, &pBeaconStruct->supportedRates, &beacon.SuppRates );
+ ConvertSuppRates( pMac, &pBeaconStruct->supportedRates, &pBeacon->SuppRates );
}
- if ( beacon.ExtSuppRates.present )
+ if ( pBeacon->ExtSuppRates.present )
{
pBeaconStruct->extendedRatesPresent = 1;
- ConvertExtSuppRates( pMac, &pBeaconStruct->extendedRates, &beacon.ExtSuppRates );
+ ConvertExtSuppRates( pMac, &pBeaconStruct->extendedRates, &pBeacon->ExtSuppRates );
}
- if ( beacon.CFParams.present )
+ if ( pBeacon->CFParams.present )
{
pBeaconStruct->cfPresent = 1;
- ConvertCFParams( pMac, &pBeaconStruct->cfParamSet, &beacon.CFParams );
+ ConvertCFParams( pMac, &pBeaconStruct->cfParamSet, &pBeacon->CFParams );
}
- if ( beacon.TIM.present )
+ if ( pBeacon->TIM.present )
{
pBeaconStruct->timPresent = 1;
- ConvertTIM( pMac, &pBeaconStruct->tim, &beacon.TIM );
+ ConvertTIM( pMac, &pBeaconStruct->tim, &pBeacon->TIM );
}
- if ( beacon.Country.present )
+ if ( pBeacon->Country.present )
{
pBeaconStruct->countryInfoPresent = 1;
- ConvertCountry( pMac, &pBeaconStruct->countryInfoParam, &beacon.Country );
+ ConvertCountry( pMac, &pBeaconStruct->countryInfoParam, &pBeacon->Country );
}
// QOS Capabilities:
- if ( beacon.QOSCapsAp.present )
+ if ( pBeacon->QOSCapsAp.present )
{
pBeaconStruct->qosCapabilityPresent = 1;
- ConvertQOSCaps( pMac, &pBeaconStruct->qosCapability, &beacon.QOSCapsAp );
+ ConvertQOSCaps( pMac, &pBeaconStruct->qosCapability, &pBeacon->QOSCapsAp );
}
- if ( beacon.EDCAParamSet.present )
+ if ( pBeacon->EDCAParamSet.present )
{
pBeaconStruct->edcaPresent = 1;
- ConvertEDCAParam( pMac, &pBeaconStruct->edcaParams, &beacon.EDCAParamSet );
+ ConvertEDCAParam( pMac, &pBeaconStruct->edcaParams, &pBeacon->EDCAParamSet );
}
- if ( beacon.ChanSwitchAnn.present )
+ if ( pBeacon->ChanSwitchAnn.present )
{
pBeaconStruct->channelSwitchPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->channelSwitchIE, &beacon.ChanSwitchAnn,
+ palCopyMemory( pMac, &pBeaconStruct->channelSwitchIE, &pBeacon->ChanSwitchAnn,
sizeof(tDot11fIEChanSwitchAnn) );
}
- if ( beacon.ExtChanSwitchAnn.present )
+ if ( pBeacon->ExtChanSwitchAnn.present )
{
pBeaconStruct->extChannelSwitchPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->extChannelSwitchIE, &beacon.ExtChanSwitchAnn,
+ palCopyMemory( pMac, &pBeaconStruct->extChannelSwitchIE, &pBeacon->ExtChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
- if( beacon.TPCReport.present)
+ if( pBeacon->TPCReport.present)
{
pBeaconStruct->tpcReportPresent = 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->tpcReport, &beacon.TPCReport,
+ palCopyMemory(pMac->hHdd, &pBeaconStruct->tpcReport, &pBeacon->TPCReport,
sizeof(tDot11fIETPCReport));
}
- if( beacon.PowerConstraints.present)
+ if( pBeacon->PowerConstraints.present)
{
pBeaconStruct->powerConstraintPresent = 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->localPowerConstraint, &beacon.PowerConstraints,
+ palCopyMemory(pMac->hHdd, &pBeaconStruct->localPowerConstraint, &pBeacon->PowerConstraints,
sizeof(tDot11fIEPowerConstraints));
}
-#if defined FEATURE_WLAN_CCX
- if (beacon.CCXTxmitPower.present)
- {
- palCopyMemory(pMac->hHdd, &pBeaconStruct->ccxTxPwr, &beacon.CCXTxmitPower,
- sizeof(tDot11fIECCXTxmitPower));
- }
- if (beacon.QBSSLoad.present)
- {
- palCopyMemory(pMac->hHdd, &pBeaconStruct->QBSSLoad, &beacon.QBSSLoad, sizeof(tDot11fIEQBSSLoad));
- }
-#endif
- if ( beacon.Quiet.present )
+
+ if ( pBeacon->Quiet.present )
{
pBeaconStruct->quietIEPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->quietIE, &beacon.Quiet, sizeof(tDot11fIEQuiet));
+ palCopyMemory( pMac, &pBeaconStruct->quietIE, &pBeacon->Quiet, sizeof(tDot11fIEQuiet));
}
- if ( beacon.HTCaps.present )
+ if ( pBeacon->HTCaps.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTCaps, &beacon.HTCaps, sizeof( tDot11fIEHTCaps ) );
+ palCopyMemory( pMac, &pBeaconStruct->HTCaps, &pBeacon->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
- if ( beacon.HTInfo.present )
+ if ( pBeacon->HTInfo.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTInfo, &beacon.HTInfo, sizeof( tDot11fIEHTInfo) );
+ palCopyMemory( pMac, &pBeaconStruct->HTInfo, &pBeacon->HTInfo, sizeof( tDot11fIEHTInfo) );
}
- if ( beacon.DSParams.present )
+ if ( pBeacon->DSParams.present )
{
pBeaconStruct->dsParamsPresent = 1;
- pBeaconStruct->channelNumber = beacon.DSParams.curr_channel;
+ pBeaconStruct->channelNumber = pBeacon->DSParams.curr_channel;
}
- else if(beacon.HTInfo.present)
+ else if(pBeacon->HTInfo.present)
{
- pBeaconStruct->channelNumber = beacon.HTInfo.primaryChannel;
+ pBeaconStruct->channelNumber = pBeacon->HTInfo.primaryChannel;
}
else
{
pBeaconStruct->channelNumber = limUnmapChannel(mappedRXCh);
}
- if ( beacon.RSN.present )
+ if ( pBeacon->RSN.present )
{
pBeaconStruct->rsnPresent = 1;
- ConvertRSN( pMac, &pBeaconStruct->rsn, &beacon.RSN );
+ ConvertRSN( pMac, &pBeaconStruct->rsn, &pBeacon->RSN );
}
- if ( beacon.WPA.present )
+ if ( pBeacon->WPA.present )
{
pBeaconStruct->wpaPresent = 1;
- ConvertWPA( pMac, &pBeaconStruct->wpa, &beacon.WPA );
+ ConvertWPA( pMac, &pBeaconStruct->wpa, &pBeacon->WPA );
}
- if ( beacon.WMMParams.present )
+ if ( pBeacon->WMMParams.present )
{
pBeaconStruct->wmeEdcaPresent = 1;
- ConvertWMMParams( pMac, &pBeaconStruct->edcaParams, &beacon.WMMParams );
+ ConvertWMMParams( pMac, &pBeaconStruct->edcaParams, &pBeacon->WMMParams );
PELOG1(limLog(pMac, LOG1, FL("WMM Parameter present in Beacon Frame!\n"));
- __printWMMParams(pMac, &beacon.WMMParams); )
+ __printWMMParams(pMac, &pBeacon->WMMParams); )
}
- if ( beacon.WMMInfoAp.present )
+ if ( pBeacon->WMMInfoAp.present )
{
pBeaconStruct->wmeInfoPresent = 1;
PELOG1(limLog(pMac, LOG1, FL("WMM Info present in Beacon Frame!\n"));)
}
- if ( beacon.WMMCaps.present )
+ if ( pBeacon->WMMCaps.present )
{
pBeaconStruct->wsmCapablePresent = 1;
}
- if ( beacon.ERPInfo.present )
+ if ( pBeacon->ERPInfo.present )
{
pBeaconStruct->erpPresent = 1;
- ConvertERPInfo( pMac, &pBeaconStruct->erpIEInfo, &beacon.ERPInfo );
+ ConvertERPInfo( pMac, &pBeaconStruct->erpIEInfo, &pBeacon->ERPInfo );
}
#ifdef WLAN_FEATURE_VOWIFI_11R
- if (beacon.MobilityDomain.present)
+ if (pBeacon->MobilityDomain.present)
{
// MobilityDomain
pBeaconStruct->mdiePresent = 1;
- palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pBeaconStruct->mdie[0]), (tANI_U8 *)&(beacon.MobilityDomain.MDID), sizeof(tANI_U16) );
- pBeaconStruct->mdie[2] = ((beacon.MobilityDomain.overDSCap << 0) | (beacon.MobilityDomain.resourceReqCap << 1));
+ palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pBeaconStruct->mdie[0]), (tANI_U8 *)&(pBeacon->MobilityDomain.MDID), sizeof(tANI_U16) );
+ pBeaconStruct->mdie[2] = ((pBeacon->MobilityDomain.overDSCap << 0) | (pBeacon->MobilityDomain.resourceReqCap << 1));
}
#endif
#ifdef WLAN_FEATURE_11AC
- if ( beacon.VHTCaps.present )
+ if ( pBeacon->VHTCaps.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTCaps, &beacon.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ palCopyMemory( pMac, &pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
- if ( beacon.VHTOperation.present )
+ if ( pBeacon->VHTOperation.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTOperation, &beacon.VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ palCopyMemory( pMac, &pBeaconStruct->VHTOperation, &pBeacon->VHTOperation, sizeof( tDot11fIEVHTOperation) );
}
- if ( beacon.VHTExtBssLoad.present )
+ if ( pBeacon->VHTExtBssLoad.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTExtBssLoad, &beacon.VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
+ palCopyMemory( pMac, &pBeaconStruct->VHTExtBssLoad, &pBeacon->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
}
#endif
+ palFreeMemory(pMac->hHdd, pBeacon);
return eSIR_SUCCESS;
} // End sirConvertBeaconFrame2Struct.
diff --git a/CORE/SYS/legacy/src/utils/src/utilsApi.c b/CORE/SYS/legacy/src/utils/src/utilsApi.c
index a78345d..004827c 100644
--- a/CORE/SYS/legacy/src/utils/src/utilsApi.c
+++ b/CORE/SYS/legacy/src/utils/src/utilsApi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/SYS/legacy/src/utils/src/utilsParser.c b/CORE/SYS/legacy/src/utils/src/utilsParser.c
index aa5a83c..f63473d 100644
--- a/CORE/SYS/legacy/src/utils/src/utilsParser.c
+++ b/CORE/SYS/legacy/src/utils/src/utilsParser.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/inc/tlDebug.h b/CORE/TL/inc/tlDebug.h
index b99646e..ea6a750 100644
--- a/CORE/TL/inc/tlDebug.h
+++ b/CORE/TL/inc/tlDebug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/inc/wlan_qct_tl.h b/CORE/TL/inc/wlan_qct_tl.h
index a85cbc5..b5ebae6 100644
--- a/CORE/TL/inc/wlan_qct_tl.h
+++ b/CORE/TL/inc/wlan_qct_tl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/src/wlan_qct_tl.c b/CORE/TL/src/wlan_qct_tl.c
index 93b27fb..1a001f4 100644
--- a/CORE/TL/src/wlan_qct_tl.c
+++ b/CORE/TL/src/wlan_qct_tl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -2138,8 +2138,6 @@
{
*pRssi = pTLCb->atlSTAClients[ucSTAId].rssiAvg;
}
- TLLOGE(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_ERROR,
- "WLAN TL:bmpsRssi %d \n",*pRssi));
}
else
{
@@ -2147,7 +2145,9 @@
}
TLLOG2(VOS_TRACE( VOS_MODULE_ID_TL, VOS_TRACE_LEVEL_INFO_HIGH,
- "WLAN TL:WLANTL_GetRssi for STA: %d RSSI: %d", ucSTAId, *puRssi));
+ "WLAN TL:WLANTL_GetRssi for STA: %d RSSI: %d%s",
+ ucSTAId, *pRssi,
+ pTLCb->isBMPS ? " in BMPS" : ""));
return VOS_STATUS_SUCCESS;
}/* WLANTL_GetRssi */
diff --git a/CORE/TL/src/wlan_qct_tl_ba.c b/CORE/TL/src/wlan_qct_tl_ba.c
index f70264f..14b1c60 100644
--- a/CORE/TL/src/wlan_qct_tl_ba.c
+++ b/CORE/TL/src/wlan_qct_tl_ba.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/src/wlan_qct_tl_hosupport.c b/CORE/TL/src/wlan_qct_tl_hosupport.c
index e77bb74..2c3bcde 100644
--- a/CORE/TL/src/wlan_qct_tl_hosupport.c
+++ b/CORE/TL/src/wlan_qct_tl_hosupport.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/src/wlan_qct_tl_hosupport.h b/CORE/TL/src/wlan_qct_tl_hosupport.h
index ca8d8f7..f8fa116 100644
--- a/CORE/TL/src/wlan_qct_tl_hosupport.h
+++ b/CORE/TL/src/wlan_qct_tl_hosupport.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/src/wlan_qct_tli.h b/CORE/TL/src/wlan_qct_tli.h
index 4845331..3089d95 100644
--- a/CORE/TL/src/wlan_qct_tli.h
+++ b/CORE/TL/src/wlan_qct_tli.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/TL/src/wlan_qct_tli_ba.h b/CORE/TL/src/wlan_qct_tli_ba.h
index bdd6e0d..6da8d76 100644
--- a/CORE/TL/src/wlan_qct_tli_ba.h
+++ b/CORE/TL/src/wlan_qct_tli_ba.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/event_defs.h b/CORE/VOSS/inc/event_defs.h
index 5c16138..06f21a5 100644
--- a/CORE/VOSS/inc/event_defs.h
+++ b/CORE/VOSS/inc/event_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_diag_core_event.h b/CORE/VOSS/inc/i_vos_diag_core_event.h
index 0085505..5f0d235 100644
--- a/CORE/VOSS/inc/i_vos_diag_core_event.h
+++ b/CORE/VOSS/inc/i_vos_diag_core_event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_diag_core_log.h b/CORE/VOSS/inc/i_vos_diag_core_log.h
index 90ac438..4ac2bae 100644
--- a/CORE/VOSS/inc/i_vos_diag_core_log.h
+++ b/CORE/VOSS/inc/i_vos_diag_core_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_event.h b/CORE/VOSS/inc/i_vos_event.h
index a51d407..fe69219 100644
--- a/CORE/VOSS/inc/i_vos_event.h
+++ b/CORE/VOSS/inc/i_vos_event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_list.h b/CORE/VOSS/inc/i_vos_list.h
index 603d323..672ebe2 100644
--- a/CORE/VOSS/inc/i_vos_list.h
+++ b/CORE/VOSS/inc/i_vos_list.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_lock.h b/CORE/VOSS/inc/i_vos_lock.h
index a596c3c..b3e5ddb 100644
--- a/CORE/VOSS/inc/i_vos_lock.h
+++ b/CORE/VOSS/inc/i_vos_lock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_packet.h b/CORE/VOSS/inc/i_vos_packet.h
index 9f5ee25..bca6ac2 100644
--- a/CORE/VOSS/inc/i_vos_packet.h
+++ b/CORE/VOSS/inc/i_vos_packet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_timer.h b/CORE/VOSS/inc/i_vos_timer.h
index 8388bfe..be22175 100644
--- a/CORE/VOSS/inc/i_vos_timer.h
+++ b/CORE/VOSS/inc/i_vos_timer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_trace.h b/CORE/VOSS/inc/i_vos_trace.h
index 35d7301..bdd7237 100644
--- a/CORE/VOSS/inc/i_vos_trace.h
+++ b/CORE/VOSS/inc/i_vos_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/i_vos_types.h b/CORE/VOSS/inc/i_vos_types.h
index a039b58..8d646e2 100644
--- a/CORE/VOSS/inc/i_vos_types.h
+++ b/CORE/VOSS/inc/i_vos_types.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/log_codes.h b/CORE/VOSS/inc/log_codes.h
index 2ee2a58..0fcce2b 100644
--- a/CORE/VOSS/inc/log_codes.h
+++ b/CORE/VOSS/inc/log_codes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_api.h b/CORE/VOSS/inc/vos_api.h
index d23a44c..b451716 100644
--- a/CORE/VOSS/inc/vos_api.h
+++ b/CORE/VOSS/inc/vos_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_diag_core_event.h b/CORE/VOSS/inc/vos_diag_core_event.h
index 959a264..647cee2 100644
--- a/CORE/VOSS/inc/vos_diag_core_event.h
+++ b/CORE/VOSS/inc/vos_diag_core_event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_diag_core_log.h b/CORE/VOSS/inc/vos_diag_core_log.h
index 21435b9..fddfb1e 100644
--- a/CORE/VOSS/inc/vos_diag_core_log.h
+++ b/CORE/VOSS/inc/vos_diag_core_log.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_event.h b/CORE/VOSS/inc/vos_event.h
index 515cefa..de4bc23 100644
--- a/CORE/VOSS/inc/vos_event.h
+++ b/CORE/VOSS/inc/vos_event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_getBin.h b/CORE/VOSS/inc/vos_getBin.h
index a9854a2..4228f30 100644
--- a/CORE/VOSS/inc/vos_getBin.h
+++ b/CORE/VOSS/inc/vos_getBin.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_list.h b/CORE/VOSS/inc/vos_list.h
index 17e3f0a..59fcb08 100644
--- a/CORE/VOSS/inc/vos_list.h
+++ b/CORE/VOSS/inc/vos_list.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_lock.h b/CORE/VOSS/inc/vos_lock.h
index 3bfb3e3..d2d1292 100644
--- a/CORE/VOSS/inc/vos_lock.h
+++ b/CORE/VOSS/inc/vos_lock.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_memory.h b/CORE/VOSS/inc/vos_memory.h
index d599a87..7e596a5 100644
--- a/CORE/VOSS/inc/vos_memory.h
+++ b/CORE/VOSS/inc/vos_memory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_mq.h b/CORE/VOSS/inc/vos_mq.h
index 5d997d4..6fdc27f 100644
--- a/CORE/VOSS/inc/vos_mq.h
+++ b/CORE/VOSS/inc/vos_mq.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h
index 74b450c..a503fd0 100644
--- a/CORE/VOSS/inc/vos_nvitem.h
+++ b/CORE/VOSS/inc/vos_nvitem.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_pack_align.h b/CORE/VOSS/inc/vos_pack_align.h
index 1cdceb6..b746358 100644
--- a/CORE/VOSS/inc/vos_pack_align.h
+++ b/CORE/VOSS/inc/vos_pack_align.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_packet.h b/CORE/VOSS/inc/vos_packet.h
index 205a0fd..f5f4157 100644
--- a/CORE/VOSS/inc/vos_packet.h
+++ b/CORE/VOSS/inc/vos_packet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_power.h b/CORE/VOSS/inc/vos_power.h
index 3cb2f2c..bc83911 100644
--- a/CORE/VOSS/inc/vos_power.h
+++ b/CORE/VOSS/inc/vos_power.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_status.h b/CORE/VOSS/inc/vos_status.h
index 4546c0d..24154aa 100644
--- a/CORE/VOSS/inc/vos_status.h
+++ b/CORE/VOSS/inc/vos_status.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_threads.h b/CORE/VOSS/inc/vos_threads.h
index e0173f4..617c5f8 100644
--- a/CORE/VOSS/inc/vos_threads.h
+++ b/CORE/VOSS/inc/vos_threads.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_timer.h b/CORE/VOSS/inc/vos_timer.h
index bb9c02c..6785623 100644
--- a/CORE/VOSS/inc/vos_timer.h
+++ b/CORE/VOSS/inc/vos_timer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_trace.h b/CORE/VOSS/inc/vos_trace.h
index e68bb50..f1cde91 100644
--- a/CORE/VOSS/inc/vos_trace.h
+++ b/CORE/VOSS/inc/vos_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_types.h b/CORE/VOSS/inc/vos_types.h
index 9937389..4bcfc24 100644
--- a/CORE/VOSS/inc/vos_types.h
+++ b/CORE/VOSS/inc/vos_types.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/vos_utils.h b/CORE/VOSS/inc/vos_utils.h
index ae10d13..8b64aee 100644
--- a/CORE/VOSS/inc/vos_utils.h
+++ b/CORE/VOSS/inc/vos_utils.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/inc/wlan_hdd_misc.h b/CORE/VOSS/inc/wlan_hdd_misc.h
index f17abbc..a219b09 100644
--- a/CORE/VOSS/inc/wlan_hdd_misc.h
+++ b/CORE/VOSS/inc/wlan_hdd_misc.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_api.c b/CORE/VOSS/src/vos_api.c
index 00cef2c..e724f9c 100644
--- a/CORE/VOSS/src/vos_api.c
+++ b/CORE/VOSS/src/vos_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_diag.c b/CORE/VOSS/src/vos_diag.c
index 3cd2bfb..a4f2813 100644
--- a/CORE/VOSS/src/vos_diag.c
+++ b/CORE/VOSS/src/vos_diag.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_event.c b/CORE/VOSS/src/vos_event.c
index cb8296d..662f28b 100644
--- a/CORE/VOSS/src/vos_event.c
+++ b/CORE/VOSS/src/vos_event.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -422,12 +422,11 @@
{
long ret;
ret =
- wait_for_completion_interruptible_timeout(&event->complete,
+ wait_for_completion_timeout(&event->complete,
msecs_to_jiffies(timeout));
if ( 0 >= ret )
{
- // 0 means timed out, negative means interrupted
- return VOS_STATUS_E_TIMEOUT;
+ return VOS_STATUS_E_TIMEOUT;
}
}
else
@@ -436,8 +435,8 @@
ret = wait_for_completion_interruptible(&event->complete);
if ( 0 != ret )
{
- // negative means interrupted
- return VOS_STATUS_E_TIMEOUT;
+ // negative means interrupted
+ return VOS_STATUS_E_TIMEOUT;
}
}
diff --git a/CORE/VOSS/src/vos_getBin.c b/CORE/VOSS/src/vos_getBin.c
index 557a54a..ba2427a 100644
--- a/CORE/VOSS/src/vos_getBin.c
+++ b/CORE/VOSS/src/vos_getBin.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_list.c b/CORE/VOSS/src/vos_list.c
index 6696e79..14e6d59 100644
--- a/CORE/VOSS/src/vos_list.c
+++ b/CORE/VOSS/src/vos_list.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_lock.c b/CORE/VOSS/src/vos_lock.c
index 837ef05..27a97aa 100644
--- a/CORE/VOSS/src/vos_lock.c
+++ b/CORE/VOSS/src/vos_lock.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_memory.c b/CORE/VOSS/src/vos_memory.c
index 7080177..a01dc91 100644
--- a/CORE/VOSS/src/vos_memory.c
+++ b/CORE/VOSS/src/vos_memory.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_mq.c b/CORE/VOSS/src/vos_mq.c
index c0dc94e..d6ffd01 100644
--- a/CORE/VOSS/src/vos_mq.c
+++ b/CORE/VOSS/src/vos_mq.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 6ecd555..b18d133 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_packet.c b/CORE/VOSS/src/vos_packet.c
index 3eeaa90..cb7b869 100644
--- a/CORE/VOSS/src/vos_packet.c
+++ b/CORE/VOSS/src/vos_packet.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_power.c b/CORE/VOSS/src/vos_power.c
index f1909e2..27ae423 100644
--- a/CORE/VOSS/src/vos_power.c
+++ b/CORE/VOSS/src/vos_power.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_sched.c b/CORE/VOSS/src/vos_sched.c
index 2b9667a..0b9245f 100644
--- a/CORE/VOSS/src/vos_sched.c
+++ b/CORE/VOSS/src/vos_sched.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_sched.h b/CORE/VOSS/src/vos_sched.h
index 759bb94..c3501ab 100644
--- a/CORE/VOSS/src/vos_sched.h
+++ b/CORE/VOSS/src/vos_sched.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_threads.c b/CORE/VOSS/src/vos_threads.c
index d51fa49..cf1dea3 100644
--- a/CORE/VOSS/src/vos_threads.c
+++ b/CORE/VOSS/src/vos_threads.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_timer.c b/CORE/VOSS/src/vos_timer.c
index 00d4b61..2881ae4 100644
--- a/CORE/VOSS/src/vos_timer.c
+++ b/CORE/VOSS/src/vos_timer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_trace.c b/CORE/VOSS/src/vos_trace.c
index d03bd20..e112325 100644
--- a/CORE/VOSS/src/vos_trace.c
+++ b/CORE/VOSS/src/vos_trace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_types.c b/CORE/VOSS/src/vos_types.c
index fe6aa86..66cad7a 100644
--- a/CORE/VOSS/src/vos_types.c
+++ b/CORE/VOSS/src/vos_types.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/VOSS/src/vos_utils.c b/CORE/VOSS/src/vos_utils.c
index d84c937..4ae4088 100644
--- a/CORE/VOSS/src/vos_utils.c
+++ b/CORE/VOSS/src/vos_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/legacy/halMsgApi.h b/CORE/WDA/inc/legacy/halMsgApi.h
index 0ff8d86..968130a 100644
--- a/CORE/WDA/inc/legacy/halMsgApi.h
+++ b/CORE/WDA/inc/legacy/halMsgApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/legacy/halTypes.h b/CORE/WDA/inc/legacy/halTypes.h
index ad7a02b..aa4496e 100644
--- a/CORE/WDA/inc/legacy/halTypes.h
+++ b/CORE/WDA/inc/legacy/halTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/legacy/palTypes.h b/CORE/WDA/inc/legacy/palTypes.h
index 31a590c..b24aa47 100644
--- a/CORE/WDA/inc/legacy/palTypes.h
+++ b/CORE/WDA/inc/legacy/palTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/legacy/wlan_qct_hal.h b/CORE/WDA/inc/legacy/wlan_qct_hal.h
index 6117279..56272c7 100644
--- a/CORE/WDA/inc/legacy/wlan_qct_hal.h
+++ b/CORE/WDA/inc/legacy/wlan_qct_hal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/wlan_qct_wda.h b/CORE/WDA/inc/wlan_qct_wda.h
index 74fb8ad..9d493dd 100644
--- a/CORE/WDA/inc/wlan_qct_wda.h
+++ b/CORE/WDA/inc/wlan_qct_wda.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/inc/wlan_qct_wda_msg.h b/CORE/WDA/inc/wlan_qct_wda_msg.h
index 952c217..ae83385 100644
--- a/CORE/WDA/inc/wlan_qct_wda_msg.h
+++ b/CORE/WDA/inc/wlan_qct_wda_msg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/src/wlan_nv.c b/CORE/WDA/src/wlan_nv.c
index a03227a..8adf60b 100644
--- a/CORE/WDA/src/wlan_nv.c
+++ b/CORE/WDA/src/wlan_nv.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/src/wlan_qct_wda.c b/CORE/WDA/src/wlan_qct_wda.c
index fd374a5..6d26a05 100644
--- a/CORE/WDA/src/wlan_qct_wda.c
+++ b/CORE/WDA/src/wlan_qct_wda.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -104,7 +104,7 @@
#define WDA_START_TIMER(a) tx_timer_activate(a)
#define WDA_STOP_TIMER(a) tx_timer_deactivate(a)
#define WDA_DESTROY_TIMER(a) tx_timer_delete(a)
-#define WDA_WDI_START_TIMEOUT 15000
+#define WDA_WDI_START_TIMEOUT (WDI_RESPONSE_TIMEOUT + 5000)
#define WDA_LAST_POLLED_THRESHOLD(a, curSta, tid) \
((a)->wdaStaInfo[curSta].framesTxed[tid] + WDA_BA_TX_FRM_THRESHOLD)
@@ -1210,7 +1210,111 @@
*configDataValue = pMac->btc.btcConfig.btcA2DPBtSubIntervalsDuringDhcp;
tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ sizeof(tHalCfg) + tlvStruct->length) ;
- /* [COEX] QWLAN_HAL_CFG_WCNSS_API_VERSION */
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenInqBt;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenPageBt;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenConnBt;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenLeBt;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenInqWlan;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenPageWlan;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenConnWlan;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcStaticLenLeWlan;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcDynMaxLenBt;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcDynMaxLenWlan;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcMaxScoBlockPerc;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcDhcpProtOnA2dp;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* [COEX] QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO */
+ tlvStruct->type = QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO ;
+ tlvStruct->length = sizeof(tANI_U32);
+ configDataValue = (tANI_U32 *)(tlvStruct + 1);
+ *configDataValue = pMac->btc.btcConfig.btcDhcpProtOnSco;
+ tlvStruct = (tHalCfg *)( (tANI_U8 *) tlvStruct
+ + sizeof(tHalCfg) + tlvStruct->length) ;
+
+ /* QWLAN_HAL_CFG_WCNSS_API_VERSION */
tlvStruct->type = QWLAN_HAL_CFG_WCNSS_API_VERSION ;
tlvStruct->length = sizeof(tANI_U32);
configDataValue = (tANI_U32 *)(tlvStruct + 1);
@@ -8940,86 +9044,11 @@
}
case WDA_DELETE_BSS_REQ:
{
- wpt_uint8 staIdx;
- wpt_uint8 bssIdx = ((tDeleteBssParams *)pMsg->bodyptr)->bssIdx;
- wpt_uint8 reservedResourceBySta;
- wpt_uint16 waitLoop = 0;
-
- if (WDI_DS_GetStaIdxFromBssIdx(pWDA->pWdiContext, bssIdx, &staIdx))
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_ERROR,
- "%s: Get STA index from BSS index Fail", __FUNCTION__);
- VOS_ASSERT(0) ;
- }
- while (1)
- {
- reservedResourceBySta = WDI_DS_GetReservedResCountPerSTA(pWDA->pWdiContext, WDI_DATA_POOL_ID, staIdx);
- /* Wait till reserved resource by STA must be none */
- if (reservedResourceBySta == 0)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "STA %d BSS %d TX RING empty %d", staIdx, bssIdx );
- break;
- }
- else
- {
- if(waitLoop > WDA_MAX_RETRIES_TILL_RING_EMPTY)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "TX Ring could not empty, not normal" );
- VOS_ASSERT(0);
- /* STA mode, stall detected, reload driver */
- if(VOS_STA_MODE == vos_get_conparam())
- {
- vos_mem_free(pMsg->bodyptr);
- vos_wlanRestart();
- return VOS_STATUS_E_FAILURE;
- }
- break;
- }
- vos_sleep(WDA_WAIT_MSEC_TILL_RING_EMPTY);
- waitLoop++;
- }
- }
WDA_ProcessDelBssReq(pWDA, (tDeleteBssParams *)pMsg->bodyptr) ;
break ;
}
case WDA_DELETE_STA_REQ:
{
- tDeleteStaParams *delSta = (tDeleteStaParams *)pMsg->bodyptr;
- wpt_uint8 reservedResourceBySta;
- wpt_uint16 waitLoop = 0;
-
- while (1)
- {
- reservedResourceBySta = WDI_DS_GetReservedResCountPerSTA(pWDA->pWdiContext, WDI_DATA_POOL_ID, delSta->staIdx);
- /* Wait till reserved resource by STA must be none */
- if (reservedResourceBySta == 0)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_INFO,
- "STA %d TX RING empty %d", delSta->staIdx );
- break;
- }
- else
- {
- if(waitLoop > WDA_MAX_RETRIES_TILL_RING_EMPTY)
- {
- VOS_TRACE( VOS_MODULE_ID_WDA, VOS_TRACE_LEVEL_FATAL,
- "TX Ring could not empty, not normal" );
- VOS_ASSERT(0);
- /* STA mode, stall detected, reload driver */
- if(VOS_STA_MODE == vos_get_conparam())
- {
- vos_mem_free(pMsg->bodyptr);
- vos_wlanRestart();
- return VOS_STATUS_E_FAILURE;
- }
- break;
- }
- vos_sleep(WDA_WAIT_MSEC_TILL_RING_EMPTY);
- waitLoop++;
- }
- }
WDA_ProcessDelStaReq(pWDA, (tDeleteStaParams *)pMsg->bodyptr) ;
break ;
}
diff --git a/CORE/WDA/src/wlan_qct_wda_debug.c b/CORE/WDA/src/wlan_qct_wda_debug.c
index 13a266e..de89f97 100644
--- a/CORE/WDA/src/wlan_qct_wda_debug.c
+++ b/CORE/WDA/src/wlan_qct_wda_debug.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/src/wlan_qct_wda_debug.h b/CORE/WDA/src/wlan_qct_wda_debug.h
index 0eb74c9..66e367e 100644
--- a/CORE/WDA/src/wlan_qct_wda_debug.h
+++ b/CORE/WDA/src/wlan_qct_wda_debug.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/src/wlan_qct_wda_ds.c b/CORE/WDA/src/wlan_qct_wda_ds.c
index 9d638cd..f48930b 100644
--- a/CORE/WDA/src/wlan_qct_wda_ds.c
+++ b/CORE/WDA/src/wlan_qct_wda_ds.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDA/src/wlan_qct_wda_legacy.c b/CORE/WDA/src/wlan_qct_wda_legacy.c
index eb585c2..92ad5f0 100644
--- a/CORE/WDA/src/wlan_qct_wda_legacy.c
+++ b/CORE/WDA/src/wlan_qct_wda_legacy.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_defs.h b/CORE/WDI/CP/inc/wlan_defs.h
index f5cdb4b..f0350d8 100644
--- a/CORE/WDI/CP/inc/wlan_defs.h
+++ b/CORE/WDI/CP/inc/wlan_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi.h b/CORE/WDI/CP/inc/wlan_qct_wdi.h
index c0768fb..964e435 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_bd.h b/CORE/WDI/CP/inc/wlan_qct_wdi_bd.h
index dd73dcf..4391f3f 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_bd.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_bd.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_cfg.h b/CORE/WDI/CP/inc/wlan_qct_wdi_cfg.h
index 252b111..3e901e6 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_cfg.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h b/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h
index f946867..a19fe6e 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_dp.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
index f5e90e1..268edd4 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_i.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/inc/wlan_qct_wdi_sta.h b/CORE/WDI/CP/inc/wlan_qct_wdi_sta.h
index f0ea7c5..604cd41 100644
--- a/CORE/WDI/CP/inc/wlan_qct_wdi_sta.h
+++ b/CORE/WDI/CP/inc/wlan_qct_wdi_sta.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi.c b/CORE/WDI/CP/src/wlan_qct_wdi.c
index bef4e30..d396273 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi_dp.c b/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
index 5a38e15..36dd780 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi_dp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/CP/src/wlan_qct_wdi_sta.c b/CORE/WDI/CP/src/wlan_qct_wdi_sta.c
index ef53efe..b05dc04 100644
--- a/CORE/WDI/CP/src/wlan_qct_wdi_sta.c
+++ b/CORE/WDI/CP/src/wlan_qct_wdi_sta.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/DP/inc/wlan_qct_wdi_ds.h b/CORE/WDI/DP/inc/wlan_qct_wdi_ds.h
index 2a3bd0c..49e93f8 100644
--- a/CORE/WDI/DP/inc/wlan_qct_wdi_ds.h
+++ b/CORE/WDI/DP/inc/wlan_qct_wdi_ds.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h b/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h
index 482c224..04568b3 100644
--- a/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h
+++ b/CORE/WDI/DP/inc/wlan_qct_wdi_ds_i.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/DP/src/wlan_qct_wdi_bd.c b/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
index b21d305..13ff1dc 100644
--- a/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
+++ b/CORE/WDI/DP/src/wlan_qct_wdi_bd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/DP/src/wlan_qct_wdi_ds.c b/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
index d472c7e..8798d70 100644
--- a/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
+++ b/CORE/WDI/DP/src/wlan_qct_wdi_ds.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h b/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
index 6401340..cca2fc0 100644
--- a/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
+++ b/CORE/WDI/TRP/CTS/inc/wlan_qct_wdi_cts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
index 2fbf63a..6c18496 100644
--- a/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
+++ b/CORE/WDI/TRP/CTS/src/wlan_qct_wdi_cts.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/TRP/DTS/inc/wlan_qct_wdi_dts.h b/CORE/WDI/TRP/DTS/inc/wlan_qct_wdi_dts.h
index c459fa4..fdb7fab 100644
--- a/CORE/WDI/TRP/DTS/inc/wlan_qct_wdi_dts.h
+++ b/CORE/WDI/TRP/DTS/inc/wlan_qct_wdi_dts.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c b/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
index 3ca56fb..16058e3 100644
--- a/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
+++ b/CORE/WDI/TRP/DTS/src/wlan_qct_wdi_dts.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_list.h b/CORE/WDI/WPAL/inc/wlan_qct_os_list.h
index 56161ef..1f58546 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_list.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_list.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_status.h b/CORE/WDI/WPAL/inc/wlan_qct_os_status.h
index 5d544fb..5b0588d 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_status.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_status.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_sync.h b/CORE/WDI/WPAL/inc/wlan_qct_os_sync.h
index f7bb44e..f7256e8 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_sync.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_sync.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_timer.h b/CORE/WDI/WPAL/inc/wlan_qct_os_timer.h
index 80ede5a..1666890 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_timer.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_timer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
index 839e2bb..67f855a 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_os_type.h b/CORE/WDI/WPAL/inc/wlan_qct_os_type.h
index 24a8e1c..bfd9984 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_os_type.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_os_type.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pack_align.h b/CORE/WDI/WPAL/inc/wlan_qct_pack_align.h
index 7b1a350..fb15b2a 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pack_align.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pack_align.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h
index 872a278..1819dfa 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_device.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_device.h
index c7e395e..f649615 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_device.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_device.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_list.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_list.h
index fff0aa1..ed82e71 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_list.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_list.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_msg.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_msg.h
index 34f1cce..0244861 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_msg.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_msg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h
index 17ae26c..7691c12 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_packet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_status.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_status.h
index 9cf532a..e27cc6d 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_status.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_status.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_sync.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_sync.h
index 14158ba..b954db7 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_sync.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_sync.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
index 7bdcff7..db1a0ba 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_timer.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h
index 612e704..7623fda 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_trace.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/inc/wlan_qct_pal_type.h b/CORE/WDI/WPAL/inc/wlan_qct_pal_type.h
index e8affb4..4ecfeda 100644
--- a/CORE/WDI/WPAL/inc/wlan_qct_pal_type.h
+++ b/CORE/WDI/WPAL/inc/wlan_qct_pal_type.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_api.c b/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
index b2cb276..beee761 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
index c846fea..168b968 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_device.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c b/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
index 64d168f..999ac2e 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_msg.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c b/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
index 98916ac..07dc4d9 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_packet.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_sync.c b/CORE/WDI/WPAL/src/wlan_qct_pal_sync.c
index 28f86f1..0af6282 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_sync.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_sync.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
index 78eecf6..de7a3c3 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_timer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c b/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
index eba3942..0e8b9aa 100644
--- a/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
+++ b/CORE/WDI/WPAL/src/wlan_qct_pal_trace.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/halCompiler.h b/riva/inc/halCompiler.h
index 2ae5226..263ec52 100644
--- a/riva/inc/halCompiler.h
+++ b/riva/inc/halCompiler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/halLegacyPalTypes.h b/riva/inc/halLegacyPalTypes.h
index 70fcaba..057c8ca 100644
--- a/riva/inc/halLegacyPalTypes.h
+++ b/riva/inc/halLegacyPalTypes.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/pttFrameGen.h b/riva/inc/pttFrameGen.h
index abff9d8..a3d1765 100644
--- a/riva/inc/pttFrameGen.h
+++ b/riva/inc/pttFrameGen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/pttModule.h b/riva/inc/pttModule.h
index 3c07780..362d8f7 100644
--- a/riva/inc/pttModule.h
+++ b/riva/inc/pttModule.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/pttMsgApi.h b/riva/inc/pttMsgApi.h
index 8809c9d..ecb478c 100644
--- a/riva/inc/pttMsgApi.h
+++ b/riva/inc/pttMsgApi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/wlan_hal_cfg.h b/riva/inc/wlan_hal_cfg.h
index e7dca61..d665bde 100644
--- a/riva/inc/wlan_hal_cfg.h
+++ b/riva/inc/wlan_hal_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -135,11 +135,24 @@
#define QWLAN_HAL_CFG_AP_KEEPALIVE_TIMEOUT 81
#define QWLAN_HAL_CFG_GO_KEEPALIVE_TIMEOUT 82
#define QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST 83
-#define QWLAN_HAL_CFG_MAX_PARAMS 84
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT 84
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT 85
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT 86
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT 87
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN 88
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN 89
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN 90
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN 91
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT 92
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN 93
+#define QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC 94
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP 95
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO 96
+#define QWLAN_HAL_CFG_MAX_PARAMS 97
/* Total number of Integer CFGs. This is used while allocating the memory for TLV */
-#define QWLAN_HAL_CFG_INTEGER_PARAM 80
+#define QWLAN_HAL_CFG_INTEGER_PARAM 93
/*-------------------------------------------------------------------------
@@ -615,7 +628,7 @@
/* QWLAN_HAL_CFG_WCNSS_API_VERSION */
#define QWLAN_HAL_CFG_WCNSS_API_VERSION_MIN 0 /* equivalent to 0.0.0.0 */
-#define QWLAN_HAL_CFG_WCNSS_API_VERSION_MAX 4294967295 /* equivalent to 255.255.255.255 */
+#define QWLAN_HAL_CFG_WCNSS_API_VERSION_MAX 4294967295U /* equivalent to 255.255.255.255 */
#define QWLAN_HAL_CFG_WCNSS_API_VERSION_DEF 0 /* equivalent to 0.0.0.0 */
/* QWLAN_HAL_CFG_AP_KEEPALIVE_TIMEOUT */
@@ -633,6 +646,71 @@
#define QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST_MAX 1
#define QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST_DEF 0
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT_MIN 5000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT_DEF 120000
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT_MIN 5000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT_DEF 10000
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT_MIN 5000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT_DEF 10000
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT_MIN 5000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT_DEF 10000
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN_MIN 0
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN_DEF 30000
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN_MIN 0
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN_DEF 0
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN_MIN 0
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN_DEF 0
+
+/* QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN */
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN_MIN 0
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN_MAX 500000
+#define QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN_DEF 0
+
+/* QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT */
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT_MIN 25000
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT_MAX 500000
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT_DEF 250000
+
+/* QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN */
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN_MIN 15000
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN_MAX 500000
+#define QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN_DEF 45000
+
+/* QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC */
+#define QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC_MIN 0
+#define QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC_MAX 100
+#define QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC_DEF 1
+
+/* QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP */
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP_MIN 0
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP_MAX 1
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP_DEF 1
+
+/* QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO */
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO_MIN 0
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO_MAX 1
+#define QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO_DEF 0
+
typedef struct
{
uint8 cfgStaId[QCOM_WLAN_CFG_STA_ID_LEN]; //QWLAN_HAL_CFG_STA_ID
@@ -720,6 +798,19 @@
uint32 cfgApKeepAliveTimeout; //QWLAN_HAL_CFG_AP_KEEPALIVE_TIMEOUT
uint32 cfgGoKeepAliveTimeout; //QWLAN_HAL_CFG_GO_KEEPALIVE_TIMEOUT
uint32 cfgEnableMCAddrList; //QWLAN_HAL_CFG_ENABLE_MC_ADDR_LIST
+ uint32 cfgBtcStaticLenInqBt; //QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_BT
+ uint32 cfgBtcStaticLenPageBt; //QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_BT
+ uint32 cfgBtcStaticLenConnBt; //QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_BT
+ uint32 cfgBtcStaticLenLeBt; //QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_BT
+ uint32 cfgBtcStaticLenInqWlan; //QWLAN_HAL_CFG_BTC_STATIC_LEN_INQ_WLAN
+ uint32 cfgBtcStaticLenPageWlan; //QWLAN_HAL_CFG_BTC_STATIC_LEN_PAGE_WLAN
+ uint32 cfgBtcStaticLenConnWlan; //QWLAN_HAL_CFG_BTC_STATIC_LEN_CONN_WLAN
+ uint32 cfgBtcStaticLenLeWlan; //QWLAN_HAL_CFG_BTC_STATIC_LEN_LE_WLAN
+ uint32 cfgBtcDynMaxLenBt; //QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_BT
+ uint32 cfgBtcDynMaxLenWlan; //QWLAN_HAL_CFG_BTC_DYN_MAX_LEN_WLAN
+ uint32 cfgBtcMaxScoBlockPerc; //QWLAN_HAL_CFG_BTC_MAX_SCO_BLOCK_PERC
+ uint32 cfgBtcDhcpProtOnA2dp; //QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_A2DP
+ uint32 cfgBtcDhcpProtOnSco; //QWLAN_HAL_CFG_BTC_DHCP_PROT_ON_SCO
}tAniHalCfg, *tpAniHalCfg;
#endif //__WLAN_HAL_CFG_H__
diff --git a/riva/inc/wlan_hal_msg.h b/riva/inc/wlan_hal_msg.h
index 4234c32..8da0434 100644
--- a/riva/inc/wlan_hal_msg.h
+++ b/riva/inc/wlan_hal_msg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -27,7 +27,7 @@
*
* @author: Kumar Anand
*
- * Copyright (C) 2010, Qualcomm, Inc.
+ * Copyright (C) 2010, Qualcomm, Inc.
* All rights reserved.
*
*=========================================================================*/
@@ -82,9 +82,9 @@
#define WLAN_HAL_BSS_INVALID_IDX 0xFF
//Default Beacon template size
-#define BEACON_TEMPLATE_SIZE 0x180
+#define BEACON_TEMPLATE_SIZE 0x180
-//Param Change Bitmap sent to HAL
+//Param Change Bitmap sent to HAL
#define PARAM_BCN_INTERVAL_CHANGED (1 << 0)
#define PARAM_SHORT_PREAMBLE_CHANGED (1 << 1)
#define PARAM_SHORT_SLOT_TIME_CHANGED (1 << 2)
@@ -106,7 +106,7 @@
#define WLAN_HAL_VERSION_LENGTH 64
/* Message types for messages exchanged between WDI and HAL */
-typedef enum
+typedef enum
{
//Init/De-Init
WLAN_HAL_START_REQ = 0,
@@ -176,7 +176,7 @@
WLAN_HAL_MIC_FAILURE_IND = 52,
WLAN_HAL_FATAL_ERROR_IND = 53,
WLAN_HAL_SET_KEYDONE_MSG = 54,
-
+
//NV Interface
WLAN_HAL_DOWNLOAD_NV_REQ = 55,
WLAN_HAL_DOWNLOAD_NV_RSP = 56,
@@ -195,11 +195,11 @@
WLAN_HAL_DELETE_STA_CONTEXT_IND = 67,
WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_REQ = 68,
WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_RSP = 69,
-
+
// PTT interface support
WLAN_HAL_PROCESS_PTT_REQ = 70,
WLAN_HAL_PROCESS_PTT_RSP = 71,
-
+
// BTAMP related events
WLAN_HAL_SIGNAL_BTAMP_EVENT_REQ = 72,
WLAN_HAL_SIGNAL_BTAMP_EVENT_RSP = 73,
@@ -258,7 +258,7 @@
//P2P WLAN_FEATURE_P2P
WLAN_HAL_SET_P2P_GONOA_REQ = 119,
WLAN_HAL_SET_P2P_GONOA_RSP = 120,
-
+
//WLAN Dump commands
WLAN_HAL_DUMP_COMMAND_REQ = 121,
WLAN_HAL_DUMP_COMMAND_RSP = 122,
@@ -278,7 +278,7 @@
// Coex Indication
WLAN_HAL_COEX_IND = 129,
- // Tx Complete Indication
+ // Tx Complete Indication
WLAN_HAL_OTA_TX_COMPL_IND = 130,
//Host Suspend/resume messages
@@ -292,7 +292,7 @@
WLAN_HAL_GET_TX_POWER_RSP = 137,
WLAN_HAL_P2P_NOA_ATTR_IND = 138,
-
+
WLAN_HAL_ENABLE_RADAR_DETECT_REQ = 139,
WLAN_HAL_ENABLE_RADAR_DETECT_RSP = 140,
WLAN_HAL_GET_TPC_REPORT_REQ = 141,
@@ -300,7 +300,7 @@
WLAN_HAL_RADAR_DETECT_IND = 143,
WLAN_HAL_RADAR_DETECT_INTR_IND = 144,
WLAN_HAL_KEEP_ALIVE_REQ = 145,
- WLAN_HAL_KEEP_ALIVE_RSP = 146,
+ WLAN_HAL_KEEP_ALIVE_RSP = 146,
/*PNO messages*/
WLAN_HAL_SET_PREF_NETWORK_REQ = 147,
@@ -309,25 +309,25 @@
WLAN_HAL_SET_RSSI_FILTER_RSP = 150,
WLAN_HAL_UPDATE_SCAN_PARAM_REQ = 151,
WLAN_HAL_UPDATE_SCAN_PARAM_RSP = 152,
- WLAN_HAL_PREF_NETW_FOUND_IND = 153,
+ WLAN_HAL_PREF_NETW_FOUND_IND = 153,
WLAN_HAL_SET_TX_PER_TRACKING_REQ = 154,
WLAN_HAL_SET_TX_PER_TRACKING_RSP = 155,
WLAN_HAL_TX_PER_HIT_IND = 156,
-
+
WLAN_HAL_8023_MULTICAST_LIST_REQ = 157,
- WLAN_HAL_8023_MULTICAST_LIST_RSP = 158,
+ WLAN_HAL_8023_MULTICAST_LIST_RSP = 158,
WLAN_HAL_SET_PACKET_FILTER_REQ = 159,
- WLAN_HAL_SET_PACKET_FILTER_RSP = 160,
+ WLAN_HAL_SET_PACKET_FILTER_RSP = 160,
WLAN_HAL_PACKET_FILTER_MATCH_COUNT_REQ = 161,
- WLAN_HAL_PACKET_FILTER_MATCH_COUNT_RSP = 162,
+ WLAN_HAL_PACKET_FILTER_MATCH_COUNT_RSP = 162,
WLAN_HAL_CLEAR_PACKET_FILTER_REQ = 163,
- WLAN_HAL_CLEAR_PACKET_FILTER_RSP = 164,
- /*This is temp fix. Should be removed once
+ WLAN_HAL_CLEAR_PACKET_FILTER_RSP = 164,
+ /*This is temp fix. Should be removed once
* Host and Riva code is in sync*/
WLAN_HAL_INIT_SCAN_CON_REQ = 165,
-
+
WLAN_HAL_SET_POWER_PARAMS_REQ = 166,
WLAN_HAL_SET_POWER_PARAMS_RSP = 167,
@@ -336,7 +336,7 @@
// wake reason indication (WOW)
WLAN_HAL_WAKE_REASON_IND = 170,
- // GTK offload support
+ // GTK offload support
WLAN_HAL_GTK_OFFLOAD_REQ = 171,
WLAN_HAL_GTK_OFFLOAD_RSP = 172,
WLAN_HAL_GTK_OFFLOAD_GETINFO_REQ = 173,
@@ -361,7 +361,7 @@
}tHalHostMsgVersion;
/* Enumeration for Boolean - False/True, On/Off */
-typedef enum tagAniBoolean
+typedef enum tagAniBoolean
{
eANI_BOOLEAN_FALSE = 0,
eANI_BOOLEAN_TRUE,
@@ -506,9 +506,7 @@
eSIR_TX_ONLY,
eSIR_RX_ONLY,
eSIR_TX_RX,
-#ifdef WLAN_SOFTAP_FEATURE
eSIR_TX_DEFAULT,
-#endif
eSIR_DONOT_USE_KEY_DIRECTION = WLAN_HAL_MAX_ENUM_SIZE
} tAniKeyDirection;
@@ -532,7 +530,7 @@
eSIR_LINK_BTAMP_POSTASSOC_STATE = 6,
eSIR_LINK_BTAMP_AP_STATE = 7,
eSIR_LINK_BTAMP_STA_STATE = 8,
-
+
/* Reserved for HAL Internal Use */
eSIR_LINK_LEARN_STATE = 9,
eSIR_LINK_SCAN_STATE = 10,
@@ -556,7 +554,7 @@
}eHalStatsMask;
/* BT-AMP events type */
-typedef enum
+typedef enum
{
BTAMP_EVENT_CONNECTION_START,
BTAMP_EVENT_CONNECTION_STOP,
@@ -622,18 +620,14 @@
tAniEdType encType;
/*STATIC/DYNAMIC - valid only for WEP*/
- tAniWepType wepType;
+ tAniWepType wepType;
/*Default WEP key, valid only for static WEP, must between 0 and 3.*/
tANI_U8 defWEPIdx;
-#ifdef WLAN_SOFTAP_FEATURE
/* valid only for non-static WEP encyrptions */
- tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
-#else
- tSirKeys key;
-#endif
-
+ tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
+
/*Control for Replay Count, 1= Single TID based replay count on Tx
0 = Per TID based replay count on TX */
tANI_U8 singleTidRc;
@@ -657,7 +651,7 @@
* in shared header file between UMAC and HAL.*/
tANI_U16 uCfgId;
- /* Length of the Cfg. This parameter is used to go to next cfg
+ /* Length of the Cfg. This parameter is used to go to next cfg
* in the TLV format.*/
tANI_U16 uCfgLen;
@@ -683,8 +677,8 @@
/*Length of the config buffer*/
tANI_U32 uConfigBufferLen;
- /* Following this there is a TLV formatted buffer of length
- * "uConfigBufferLen" bytes containing all config values.
+ /* Following this there is a TLV formatted buffer of length
+ * "uConfigBufferLen" bytes containing all config values.
* The TLV is expected to be formatted like this:
* 0 15 31 31+CFG_LEN-1 length-1
* | CFG_ID | CFG_LEN | CFG_BODY | CFG_ID |......|
@@ -774,8 +768,8 @@
/* Length of the config buffer. Allows UMAC to update multiple CFGs */
tANI_U32 uConfigBufferLen;
- /* Following this there is a TLV formatted buffer of length
- * "uConfigBufferLen" bytes containing all config values.
+ /* Following this there is a TLV formatted buffer of length
+ * "uConfigBufferLen" bytes containing all config values.
* The TLV is expected to be formatted like this:
* 0 15 31 31+CFG_LEN-1 length-1
* | CFG_ID | CFG_LEN | CFG_BODY | CFG_ID |......|
@@ -898,7 +892,7 @@
frameType.*/
tANI_U8 frameLength;
- /* Following the framelength there is a MAC frame buffer if frameLength
+ /* Following the framelength there is a MAC frame buffer if frameLength
is non-zero. */
tSirMacMgmtHdr macMgmtHdr;
@@ -935,7 +929,7 @@
frameType.*/
tANI_U8 frameLength;
- /* Following the framelength there is a MAC frame buffer if frameLength
+ /* Following the framelength there is a MAC frame buffer if frameLength
is non-zero. */
tSirMacMgmtHdr macMgmtHdr;
@@ -978,7 +972,7 @@
WLAN_HAL_START_SCAN_REQ
---------------------------------------------------------------------------*/
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
/*Indicates the channel to scan*/
tANI_U8 scanChannel;
@@ -1079,9 +1073,9 @@
macMgmtHdr. If zero, HAL will generate the appropriate MAC frame based on
frameType.*/
tANI_U8 frameLength;
-
- /*Following the framelength there is a MAC frame buffer if frameLength
- is non-zero.*/
+
+ /*Following the framelength there is a MAC frame buffer if frameLength
+ is non-zero.*/
tSirMacMgmtHdr macMgmtHdr;
/*Entry to hold number of active BSS idx's*/
@@ -1189,7 +1183,7 @@
/*RIFS mode 0 - NA, 1 - Allowed */
tANI_U8 rifsMode;
- /*L-SIG TXOP Protection mechanism
+ /*L-SIG TXOP Protection mechanism
0 - No Support, 1 - Supported
SG - there is global field */
tANI_U8 lsigTxopProtection;
@@ -1382,8 +1376,8 @@
/* The unicast encryption type in the association */
tANI_U32 encryptType;
-
- /*HAL should update the existing STA entry, if this flag is set. UMAC
+
+ /*HAL should update the existing STA entry, if this flag is set. UMAC
will set this flag in case of RE-ASSOC, where we want to reuse the old
STA ID. 0 = Add, 1 = Update*/
tANI_U8 action;
@@ -1405,10 +1399,10 @@
/*Delayed BA Support*/
tANI_U8 delayedBASupport;
-
+
/*Max AMPDU duration in 32us*/
tANI_U8 us32MaxAmpduDuration;
-
+
/*HT STA should set it to 1 if it is enabled in BSS. HT STA should set
it to 0 if AP does not support it. This indication is sent to HAL and
HAL uses this flag to pickup up appropriate 40Mhz rates.*/
@@ -1461,7 +1455,7 @@
/* DPU Index for PTK */
tANI_U8 dpuIndex;
- /* DPU Index for GTK */
+ /* DPU Index for GTK */
tANI_U8 bcastDpuIndex;
/*DPU Index for IGTK */
@@ -1491,7 +1485,7 @@
---------------------------------------------------------------------------*/
/* Delete STA Request params */
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
/* Index of STA to delete */
tANI_U8 staIdx;
@@ -1509,7 +1503,7 @@
---------------------------------------------------------------------------*/
/* Delete STA Response Params */
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
/*success or failure */
tANI_U32 status;
@@ -1581,8 +1575,8 @@
// Concurrency role. These are generic IDs that identify the various roles
// in the software system.
typedef enum {
- HAL_STA_MODE=0,
- HAL_STA_SAP_MODE=1, // to support softAp mode . This is misleading. It means AP MODE only.
+ HAL_STA_MODE=0,
+ HAL_STA_SAP_MODE=1, // to support softAp mode . This is misleading. It means AP MODE only.
HAL_P2P_CLIENT_MODE,
HAL_P2P_GO_MODE,
HAL_MONITOR_MODE,
@@ -1595,7 +1589,7 @@
//bit 3 - p2p go mode
typedef enum
{
- HAL_STA=1,
+ HAL_STA=1,
HAL_SAP=2,
HAL_STA_SAP=3, //to support sta, softAp mode . This means STA+AP mode
HAL_P2P_CLIENT=4,
@@ -1608,10 +1602,8 @@
/* BSSID */
tSirMacAddr bssId;
-#ifdef HAL_SELF_STA_PER_BSS
/* Self Mac Address */
tSirMacAddr selfMacAddr;
-#endif
/* BSS type */
tSirBssType bssType;
@@ -1746,10 +1738,8 @@
/* BSSID */
tSirMacAddr bssId;
-#ifdef HAL_SELF_STA_PER_BSS
/* Self Mac Address */
tSirMacAddr selfMacAddr;
-#endif
/* BSS type */
tSirBssType bssType;
@@ -1836,14 +1826,14 @@
/* To Enable Disable FW Proxy Probe Resp */
tANI_U8 bProxyProbeRespEn;
- /* Boolean to indicate if EDCA params are valid. UMAC might not have valid
- EDCA params or might not desire to apply EDCA params during config BSS.
+ /* Boolean to indicate if EDCA params are valid. UMAC might not have valid
+ EDCA params or might not desire to apply EDCA params during config BSS.
0 implies Not Valid ; Non-Zero implies valid*/
tANI_U8 edcaParamsValid;
/*EDCA Parameters for Best Effort Access Category*/
tSirMacEdcaParamRecord acbe;
-
+
/*EDCA Parameters forBackground Access Category*/
tSirMacEdcaParamRecord acbk;
@@ -1858,9 +1848,9 @@
tSetStaKeyParams extSetStaKeyParam; //SetStaKeyParams for ext bss msg
#endif
- /* Persona for the BSS can be STA,AP,GO,CLIENT value same as tHalConMode */
+ /* Persona for the BSS can be STA,AP,GO,CLIENT value same as tHalConMode */
tANI_U8 halPersona;
-
+
tANI_U8 bSpectrumMgtEnable;
/*HAL fills in the tx power used for mgmt frames in txMgmtPower*/
@@ -1872,7 +1862,7 @@
On AP - Add the AP itself in an "STA context"
On STA - Add the AP to which this STA is joining in an "STA context" */
tConfigStaParams_V1 staContext;
-
+
tANI_U8 vhtCapable;
tANI_U8 vhtTxChannelWidthSet;
} tConfigBssParams_V1, * tpConfigBssParams_V1;
@@ -1983,14 +1973,14 @@
typedef PACKED_PRE struct PACKED_POST
{
/*Indicates the BSSID to which STA is going to associate*/
- tSirMacAddr bssId;
+ tSirMacAddr bssId;
/*Indicates the channel to switch to.*/
tANI_U8 ucChannel;
/* Self STA MAC */
tSirMacAddr selfStaMacAddr;
-
+
/*Local power constraint*/
tANI_U8 ucLocalPowerConstraint;
@@ -2083,7 +2073,7 @@
/*Array of keys.*/
tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
-
+
/*Control for Replay Count, 1= Single TID based replay count on Tx
0 = Per TID based replay count on TX */
tANI_U8 singleTidRc;
@@ -2155,7 +2145,7 @@
{
/*BSS Index of the BSS*/
tANI_U8 bssIdx;
-
+
/*Encryption Type used with peer*/
tAniEdType encType;
@@ -2298,7 +2288,7 @@
/* Max TX power */
tPowerdBm maxTxPower;
-
+
/* Self STA MAC */
tSirMacAddr selfStaMacAddr;
@@ -2310,7 +2300,7 @@
* by way of ignoring if using new host/old FW or old host/new FW since it is at the end of this struct
*/
tSirMacAddr bssId;
-
+
}tSwitchChannelParams, *tpSwitchChannelParams;
typedef PACKED_PRE struct PACKED_POST
@@ -2336,7 +2326,7 @@
/* BSSID needed to identify session - same as in request*/
tSirMacAddr bssId;
-
+
}tSwitchChannelRspParams, *tpSwitchChannelRspParams;
typedef PACKED_PRE struct PACKED_POST
@@ -2355,11 +2345,11 @@
tANI_U16 bssIdx;
/* Best Effort */
- tSirMacEdcaParamRecord acbe;
+ tSirMacEdcaParamRecord acbe;
/* Background */
tSirMacEdcaParamRecord acbk;
-
+
/* Video */
tSirMacEdcaParamRecord acvi;
@@ -2402,10 +2392,10 @@
/* Encryption mode */
tANI_U8 encMode;
-
+
/* status */
tANI_U32 status;
-
+
/* Statistics */
tANI_U32 sendBlocks;
tANI_U32 recvBlocks;
@@ -2443,20 +2433,20 @@
tANI_U32 multiple_retry_cnt[4]; //The number of MSDU packets and MMPDU frames per AC that the 802.11
// station successfully transmitted after more than one retransmission attempt
- tANI_U32 tx_frm_cnt[4]; //Total number of packets(per AC) that were successfully transmitted
- //(with and without retries, including multi-cast, broadcast)
- tANI_U32 rx_frm_cnt; //Total number of packets that were successfully received
- //(after appropriate filter rules including multi-cast, broadcast)
+ tANI_U32 tx_frm_cnt[4]; //Total number of packets(per AC) that were successfully transmitted
+ //(with and without retries, including multi-cast, broadcast)
+ tANI_U32 rx_frm_cnt; //Total number of packets that were successfully received
+ //(after appropriate filter rules including multi-cast, broadcast)
tANI_U32 frm_dup_cnt; //Total number of duplicate frames received successfully
tANI_U32 fail_cnt[4]; //Total number packets(per AC) failed to transmit
tANI_U32 rts_fail_cnt; //Total number of RTS/CTS sequence failures for transmission of a packet
tANI_U32 ack_fail_cnt; //Total number packets failed transmit because of no ACK from the remote entity
- tANI_U32 rts_succ_cnt; //Total number of RTS/CTS sequence success for transmission of a packet
- tANI_U32 rx_discard_cnt; //The sum of the receive error count and dropped-receive-buffer error count.
+ tANI_U32 rts_succ_cnt; //Total number of RTS/CTS sequence success for transmission of a packet
+ tANI_U32 rx_discard_cnt; //The sum of the receive error count and dropped-receive-buffer error count.
//HAL will provide this as a sum of (FCS error) + (Fail get BD/PDU in HW)
tANI_U32 rx_error_cnt; //The receive error count. HAL will provide the RxP FCS error global counter.
- tANI_U32 tx_byte_cnt; //The sum of the transmit-directed byte count, transmit-multicast byte count
- //and transmit-broadcast byte count. HAL will sum TPE UC/MC/BCAST global counters
+ tANI_U32 tx_byte_cnt; //The sum of the transmit-directed byte count, transmit-multicast byte count
+ //and transmit-broadcast byte count. HAL will sum TPE UC/MC/BCAST global counters
//to provide this.
}tAniSummaryStatsInfo, *tpAniSummaryStatsInfo;
@@ -2474,50 +2464,50 @@
typedef PACKED_PRE struct PACKED_POST
{
- tANI_U32 rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets
+ tANI_U32 rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets
//or MMPDU frames
- tANI_U32 promiscuous_rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets
+ tANI_U32 promiscuous_rx_frag_cnt; //The number of MPDU frames received by the 802.11 station for MSDU packets
//or MMPDU frames when a promiscuous packet filter was enabled
- tANI_U32 rx_input_sensitivity; //The receiver input sensitivity referenced to a FER of 8% at an MPDU length
- //of 1024 bytes at the antenna connector. Each element of the array shall correspond
+ tANI_U32 rx_input_sensitivity; //The receiver input sensitivity referenced to a FER of 8% at an MPDU length
+ //of 1024 bytes at the antenna connector. Each element of the array shall correspond
//to a supported rate and the order shall be the same as the supporteRates parameter.
- tANI_U32 max_pwr; //The maximum transmit power in dBm upto one decimal.
- //for eg: if it is 10.5dBm, the value would be 105
- tANI_U32 sync_fail_cnt; //Number of times the receiver failed to synchronize with the incoming signal
- //after detecting the sync in the preamble of the transmitted PLCP protocol data unit.
+ tANI_U32 max_pwr; //The maximum transmit power in dBm upto one decimal.
+ //for eg: if it is 10.5dBm, the value would be 105
+ tANI_U32 sync_fail_cnt; //Number of times the receiver failed to synchronize with the incoming signal
+ //after detecting the sync in the preamble of the transmitted PLCP protocol data unit.
- tANI_U32 tx_rate; //Legacy transmit rate, in units of 500 kbit/sec, for the most
- //recently transmitted frame
+ tANI_U32 tx_rate; //Legacy transmit rate, in units of 500 kbit/sec, for the most
+ //recently transmitted frame
tANI_U32 mcs_index; //mcs index for HT20 and HT40 rates
- tANI_U32 tx_rate_flags; //to differentiate between HT20 and
- //HT40 rates; short and long guard interval
+ tANI_U32 tx_rate_flags; //to differentiate between HT20 and
+ //HT40 rates; short and long guard interval
}tAniGlobalClassAStatsInfo, *tpAniGlobalClassAStatsInfo;
typedef PACKED_PRE struct PACKED_POST
{
- tANI_U32 rx_wep_unencrypted_frm_cnt; //The number of unencrypted received MPDU frames that the MAC layer discarded when
- //the IEEE 802.11 dot11ExcludeUnencrypted management information base (MIB) object
+ tANI_U32 rx_wep_unencrypted_frm_cnt; //The number of unencrypted received MPDU frames that the MAC layer discarded when
+ //the IEEE 802.11 dot11ExcludeUnencrypted management information base (MIB) object
//is enabled
- tANI_U32 rx_mic_fail_cnt; //The number of received MSDU packets that that the 802.11 station discarded
+ tANI_U32 rx_mic_fail_cnt; //The number of received MSDU packets that that the 802.11 station discarded
//because of MIC failures
- tANI_U32 tkip_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt
+ tANI_U32 tkip_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt
//because of a TKIP ICV error
- tANI_U32 aes_ccmp_format_err; //The number of received MPDU frames that the 802.11 discarded because of an
+ tANI_U32 aes_ccmp_format_err; //The number of received MPDU frames that the 802.11 discarded because of an
//invalid AES-CCMP format
- tANI_U32 aes_ccmp_replay_cnt; //The number of received MPDU frames that the 802.11 station discarded because of
+ tANI_U32 aes_ccmp_replay_cnt; //The number of received MPDU frames that the 802.11 station discarded because of
//the AES-CCMP replay protection procedure
- tANI_U32 aes_ccmp_decrpt_err; //The number of received MPDU frames that the 802.11 station discarded because of
+ tANI_U32 aes_ccmp_decrpt_err; //The number of received MPDU frames that the 802.11 station discarded because of
//errors detected by the AES-CCMP decryption algorithm
- tANI_U32 wep_undecryptable_cnt; //The number of encrypted MPDU frames received for which a WEP decryption key was
+ tANI_U32 wep_undecryptable_cnt; //The number of encrypted MPDU frames received for which a WEP decryption key was
//not available on the 802.11 station
- tANI_U32 wep_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt
+ tANI_U32 wep_icv_err; //The number of encrypted MPDU frames that the 802.11 station failed to decrypt
//because of a WEP ICV error
- tANI_U32 rx_decrypt_succ_cnt; //The number of received encrypted packets that the 802.11 station successfully
+ tANI_U32 rx_decrypt_succ_cnt; //The number of received encrypted packets that the 802.11 station successfully
//decrypted
tANI_U32 rx_decrypt_fail_cnt; //The number of encrypted packets that the 802.11 station failed to decrypt
}tAniGlobalSecurityStats, *tpAniGlobalSecurityStats;
-
+
typedef PACKED_PRE struct PACKED_POST
{
tAniGlobalSecurityStats ucStats;
@@ -2526,26 +2516,26 @@
typedef PACKED_PRE struct PACKED_POST
{
- tANI_U32 rx_amsdu_cnt; //This counter shall be incremented for a received A-MSDU frame with the stations
- //MAC address in the address 1 field or an A-MSDU frame with a group address in the
+ tANI_U32 rx_amsdu_cnt; //This counter shall be incremented for a received A-MSDU frame with the stations
+ //MAC address in the address 1 field or an A-MSDU frame with a group address in the
//address 1 field
tANI_U32 rx_ampdu_cnt; //This counter shall be incremented when the MAC receives an AMPDU from the PHY
- tANI_U32 tx_20_frm_cnt; //This counter shall be incremented when a Frame is transmitted only on the
+ tANI_U32 tx_20_frm_cnt; //This counter shall be incremented when a Frame is transmitted only on the
//primary channel
tANI_U32 rx_20_frm_cnt; //This counter shall be incremented when a Frame is received only on the primary channel
- tANI_U32 rx_mpdu_in_ampdu_cnt; //This counter shall be incremented by the number of MPDUs received in the A-MPDU
+ tANI_U32 rx_mpdu_in_ampdu_cnt; //This counter shall be incremented by the number of MPDUs received in the A-MPDU
//when an A-MPDU is received
- tANI_U32 ampdu_delimiter_crc_err; //This counter shall be incremented when an MPDU delimiter has a CRC error when this
- //is the first CRC error in the received AMPDU or when the previous delimiter has been
+ tANI_U32 ampdu_delimiter_crc_err; //This counter shall be incremented when an MPDU delimiter has a CRC error when this
+ //is the first CRC error in the received AMPDU or when the previous delimiter has been
//decoded correctly
}tAniGlobalClassCStatsInfo, *tpAniGlobalClassCStatsInfo;
typedef PACKED_PRE struct PACKED_POST
{
- tANI_U32 tx_frag_cnt[4]; //The number of MPDU frames that the 802.11 station transmitted and acknowledged
+ tANI_U32 tx_frag_cnt[4]; //The number of MPDU frames that the 802.11 station transmitted and acknowledged
//through a received 802.11 ACK frame
- tANI_U32 tx_ampdu_cnt; //This counter shall be incremented when an A-MPDU is transmitted
- tANI_U32 tx_mpdu_in_ampdu_cnt; //This counter shall increment by the number of MPDUs in the AMPDU when an A-MPDU
+ tANI_U32 tx_ampdu_cnt; //This counter shall be incremented when an A-MPDU is transmitted
+ tANI_U32 tx_mpdu_in_ampdu_cnt; //This counter shall increment by the number of MPDUs in the AMPDU when an A-MPDU
//is transmitted
}tAniPerStaStatsInfo, *tpAniPerStaStatsInfo;
@@ -2564,7 +2554,7 @@
tANI_U16 msgType;
/* length of the entire request, includes the pStatsBuf length too */
- tANI_U16 msgLen;
+ tANI_U16 msgLen;
} tHalStatsRspParams, *tpHalStatsRspParams;
@@ -2698,7 +2688,7 @@
tANI_U32 srvInterval[WLAN_HAL_MAX_AC]; // Service Interval
tANI_U32 susInterval[WLAN_HAL_MAX_AC]; // Suspend Interval
tANI_U32 delayInterval[WLAN_HAL_MAX_AC]; // Delay Interval
-
+
} tAddTsParams, *tpAddTsParams;
typedef PACKED_PRE struct PACKED_POST
@@ -2737,14 +2727,14 @@
tANI_U16 tspecIdx;
/* To lookup station id using the mac address */
- tSirMacAddr bssId;
+ tSirMacAddr bssId;
} tDelTsParams, *tpDelTsParams;
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tDelTsParams delTsParams;
+ tDelTsParams delTsParams;
} tDelTsReqMsg, *tpDelTsReqMsg;
/*---------------------------------------------------------------------------
@@ -2816,7 +2806,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tAddBASessionParams addBASessionParams;
+ tAddBASessionParams addBASessionParams;
}tAddBASessionReqMsg, *tpAddBASessionReqMsg;
/*---------------------------------------------------------------------------
@@ -2841,10 +2831,10 @@
/* Reordering Window buffer */
tANI_U8 winSize;
-
+
/*Station Index to id the sta */
tANI_U8 STAID;
-
+
/* Starting Sequence Number */
tANI_U16 SSN;
} tAddBASessionRspParams, *tpAddBASessionRspParams;
@@ -2875,7 +2865,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tAddBAParams addBAParams;
+ tAddBAParams addBAParams;
} tAddBAReqMsg, *tpAddBAReqMsg;
@@ -2890,7 +2880,7 @@
/* Dialog token */
tANI_U8 baDialogToken;
-
+
} tAddBARspParams, *tpAddBARspParams;
typedef PACKED_PRE struct PACKED_POST
@@ -2929,17 +2919,17 @@
/* Session Id */
tANI_U8 baSessionID;
- /* baCandidateCnt is followed by trigger BA
+ /* baCandidateCnt is followed by trigger BA
* Candidate List(tTriggerBaCandidate)
*/
tANI_U16 baCandidateCnt;
-
+
} tTriggerBAParams, *tpTriggerBAParams;
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tTriggerBAParams triggerBAParams;
+ tTriggerBAParams triggerBAParams;
} tTriggerBAReqMsg, *tpTriggerBAReqMsg;
@@ -2949,18 +2939,18 @@
typedef PACKED_PRE struct PACKED_POST
{
-
+
/* TO SUPPORT BT-AMP */
- tSirMacAddr bssId;
+ tSirMacAddr bssId;
/* success or failure */
tANI_U32 status;
- /* baCandidateCnt is followed by trigger BA
+ /* baCandidateCnt is followed by trigger BA
* Rsp Candidate List(tTriggerRspBaCandidate)
*/
tANI_U16 baCandidateCnt;
-
+
} tTriggerBARspParams, *tpTriggerBARspParams;
@@ -2985,13 +2975,13 @@
/* DELBA direction
1 - Originator
0 - Recipient */
- tANI_U8 baDirection;
+ tANI_U8 baDirection;
} tDelBAParams, *tpDelBAParams;
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tDelBAParams delBAParams;
+ tDelBAParams delBAParams;
} tDelBAReqMsg, *tpDelBAReqMsg;
/*---------------------------------------------------------------------------
@@ -3027,7 +3017,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tTsmStatsParams tsmStatsParams;
+ tTsmStatsParams tsmStatsParams;
} tTsmStatsReqMsg, *tpTsmStatsReqMsg;
@@ -3039,25 +3029,25 @@
/*success or failure */
tANI_U32 status;
- /* Uplink Packet Queue delay */
+ /* Uplink Packet Queue delay */
tANI_U16 UplinkPktQueueDly;
- /* Uplink Packet Queue delay histogram */
+ /* Uplink Packet Queue delay histogram */
tANI_U16 UplinkPktQueueDlyHist[4];
- /* Uplink Packet Transmit delay */
+ /* Uplink Packet Transmit delay */
tANI_U32 UplinkPktTxDly;
- /* Uplink Packet loss */
+ /* Uplink Packet loss */
tANI_U16 UplinkPktLoss;
- /* Uplink Packet count */
+ /* Uplink Packet count */
tANI_U16 UplinkPktCount;
- /* Roaming count */
+ /* Roaming count */
tANI_U8 RoamingCount;
- /* Roaming Delay */
+ /* Roaming Delay */
tANI_U16 RoamingDly;
} tTsmStatsRspParams, *tpTsmStatsRspParams;
@@ -3094,14 +3084,14 @@
{
/* Fragment sequence number of the NV Image. Note that NV Image might not
* fit into one message due to size limitation of the SMD channel FIFO. UMAC
- * can hence choose to chop the NV blob into multiple fragments starting with
- * seqeunce number 0, 1, 2 etc. The last fragment MUST be indicated by
+ * can hence choose to chop the NV blob into multiple fragments starting with
+ * seqeunce number 0, 1, 2 etc. The last fragment MUST be indicated by
* marking the isLastFragment field to 1. Note that all the NV blobs would be
* concatenated together by HAL without any padding bytes in between.*/
tANI_U16 fragNumber;
/* Is this the last fragment? When set to 1 it indicates that no more fragments
- * will be sent by UMAC and HAL can concatenate all the NV blobs rcvd & proceed
+ * will be sent by UMAC and HAL can concatenate all the NV blobs rcvd & proceed
* with the parsing. HAL would generate a WLAN_HAL_DOWNLOAD_NV_RSP to the
* WLAN_HAL_DOWNLOAD_NV_REQ after it receives each fragment */
tANI_U16 isLastFragment;
@@ -3148,7 +3138,7 @@
/* Size of NV Blob */
tANI_U32 nvBlobSize;
- /* Following the 'nvBlobSize', there should be nvBlobSize bytes of
+ /* Following the 'nvBlobSize', there should be nvBlobSize bytes of
* NV blob i.e. uint8[nvBlobSize] */
} tHalNvStoreParams, *tpHalNvStoreParams;
@@ -3170,10 +3160,10 @@
typedef PACKED_PRE struct PACKED_POST
{
- tSirMacAddr srcMacAddr; //address used to compute MIC
+ tSirMacAddr srcMacAddr; //address used to compute MIC
tSirMacAddr taMacAddr; //transmitter address
tSirMacAddr dstMacAddr;
- tANI_U8 multicast;
+ tANI_U8 multicast;
tANI_U8 IV1; // first byte of IV
tANI_U8 keyId; // second byte of IV
tANI_U8 TSC[SIR_CIPHER_SEQ_CTR_SIZE]; // sequence number
@@ -3251,9 +3241,7 @@
tANI_U32 beaconLength; //length of the template.
tANI_U8 beacon[BEACON_TEMPLATE_SIZE]; // Beacon data.
tSirMacAddr bssId;
-#ifdef WLAN_SOFTAP_FEATURE
tANI_U32 timIeOffset; //TIM IE offset from the beginning of the template.
-#endif
tANI_U16 p2pIeOffset; //P2P IE offset from the begining of the template
}tSendBeaconParams, *tpSendBeaconParams;
@@ -3286,7 +3274,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tSirMacAddr BSSID;
- tANI_U8 channel;
+ tANI_U8 channel;
}tSirEnableRadarInfoType, *tptSirEnableRadarInfoType;
@@ -3299,7 +3287,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tEnableRadarReqParams enableRadarReqParams;
+ tEnableRadarReqParams enableRadarReqParams;
}tEnableRadarReqMsg, *tpEnableRadarReqMsg;
/*---------------------------------------------------------------------------
@@ -3317,7 +3305,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tEnableRadarRspParams enableRadarRspParams;
+ tEnableRadarRspParams enableRadarRspParams;
}tEnableRadarRspMsg, *tpEnableRadarRspMsg;
/*---------------------------------------------------------------------------
@@ -3332,7 +3320,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tRadarDetectIntrIndParams radarDetectIntrIndParams;
+ tRadarDetectIntrIndParams radarDetectIntrIndParams;
}tRadarDetectIntrIndMsg, *tptRadarDetectIntrIndMsg;
/*---------------------------------------------------------------------------
@@ -3353,7 +3341,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tRadarDetectIndParams radarDetectIndParams;
+ tRadarDetectIndParams radarDetectIndParams;
}tRadarDetectIndMsg, *tptRadarDetectIndMsg;
@@ -3371,7 +3359,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tSirGetTpcReportReqParams getTpcReportReqParams;
+ tSirGetTpcReportReqParams getTpcReportReqParams;
}tSirGetTpcReportReqMsg, *tpSirGetTpcReportReqMsg;
/*---------------------------------------------------------------------------
@@ -3387,12 +3375,11 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tSirGetTpcReportRspParams getTpcReportRspParams;
+ tSirGetTpcReportRspParams getTpcReportRspParams;
}tSirGetTpcReportRspMsg, *tpSirGetTpcReportRspMsg;
#endif
-#ifdef WLAN_SOFTAP_FEATURE
/*---------------------------------------------------------------------------
*WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_REQ
*-------------------------------------------------------------------------*/
@@ -3412,7 +3399,7 @@
}tSendProbeRespReqMsg, *tpSendProbeRespReqMsg;
/*---------------------------------------------------------------------------
- *WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_RSP
+ *WLAN_HAL_UPDATE_PROBE_RSP_TEMPLATE_RSP
*--------------------------------------------------------------------------*/
typedef PACKED_PRE struct PACKED_POST
@@ -3429,7 +3416,7 @@
/*---------------------------------------------------------------------------
- *WLAN_HAL_UNKNOWN_ADDR2_FRAME_RX_IND
+ *WLAN_HAL_UNKNOWN_ADDR2_FRAME_RX_IND
*--------------------------------------------------------------------------*/
typedef PACKED_PRE struct PACKED_POST
@@ -3454,10 +3441,8 @@
tANI_U16 staId;
tSirMacAddr bssId; // TO SUPPORT BT-AMP
// HAL copies bssid from the sta table.
-#ifdef WLAN_SOFTAP_FEATURE
tSirMacAddr addr2; //
- tANI_U16 reasonCode; // To unify the keepalive / unknown A2 / tim-based disa
-#endif
+ tANI_U16 reasonCode; // To unify the keepalive / unknown A2 / tim-based disa
}tDeleteStaContextParams, *tpDeleteStaContextParams;
@@ -3468,7 +3453,6 @@
tDeleteStaContextParams deleteStaContextParams;
}tDeleteStaContextIndMsg, *tpDeleteStaContextIndMsg;
-#endif
/*---------------------------------------------------------------------------
*WLAN_HAL_SIGNAL_BTAMP_EVENT_REQ
@@ -3621,7 +3605,7 @@
tANI_U8 ref;
} tEidByteInfo, *tpEidByteInfo;
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
tANI_U16 capabilityInfo;
tANI_U16 capabilityMask;
@@ -3646,7 +3630,7 @@
/*---------------------------------------------------------------------------
* WLAN_HAL_REM_BCN_FILTER_REQ
*--------------------------------------------------------------------------*/
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
tANI_U8 ucIeCount;
tANI_U8 ucRemIeId[1];
@@ -3721,7 +3705,7 @@
{
tANI_U8 packetType;
tANI_U32 timePeriod;
- tHalIpv4Addr hostIpv4Addr;
+ tHalIpv4Addr hostIpv4Addr;
tHalIpv4Addr destIpv4Addr;
tSirMacAddr destMacAddr;
tANI_U8 bssIdx;
@@ -3749,7 +3733,7 @@
tANI_U8 bRssiThres3NegNotify : 1;
tANI_U8 bReserved10 : 2;
} tHalRSSIThresholds, *tpHalRSSIThresholds;
-
+
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
@@ -3798,7 +3782,7 @@
tANI_U8 ucPatternId; // Pattern ID
// Pattern byte offset from beginning of the 802.11 packet to start of the
// wake-up pattern
- tANI_U8 ucPatternByteOffset;
+ tANI_U8 ucPatternByteOffset;
tANI_U8 ucPatternSize; // Non-Zero Pattern size
tANI_U8 ucPattern[HAL_WOWL_BCAST_PATTERN_MAX_SIZE]; // Pattern
tANI_U8 ucPatternMaskSize; // Non-zero pattern mask size
@@ -3813,7 +3797,7 @@
tHalMsgHeader header;
tHalWowlAddBcastPtrn ptrnParams;
} tHalWowlAddBcastPtrnReqMsg, *tpHalWowlAddBcastPtrnReqMsg;
-
+
/*---------------------------------------------------------------------------
@@ -3838,59 +3822,59 @@
typedef PACKED_PRE struct PACKED_POST
{
/* Enables/disables magic packet filtering */
- tANI_U8 ucMagicPktEnable;
+ tANI_U8 ucMagicPktEnable;
/* Magic pattern */
tSirMacAddr magicPtrn;
- /* Enables/disables packet pattern filtering in firmware.
- Enabling this flag enables broadcast pattern matching
- in Firmware. If unicast pattern matching is also desired,
- ucUcastPatternFilteringEnable flag must be set tot true
- as well
+ /* Enables/disables packet pattern filtering in firmware.
+ Enabling this flag enables broadcast pattern matching
+ in Firmware. If unicast pattern matching is also desired,
+ ucUcastPatternFilteringEnable flag must be set tot true
+ as well
*/
tANI_U8 ucPatternFilteringEnable;
- /* Enables/disables unicast packet pattern filtering.
- This flag specifies whether we want to do pattern match
- on unicast packets as well and not just broadcast packets.
- This flag has no effect if the ucPatternFilteringEnable
+ /* Enables/disables unicast packet pattern filtering.
+ This flag specifies whether we want to do pattern match
+ on unicast packets as well and not just broadcast packets.
+ This flag has no effect if the ucPatternFilteringEnable
(main controlling flag) is set to false
*/
- tANI_U8 ucUcastPatternFilteringEnable;
+ tANI_U8 ucUcastPatternFilteringEnable;
- /* This configuration is valid only when magicPktEnable=1.
- * It requests hardware to wake up when it receives the
+ /* This configuration is valid only when magicPktEnable=1.
+ * It requests hardware to wake up when it receives the
* Channel Switch Action Frame.
*/
tANI_U8 ucWowChnlSwitchRcv;
- /* This configuration is valid only when magicPktEnable=1.
- * It requests hardware to wake up when it receives the
- * Deauthentication Frame.
+ /* This configuration is valid only when magicPktEnable=1.
+ * It requests hardware to wake up when it receives the
+ * Deauthentication Frame.
*/
tANI_U8 ucWowDeauthRcv;
- /* This configuration is valid only when magicPktEnable=1.
- * It requests hardware to wake up when it receives the
- * Disassociation Frame.
+ /* This configuration is valid only when magicPktEnable=1.
+ * It requests hardware to wake up when it receives the
+ * Disassociation Frame.
*/
tANI_U8 ucWowDisassocRcv;
- /* This configuration is valid only when magicPktEnable=1.
+ /* This configuration is valid only when magicPktEnable=1.
* It requests hardware to wake up when it has missed
* consecutive beacons. This is a hardware register
- * configuration (NOT a firmware configuration).
+ * configuration (NOT a firmware configuration).
*/
tANI_U8 ucWowMaxMissedBeacons;
- /* This configuration is valid only when magicPktEnable=1.
+ /* This configuration is valid only when magicPktEnable=1.
* This is a timeout value in units of microsec. It requests
* hardware to unconditionally wake up after it has stayed
- * in WoWLAN mode for some time. Set 0 to disable this feature.
+ * in WoWLAN mode for some time. Set 0 to disable this feature.
*/
tANI_U8 ucWowMaxSleepUsec;
-
+
/* This configuration directs the WoW packet filtering to look for EAP-ID
* requests embedded in EAPOL frames and use this as a wake source.
*/
@@ -4396,7 +4380,7 @@
{
tANI_U8 opp_ps;
tANI_U32 ctWindow;
- tANI_U8 count;
+ tANI_U8 count;
tANI_U32 duration;
tANI_U32 interval;
tANI_U32 single_noa_duration;
@@ -4461,7 +4445,7 @@
/* DPU Signature */
tANI_U8 dpuSignature;
-
+
}tAddStaSelfRspParams, *tpAddStaSelfRspParams;
typedef PACKED_PRE struct PACKED_POST
@@ -4624,7 +4608,7 @@
tANI_U32 rspLength;
/*FiXME: Currently considering the the responce will be less than 100bytes */
tANI_U8 rspBuffer[DUMPCMD_RSP_BUFFER];
-
+
} tHalDumpCmdRspParams, *tpHalDumpCmdRspParams;
typedef PACKED_PRE struct PACKED_POST
@@ -4652,7 +4636,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tCoexIndParams coexIndParams;
+ tCoexIndParams coexIndParams;
}tCoexIndMsg, *tpCoexIndMsg;
/*---------------------------------------------------------------------------
@@ -4668,7 +4652,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tTxComplParams txComplParams;
+ tTxComplParams txComplParams;
}tTxComplIndMsg, *tpTxComplIndMsg;
/*---------------------------------------------------------------------------
@@ -4678,7 +4662,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tANI_U32 configuredMcstBcstFilterSetting;
- tANI_U32 activeSessionCount;
+ tANI_U32 activeSessionCount;
}tHalWlanHostSuspendIndParam,*tpHalWlanHostSuspendIndParam;
typedef PACKED_PRE struct PACKED_POST
@@ -4694,7 +4678,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tANI_BOOLEAN bDot11ExcludeUnencrypted;
- tSirMacAddr bssId;
+ tSirMacAddr bssId;
}tHalWlanExcludeUnEncryptedIndParam,*tpHalWlanExcludeUnEncryptedIndParam;
typedef PACKED_PRE struct PACKED_POST
@@ -4732,7 +4716,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- tNoaAttrIndParams noaAttrIndParams;
+ tNoaAttrIndParams noaAttrIndParams;
}tNoaAttrIndMsg, *tpNoaAttrIndMsg;
#endif
@@ -4781,7 +4765,7 @@
/*Maximum size of the probe template*/
#define WLAN_HAL_PNO_MAX_PROBE_SIZE 450
-/*Type of PNO enabling
+/*Type of PNO enabling
Immediate - scanning will start immediately and PNO procedure will
be repeated based on timer
Suspend - scanning will start at suspend
@@ -4795,22 +4779,22 @@
} ePNOMode;
/*Authentication type*/
-typedef enum
+typedef enum
{
- eAUTH_TYPE_ANY = 0,
+ eAUTH_TYPE_ANY = 0,
eAUTH_TYPE_OPEN_SYSTEM = 1,
-
+
// Upper layer authentication types
eAUTH_TYPE_WPA = 2,
eAUTH_TYPE_WPA_PSK = 3,
-
+
eAUTH_TYPE_RSN = 4,
eAUTH_TYPE_RSN_PSK = 5,
eAUTH_TYPE_FT_RSN = 6,
eAUTH_TYPE_FT_RSN_PSK = 7,
eAUTH_TYPE_WAPI_WAI_CERTIFICATE = 8,
eAUTH_TYPE_WAPI_WAI_PSK = 9,
-
+
eAUTH_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE
}tAuthType;
@@ -4824,7 +4808,7 @@
eED_TKIP = 3,
eED_CCMP = 4,
eED_WPI = 5,
-
+
eED_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE
} tEdType;
@@ -4838,7 +4822,7 @@
eBCAST_TYPE_MAX = WLAN_HAL_MAX_ENUM_SIZE
} tSSIDBcastType;
-/*
+/*
The network description for which PNO will have to look for
*/
typedef PACKED_PRE struct PACKED_POST
@@ -4847,51 +4831,51 @@
tSirMacSSid ssId;
/*Authentication type for the network*/
- tAuthType authentication;
+ tAuthType authentication;
/*Encryption type for the network*/
- tEdType encryption;
+ tEdType encryption;
- /*Indicate the channel on which the Network can be found
+ /*Indicate the channel on which the Network can be found
0 - if all channels */
tANI_U8 ucChannelCount;
tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS];
/*Indicates the RSSI threshold for the network to be considered*/
tANI_U8 rssiThreshold;
-}tNetworkType;
+}tNetworkType;
typedef PACKED_PRE struct PACKED_POST
{
/*How much it should wait */
- tANI_U32 uTimerValue;
+ tANI_U32 uTimerValue;
- /*How many times it should repeat that wait value
+ /*How many times it should repeat that wait value
0 - keep using this timer until PNO is disabled*/
- tANI_U32 uTimerRepeat;
+ tANI_U32 uTimerRepeat;
- /*e.g: 2 3
- 4 0
+ /*e.g: 2 3
+ 4 0
- it will wait 2s between consecutive scans for 3 times
- after that it will wait 4s between consecutive scans until disabled*/
-}tScanTimer;
+}tScanTimer;
-/*
+/*
The network parameters to be sent to the PNO algorithm
*/
typedef PACKED_PRE struct PACKED_POST
{
/*set to 0 if you wish for PNO to use its default telescopic timer*/
- tANI_U8 ucScanTimersCount;
+ tANI_U8 ucScanTimersCount;
- /*A set value represents the amount of time that PNO will wait between
+ /*A set value represents the amount of time that PNO will wait between
two consecutive scan procedures
If the desired is for a uniform timer that fires always at the exact same
interval - one single value is to be set
If there is a desire for a more complex - telescopic like timer multiple
values can be set - once PNO reaches the end of the array it will
continue scanning at intervals presented by the last value*/
- tScanTimer aTimerValues[WLAN_HAL_PNO_MAX_SCAN_TIMERS];
+ tScanTimer aTimerValues[WLAN_HAL_PNO_MAX_SCAN_TIMERS];
}tScanTimersType;
@@ -4902,7 +4886,7 @@
/*Immediate, On Suspend, On Resume*/
ePNOMode modePNO;
-
+
/*Number of networks sent for PNO*/
tANI_U32 ucNetworksCount;
@@ -4910,20 +4894,20 @@
tNetworkType aNetworks[WLAN_HAL_PNO_MAX_SUPP_NETWORKS];
/*The scan timers required for PNO*/
- tScanTimersType scanTimers;
+ tScanTimersType scanTimers;
/*Probe template for 2.4GHz band*/
- tANI_U16 us24GProbeSize;
+ tANI_U16 us24GProbeSize;
tANI_U8 a24GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE];
/*Probe template for 5GHz band*/
- tANI_U16 us5GProbeSize;
+ tANI_U16 us5GProbeSize;
tANI_U8 a5GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE];
} tPrefNetwListParams, * tpPrefNetwListParams;
/*
- Preferred network list request
+ Preferred network list request
*/
typedef PACKED_PRE struct PACKED_POST
{
@@ -4932,7 +4916,7 @@
} tSetPrefNetwListReq, *tpSetPrefNetwListReq;
-/*
+/*
The network description for which PNO will have to look for
*/
typedef PACKED_PRE struct PACKED_POST
@@ -4941,22 +4925,22 @@
tSirMacSSid ssId;
/*Authentication type for the network*/
- tAuthType authentication;
+ tAuthType authentication;
/*Encryption type for the network*/
- tEdType encryption;
+ tEdType encryption;
/*SSID broadcast type, normal, hidden or unknown*/
tSSIDBcastType bcastNetworkType;
- /*Indicate the channel on which the Network can be found
+ /*Indicate the channel on which the Network can be found
0 - if all channels */
tANI_U8 ucChannelCount;
tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS];
/*Indicates the RSSI threshold for the network to be considered*/
tANI_U8 rssiThreshold;
-}tNetworkTypeNew;
+}tNetworkTypeNew;
typedef PACKED_PRE struct PACKED_POST {
@@ -4965,22 +4949,22 @@
/*Immediate, On Suspend, On Resume*/
ePNOMode modePNO;
-
+
/*Number of networks sent for PNO*/
- tANI_U32 ucNetworksCount;
+ tANI_U32 ucNetworksCount;
/*The networks that PNO needs to look for*/
tNetworkTypeNew aNetworks[WLAN_HAL_PNO_MAX_SUPP_NETWORKS];
/*The scan timers required for PNO*/
- tScanTimersType scanTimers;
+ tScanTimersType scanTimers;
/*Probe template for 2.4GHz band*/
- tANI_U16 us24GProbeSize;
+ tANI_U16 us24GProbeSize;
tANI_U8 a24GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE];
/*Probe template for 5GHz band*/
- tANI_U16 us5GProbeSize;
+ tANI_U16 us5GProbeSize;
tANI_U8 a5GProbeTemplate[WLAN_HAL_PNO_MAX_PROBE_SIZE];
} tPrefNetwListParamsNew, * tpPrefNetwListParamsNew;
@@ -4995,25 +4979,25 @@
} tSetPrefNetwListReqNew, *tpSetPrefNetwListReqNew;
/*
- Preferred network list response
+ Preferred network list response
*/
typedef PACKED_PRE struct PACKED_POST
{
tHalMsgHeader header;
- /*status of the request - just to indicate that PNO has acknowledged
+ /*status of the request - just to indicate that PNO has acknowledged
the request and will start scanning*/
tANI_U32 status;
} tSetPrefNetwListResp, *tpSetPrefNetwListResp;
/*
- Preferred network indication parameters
+ Preferred network indication parameters
*/
typedef PACKED_PRE struct PACKED_POST {
/*Network that was found with the highest RSSI*/
tSirMacSSid ssId;
-
+
/*Indicates the RSSI */
tANI_U8 rssi;
@@ -5037,7 +5021,7 @@
} tRssiFilterParams, * tpRssiFilterParams;
/*
- RSSI Filter request
+ RSSI Filter request
*/
typedef PACKED_PRE struct PACKED_POST
{
@@ -5054,32 +5038,32 @@
tANI_U32 status;
} tSetRssiFilterResp, *tpSetRssiFilterResp;
/*
- Update scan params
+ Update scan params
*/
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
/*Host setting for 11d*/
- tANI_U8 b11dEnabled;
+ tANI_U8 b11dEnabled;
/*Lets PNO know that host has determined the regulatory domain*/
tANI_U8 b11dResolved;
/*Channels on which PNO is allowed to scan*/
- tANI_U8 ucChannelCount;
- tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS];
+ tANI_U8 ucChannelCount;
+ tANI_U8 aChannels[WLAN_HAL_PNO_MAX_NETW_CHANNELS];
/*Minimum channel time*/
- tANI_U16 usActiveMinChTime;
+ tANI_U16 usActiveMinChTime;
/*Maximum channel time*/
- tANI_U16 usActiveMaxChTime;
+ tANI_U16 usActiveMaxChTime;
/*Minimum channel time*/
- tANI_U16 usPassiveMinChTime;
+ tANI_U16 usPassiveMinChTime;
/*Maximum channel time*/
- tANI_U16 usPassiveMaxChTime;
+ tANI_U16 usPassiveMaxChTime;
/*Cb State*/
ePhyChanBondState cbState;
@@ -5088,7 +5072,7 @@
/*
Update scan params - sent from host to PNO
- to be used during PNO scanning
+ to be used during PNO scanning
*/
typedef PACKED_PRE struct PACKED_POST{
@@ -5098,7 +5082,7 @@
/*
Update scan params - sent from host to PNO
- to be used during PNO scanning
+ to be used during PNO scanning
*/
typedef PACKED_PRE struct PACKED_POST{
@@ -5165,7 +5149,7 @@
HAL_RCV_FILTER_TYPE_MAX_ENUM_SIZE
}tHalReceivePacketFilterType;
-typedef enum
+typedef enum
{
HAL_FILTER_PROTO_TYPE_INVALID,
HAL_FILTER_PROTO_TYPE_MAC,
@@ -5176,7 +5160,7 @@
HAL_FILTER_PROTO_TYPE_MAX
}tHalRcvPktFltProtocolType;
-typedef enum
+typedef enum
{
HAL_FILTER_CMP_TYPE_INVALID,
HAL_FILTER_CMP_TYPE_EQUAL,
@@ -5185,7 +5169,7 @@
HAL_FILTER_CMP_TYPE_MAX
}tHalRcvPktFltCmpFlagType;
-typedef PACKED_PRE struct PACKED_POST
+typedef PACKED_PRE struct PACKED_POST
{
tANI_U8 protocolLayer;
tANI_U8 cmpFlag;
@@ -5200,7 +5184,7 @@
{
tANI_U8 filterId;
tANI_U8 filterType;
- tANI_U8 numParams;
+ tANI_U8 numParams;
tANI_U32 coalesceTime;
tHalRcvPktFilterParams paramsData[1];
}tHalRcvPktFilterCfgType, *tpHalRcvPktFilterCfgType;
@@ -5209,8 +5193,8 @@
{
tANI_U8 filterId;
tANI_U8 filterType;
- tANI_U8 numParams;
- tANI_U32 coleasceTime;
+ tANI_U8 numParams;
+ tANI_U32 coleasceTime;
tANI_U8 bssIdx;
tHalRcvPktFilterParams paramsData[1];
}tHalSessionizedRcvPktFilterCfgType, *tpHalSessionizedRcvPktFilterCfgType;
@@ -5263,8 +5247,8 @@
{
/* Success or Failure */
tANI_U32 status;
- tANI_U32 matchCnt;
- tHalRcvFltPktMatchCnt filterMatchCnt[HAL_MAX_NUM_FILTERS];
+ tANI_U32 matchCnt;
+ tHalRcvFltPktMatchCnt filterMatchCnt[HAL_MAX_NUM_FILTERS];
tANI_U8 bssIdx;
} tHalRcvFltPktMatchRspParams, *tptHalRcvFltPktMatchRspParams;
@@ -5295,7 +5279,7 @@
typedef PACKED_PRE struct PACKED_POST
{
- tANI_U32 status;
+ tANI_U32 status;
tANI_U8 bssIdx;
}tHalRcvFltPktSetMcListRspType, *tpHalRcvFltPktSetMcListRspType;
@@ -5322,7 +5306,7 @@
tANI_U32 uIgnoreDTIM;
/*DTIM Period*/
- tANI_U32 uDTIMPeriod;
+ tANI_U32 uDTIMPeriod;
/* Listen Interval */
tANI_U32 uListenInterval;
@@ -5334,7 +5318,7 @@
tANI_U32 uEnableBET;
/* Beacon Early Termination Interval */
- tANI_U32 uBETInterval;
+ tANI_U32 uBETInterval;
}tSetPowerParamsType, *tpSetPowerParamsType;
typedef PACKED_PRE struct PACKED_POST
@@ -5364,7 +5348,7 @@
typedef PACKED_PRE struct PACKED_POST{
- tHalMsgHeader header;
+ tHalMsgHeader header;
tWlanFeatCaps wlanFeatCaps;
} tWlanFeatCapsMsg, *tpWlanFeatCapsMsg;
@@ -5386,21 +5370,21 @@
tANI_U8 halMsg_GetHostWlanFeatCaps(tANI_U8 feat_enum_value);
#define setFeatCaps(a,b) { tANI_U32 arr_index, bit_index; \
- if ((b>=0) && (b<=127)) { \
+ if ((b<=127)) { \
arr_index = b/32; \
bit_index = b % 32; \
(a)->featCaps[arr_index] |= (1<<bit_index); \
} \
}
#define getFeatCaps(a,b,c) { tANI_U32 arr_index, bit_index; \
- if ((b>=0) && (b<=127)) { \
+ if ((b<=127)) { \
arr_index = b/32; \
bit_index = b % 32; \
c = (a)->featCaps[arr_index] & (1<<bit_index); \
} \
}
#define clearFeatCaps(a,b) { tANI_U32 arr_index, bit_index; \
- if ((b>=0) && (b<=127)) { \
+ if ((b<=127)) { \
arr_index = b/32; \
bit_index = b % 32; \
(a)->featCaps[arr_index] &= ~(1<<bit_index); \
@@ -5493,7 +5477,7 @@
typedef PACKED_PRE struct PACKED_POST
{
tANI_U32 ulFlags; /* optional flags */
- tANI_U8 aKCK[HAL_GTK_KCK_BYTES]; /* Key confirmation key */
+ tANI_U8 aKCK[HAL_GTK_KCK_BYTES]; /* Key confirmation key */
tANI_U8 aKEK[HAL_GTK_KEK_BYTES]; /* key encryption key */
tANI_U64 ullKeyReplayCounter; /* replay counter */
tANI_U8 bssIdx;
@@ -5585,7 +5569,7 @@
HAL_THERMAL_MITIGATION_LEVEL_3 - 3rd level of thermal mitigation
HAL_THERMAL_MITIGATION_LEVEL_4 - 4th level of thermal mitigation
*/
-typedef enum
+typedef enum
{
HAL_THERMAL_MITIGATION_LEVEL_INVALID = -1,
HAL_THERMAL_MITIGATION_LEVEL_0,
@@ -5604,7 +5588,7 @@
/* Thermal Mitigation Level */
tHalThermalMitigationLevelType thermalMitLevel;
-
+
}tSetThermalMitgationType, *tpSetThermalMitgationType;
/* WLAN_HAL_SET_THERMAL_MITIGATION_REQ */
diff --git a/riva/inc/wlan_nv.h b/riva/inc/wlan_nv.h
index d881276..a4d06ea 100644
--- a/riva/inc/wlan_nv.h
+++ b/riva/inc/wlan_nv.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/wlan_phy.h b/riva/inc/wlan_phy.h
index e4ec4db..47c1d6c 100644
--- a/riva/inc/wlan_phy.h
+++ b/riva/inc/wlan_phy.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/wlan_qct_dev_defs.h b/riva/inc/wlan_qct_dev_defs.h
index 87a2f84..3527fde 100644
--- a/riva/inc/wlan_qct_dev_defs.h
+++ b/riva/inc/wlan_qct_dev_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
diff --git a/riva/inc/wlan_status_code.h b/riva/inc/wlan_status_code.h
index 4a332c0..eae1bc6 100644
--- a/riva/inc/wlan_status_code.h
+++ b/riva/inc/wlan_status_code.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2012, The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*