Merge "Release 4.0.0.68C for MDM9x35 delivery from qcacld-2.0"

36 files changed, 6 insertions, 158 deletions

diff --git a/CORE/BAP/src/bapApiData.c b/CORE/BAP/src/bapApiData.c
index 465251f2f4d5..37c3d49b3686 100644
--- a/CORE/BAP/src/bapApiData.c
+++ b/CORE/BAP/src/bapApiData.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i D a t a . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiDebug.c b/CORE/BAP/src/bapApiDebug.c
index 960b2a567291..d27b9dda6e6b 100644
--- a/CORE/BAP/src/bapApiDebug.c
+++ b/CORE/BAP/src/bapApiDebug.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i D e b u g . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiExt.c b/CORE/BAP/src/bapApiExt.c
index 4d5b00f0ee19..6728edc193ba 100644
--- a/CORE/BAP/src/bapApiExt.c
+++ b/CORE/BAP/src/bapApiExt.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i E x t . C
@@ -43,10 +42,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiExt.h b/CORE/BAP/src/bapApiExt.h
index 02de078862a1..2aac619201b6 100644
--- a/CORE/BAP/src/bapApiExt.h
+++ b/CORE/BAP/src/bapApiExt.h
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 #ifndef WLAN_QCT_WLANBAP_API_EXT_H
 #define WLAN_QCT_WLANBAP_API_EXT_H
 
@@ -38,9 +37,6 @@ DESCRIPTION
   This file contains the external APIs used by the wlan BT-AMP PAL layer 
   module.
   
-      
-  Copyright (c) 2008 Qualcomm Technologies, Inc. All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 
diff --git a/CORE/BAP/src/bapApiHCBB.c b/CORE/BAP/src/bapApiHCBB.c
index 2e56d0e3bb85..78afd89f37ad 100644
--- a/CORE/BAP/src/bapApiHCBB.c
+++ b/CORE/BAP/src/bapApiHCBB.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i H C B B . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiInfo.c b/CORE/BAP/src/bapApiInfo.c
index eced536205b8..35e2e91a9da1 100644
--- a/CORE/BAP/src/bapApiInfo.c
+++ b/CORE/BAP/src/bapApiInfo.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i I n f o . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiLinkCntl.c b/CORE/BAP/src/bapApiLinkCntl.c
index adae61c0a408..1f753f89ea92 100644
--- a/CORE/BAP/src/bapApiLinkCntl.c
+++ b/CORE/BAP/src/bapApiLinkCntl.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i L i n k C n t l . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
@@ -1558,7 +1553,7 @@ WLAN_BAPLogicalLinkDisconnect
     /* Derive logical link index from handle */
     log_link_index = ((pBapHCILogLinkDisconnect->log_link_handle) >> 8);
 
-    if( log_link_index > WLANBAP_MAX_LOG_LINKS )
+    if( log_link_index >= WLANBAP_MAX_LOG_LINKS )
     {
        VOS_TRACE( VOS_MODULE_ID_BAP, VOS_TRACE_LEVEL_ERROR, 
                   "Critical error: Invalid input parameter on %s", 
diff --git a/CORE/BAP/src/bapApiLinkSupervision.c b/CORE/BAP/src/bapApiLinkSupervision.c
index c355e4e6a9ef..1973cd46a9e0 100644
--- a/CORE/BAP/src/bapApiLinkSupervision.c
+++ b/CORE/BAP/src/bapApiLinkSupervision.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i LinkSupervision . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiStatus.c b/CORE/BAP/src/bapApiStatus.c
index 6f0dca3cc252..29471df04d11 100644
--- a/CORE/BAP/src/bapApiStatus.c
+++ b/CORE/BAP/src/bapApiStatus.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i S t a t u s . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
@@ -377,7 +372,7 @@ WLAN_BAPReadRSSI
     {
         /* Get the RSSI value for this station (physical link) */
         vosStatus = WLANTL_GetRssi(btampContext->pvosGCtx, btampContext->ucSTAId,
-                        &pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_RSSI.rssi);
+                        &pBapHCIEvent->u.btampCommandCompleteEvent.cc_event.Read_RSSI.rssi,NULL);
 
         if (VOS_STATUS_SUCCESS == vosStatus)
         {
diff --git a/CORE/BAP/src/bapApiTimer.c b/CORE/BAP/src/bapApiTimer.c
index 0a62061137a4..5d22673de0a4 100644
--- a/CORE/BAP/src/bapApiTimer.c
+++ b/CORE/BAP/src/bapApiTimer.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p A p i T i m e r . C
@@ -41,10 +40,6 @@
 
   Are listed for each API below. 
   
-  
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapApiTimer.h b/CORE/BAP/src/bapApiTimer.h
index 97a4a367fe0a..f15d0a9b509b 100644
--- a/CORE/BAP/src/bapApiTimer.h
+++ b/CORE/BAP/src/bapApiTimer.h
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 #ifndef WLAN_QCT_WLANBAP_API_TIMER_H
 #define WLAN_QCT_WLANBAP_API_TIMER_H
 
@@ -38,9 +37,6 @@ DESCRIPTION
   This file contains the timer APIs used by the wlan BT-AMP PAL layer 
   module.
   
-      
-  Copyright (c) 2008 Qualcomm Technologies, Inc. All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 
diff --git a/CORE/BAP/src/bapInternal.h b/CORE/BAP/src/bapInternal.h
index 151c287b286f..c490597a72cc 100644
--- a/CORE/BAP/src/bapInternal.h
+++ b/CORE/BAP/src/bapInternal.h
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 #ifndef WLAN_QCT_WLANBAP_INTERNAL_H
 #define WLAN_QCT_WLANBAP_INTERNAL_H
 
@@ -38,9 +37,6 @@ DESCRIPTION
   This file contains the internal API exposed by the wlan BT-AMP PAL layer 
   module.
   
-      
-  Copyright (c) 2008 Qualcomm Technologies, Inc. All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 
@@ -206,7 +202,8 @@ typedef struct sBtampHCI_Supported_Cmds {
 
 typedef struct sBtampHCI_AMP_Info {
 //    v_U8_t       present;
-    v_U8_t       HC_AMP_Status; v_U32_t      HC_Total_BW; /* combined uplink and downlink */
+    v_U8_t       HC_AMP_Status; /* */
+    v_U32_t      HC_Total_BW; /* combined uplink and downlink */
     v_U32_t      HC_Max_Guaranteed_BW; /* upper bound */
     v_U32_t      HC_Min_Latency; /* AMP HCI latency + DIFS + CWMin */
     v_U32_t      HC_Max_PDU_Size; /* Equal to Max80211PALPDUSize */
diff --git a/CORE/BAP/src/bapModule.c b/CORE/BAP/src/bapModule.c
index e5ad085979b0..2fd8c37725d7 100644
--- a/CORE/BAP/src/bapModule.c
+++ b/CORE/BAP/src/bapModule.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b a p M o d u l e . C
@@ -43,10 +42,6 @@
 
   Are listed for each API below.
 
-
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.c b/CORE/BAP/src/bapRsn8021xAuthFsm.c
index c7183895f2af..2ce59a78c530 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.c
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xAuthRsnFsm.c $
- *
  * Contains definitions for the RSN EAPOL-Key FSM on the
  * authenticator side. This is based on 802.11i.
  *
diff --git a/CORE/BAP/src/bapRsn8021xAuthFsm.h b/CORE/BAP/src/bapRsn8021xAuthFsm.h
index ec928576aa09..ebdc1c8e3768 100644
--- a/CORE/BAP/src/bapRsn8021xAuthFsm.h
+++ b/CORE/BAP/src/bapRsn8021xAuthFsm.h
@@ -24,10 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xAuthRsnFsm.h $
  *
  * Contains declarations for the RSN EAPOL-Key FSM on the
  * authenticator side. This is based on 802.11i.
diff --git a/CORE/BAP/src/bapRsn8021xFsm.h b/CORE/BAP/src/bapRsn8021xFsm.h
index c3d2158d3755..53b9c48ffd4a 100644
--- a/CORE/BAP/src/bapRsn8021xFsm.h
+++ b/CORE/BAP/src/bapRsn8021xFsm.h
@@ -24,10 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xFsm.h $
  * Contains the declarations for the Auth Agent's FSM's to work.
  *
  * Author:      Mayank D. Upadhyay
diff --git a/CORE/BAP/src/bapRsn8021xPrf.c b/CORE/BAP/src/bapRsn8021xPrf.c
index a921ebcadb13..ebd50fa7de4d 100644
--- a/CORE/BAP/src/bapRsn8021xPrf.c
+++ b/CORE/BAP/src/bapRsn8021xPrf.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xPrf.c $
- *
  * Contains definitions for routines to calculate the 802.11i PRF
  * functions.
  *
diff --git a/CORE/BAP/src/bapRsn8021xPrf.h b/CORE/BAP/src/bapRsn8021xPrf.h
index 05fcf7c928ce..546581d2433c 100644
--- a/CORE/BAP/src/bapRsn8021xPrf.h
+++ b/CORE/BAP/src/bapRsn8021xPrf.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xPrf.h $
- *
  * Contains declarations for routines to calculate the 802.11i PRF
  * functions.
  *
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
index a714cf150bd7..f2568f88bca4 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xSuppRsnFsm.c $
- *
  * Contains definitions for the RSN EAPOL-Key FSM on the
  * supplicant side. This is based on 802.11i.
  *
diff --git a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
index 59bd6caf69c2..9a20e1cd3ecc 100644
--- a/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
+++ b/CORE/BAP/src/bapRsn8021xSuppRsnFsm.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/auth8021x/ani8021xSuppRsnFsm.h $
- *
  * Contains declarations for the RSN EAPOL-Key FSM on the
  * supplicant side. This is based on 802.11i.
  *
diff --git a/CORE/BAP/src/bapRsnAsfPacket.c b/CORE/BAP/src/bapRsnAsfPacket.c
index 2102600ff94e..7bf55eb382e6 100644
--- a/CORE/BAP/src/bapRsnAsfPacket.c
+++ b/CORE/BAP/src/bapRsnAsfPacket.c
@@ -24,10 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File: $File: //depot/software/projects/feature_branches/nova_phase1/ap/apps/asf/aniAsfPacket.c $
  * Contains definitions for packet manipulation routines that make it
  * easy to create and parse multi-layered network frames. This module
  * minimizes buffer copies while adding or removing headers, and
diff --git a/CORE/BAP/src/bapRsnAsfPacket.h b/CORE/BAP/src/bapRsnAsfPacket.h
index 53da881a4467..c462cb12cd81 100644
--- a/CORE/BAP/src/bapRsnAsfPacket.h
+++ b/CORE/BAP/src/bapRsnAsfPacket.h
@@ -24,10 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File: $File: //depot/software/projects/feature_branches/nova_phase1/ap/apps/include/aniAsfPacket.h $
  * Contains declarations for packet manipulation routines that make it
  * easy to create and parse multi-layered network frames. This module
  * minimizes buffer copies while adding or removing headers, and
diff --git a/CORE/BAP/src/bapRsnErrors.h b/CORE/BAP/src/bapRsnErrors.h
index 4a4bfdbdeb28..550e70924a8e 100644
--- a/CORE/BAP/src/bapRsnErrors.h
+++ b/CORE/BAP/src/bapRsnErrors.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File: $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/include/aniErrors.h $
- *
  * Contains definitions of error codes that are globally visible
  * across WNI applications. There are two kinds of error codes:
  * generic error codes and module specific error codes. Module specific
diff --git a/CORE/BAP/src/bapRsnSsmAesKeyWrap.c b/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
index 79819019fdfa..0e8858cb4fc1 100644
--- a/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
+++ b/CORE/BAP/src/bapRsnSsmAesKeyWrap.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Airgo Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/lib/aniSsmAesKeyWrap.c $
- *
  * Contains definitions for the AES Key Wrap algorithm from RFC 3394.
  *
  * Author:      Mayank D. Upadhyay
diff --git a/CORE/BAP/src/bapRsnSsmAesKeyWrap.h b/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
index f2b5b4715544..7151ce63e392 100644
--- a/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
+++ b/CORE/BAP/src/bapRsnSsmAesKeyWrap.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Qualcomm Technologies, Inc., proprietary. All rights reserved.
- * Ref File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/include/aniSsmAesKeyWrap.h $
- *
  * Contains SSM-private declarations related to the AES key WRAP
  * algorithm described in RFC 3394.
  *
diff --git a/CORE/BAP/src/bapRsnSsmEapol.c b/CORE/BAP/src/bapRsnSsmEapol.c
index 136573a5204f..ea39c7bd4cd3 100644
--- a/CORE/BAP/src/bapRsnSsmEapol.c
+++ b/CORE/BAP/src/bapRsnSsmEapol.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File: $Header: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/lib/aniSsmEapol.c#2 $ 
- *
  * Contains definitions of various utilities for EAPoL frame
  * parsing and creation.
  *
diff --git a/CORE/BAP/src/bapRsnSsmEapol.h b/CORE/BAP/src/bapRsnSsmEapol.h
index 7043b7eeea2e..e576f43a961f 100644
--- a/CORE/BAP/src/bapRsnSsmEapol.h
+++ b/CORE/BAP/src/bapRsnSsmEapol.h
@@ -24,10 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File:        $Header: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/include/aniSsmEapol.h#1 $ 
  * Contains declarations of various utilities for EAPoL frame
  * parsing and creation.
  * range.
diff --git a/CORE/BAP/src/bapRsnSsmReplayCtr.c b/CORE/BAP/src/bapRsnSsmReplayCtr.c
index 20ddf558b522..2cea86f57944 100644
--- a/CORE/BAP/src/bapRsnSsmReplayCtr.c
+++ b/CORE/BAP/src/bapRsnSsmReplayCtr.c
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * File: $Header: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/ssm/lib/aniSsmReplayCtr.c#2 $ 
- *
  * Contains definitions of various utilities for EAPoL frame
  * parsing and creation.
  *
diff --git a/CORE/BAP/src/bapRsnSsmReplayCtr.h b/CORE/BAP/src/bapRsnSsmReplayCtr.h
index d04ac3230e78..4635d2ed8b25 100644
--- a/CORE/BAP/src/bapRsnSsmReplayCtr.h
+++ b/CORE/BAP/src/bapRsnSsmReplayCtr.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Woodside Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/include/aniSsmReplayCtr.h $
- *
  * Contains declarations of various utilities for SSM replay counter
  * module.
  *
diff --git a/CORE/BAP/src/bapRsnSsmServices.h b/CORE/BAP/src/bapRsnSsmServices.h
index a1bbd719afec..d14cadaaa53f 100644
--- a/CORE/BAP/src/bapRsnSsmServices.h
+++ b/CORE/BAP/src/bapRsnSsmServices.h
@@ -24,11 +24,7 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*
- * Airgo Networks, Inc proprietary. All rights reserved.
- * $File: //depot/software/projects/feature_branches/gen5_phase1/os/linux/classic/ap/apps/include/aniSsmServices.h $
- *
  * Contains definitions of common types that the SSM exports to other
  * modules. 
  *
diff --git a/CORE/BAP/src/bapRsnTxRx.c b/CORE/BAP/src/bapRsnTxRx.c
index 24dbfa1454c4..d56bae34f707 100644
--- a/CORE/BAP/src/bapRsnTxRx.c
+++ b/CORE/BAP/src/bapRsnTxRx.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /**=============================================================================
   
   vos_list.c
@@ -33,11 +32,6 @@
   
   Description...
     
-  
-               Copyright 2008 (c) Qualcomm Technologies, Inc.
-               All Rights Reserved.
-               Qualcomm Technologies Confidential and Proprietary.
-  
   ============================================================================== */
 /* $HEADER$ */
 #include "bapRsnTxRx.h"
@@ -209,7 +203,7 @@ static VOS_STATUS bapRsnTxFrame( v_PVOID_t pvosGCtx, vos_pkt_t *pPacket )
 VOS_STATUS bapRsnSendEapolFrame( v_PVOID_t pvosGCtx, tAniPacket *pAniPkt )
 {
     VOS_STATUS status;
-    vos_pkt_t *pPacket;
+    vos_pkt_t *pPacket = NULL;
     v_U8_t *pData, *pSrc;
     int pktLen = aniAsfPacketGetBytes( pAniPkt, &pSrc );
 
@@ -218,7 +212,7 @@ VOS_STATUS bapRsnSendEapolFrame( v_PVOID_t pvosGCtx, tAniPacket *pAniPkt )
         return VOS_STATUS_E_EMPTY;
     }
     status = bapRsnAcquirePacket( &pPacket, &pData, pktLen );
-    if( VOS_IS_STATUS_SUCCESS( status ) )
+    if( VOS_IS_STATUS_SUCCESS( status ) && ( NULL != pPacket ))
     {
         vos_mem_copy( pData, pSrc, pktLen );
         //Send the packet, need to check whether we have an outstanding packet first.
diff --git a/CORE/BAP/src/bapRsnTxRx.h b/CORE/BAP/src/bapRsnTxRx.h
index 28c53af4145b..ea3d1061a227 100644
--- a/CORE/BAP/src/bapRsnTxRx.h
+++ b/CORE/BAP/src/bapRsnTxRx.h
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 #if !defined( __BAPRSN_TXRX_H )
 #define __BAPRSN_TXRX_H
 
@@ -36,11 +35,6 @@
   
   Description...
     
-  
-               Copyright 2008 (c) Qualcomm Technologies, Inc.
-               All Rights Reserved.
-               Qualcomm Technologies Confidential and Proprietary.
-  
   ==============================================================================*/
 
 #include "vos_types.h"
diff --git a/CORE/BAP/src/btampFsm.c b/CORE/BAP/src/btampFsm.c
index 21b5e104d8dc..f6c29373dc70 100644
--- a/CORE/BAP/src/btampFsm.c
+++ b/CORE/BAP/src/btampFsm.c
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /*===========================================================================
 
                       b t a m p F s m . C
@@ -43,10 +42,6 @@
 
   Are listed for each API below.
 
-
-  Copyright (c) 2008 Qualcomm Technologies, Inc.
-  All Rights Reserved.
-  Qualcomm Technologies Confidential and Proprietary
 ===========================================================================*/
 
 /*===========================================================================
diff --git a/CORE/BAP/src/btampFsm.h b/CORE/BAP/src/btampFsm.h
index abd111fbe036..96fd5edb1c56 100644
--- a/CORE/BAP/src/btampFsm.h
+++ b/CORE/BAP/src/btampFsm.h
@@ -25,11 +25,6 @@
  * to the Linux Foundation.
  */
 
-/*
- * Copyright (c) 2008 Qualcomm Technologies, Inc. All Rights Reserved.
- * Qualcomm Technologies Confidential and Proprietary
- */
-
 /* This file is generated from btampFsm - do not edit manually*/
 /* Generated on: Thu Oct 16 15:40:39 PDT 2008 / version 1.2 Beta 1 */
 
diff --git a/CORE/BAP/src/btampHCI.c b/CORE/BAP/src/btampHCI.c
index 25817df282f2..02f6050c0307 100644
--- a/CORE/BAP/src/btampHCI.c
+++ b/CORE/BAP/src/btampHCI.c
@@ -24,17 +24,12 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 /**
   * \file btampHCI.c
   *
   * \brief Structures, functions & definitions for
   * working with 802.11 Frames
   *
-  *
-  * Copyright (C) 2009 Airgo Networks, Incorporated.
-  *
-  *
   * This file was automatically generated by 'framesc'
   * Fri Feb 27 17:29:19 2009 from the following file(s):
   *
diff --git a/CORE/BAP/src/fsmDefs.h b/CORE/BAP/src/fsmDefs.h
index 20502e0680a4..4cf67f788462 100644
--- a/CORE/BAP/src/fsmDefs.h
+++ b/CORE/BAP/src/fsmDefs.h
@@ -24,7 +24,6 @@
  * under proprietary terms before Copyright ownership was assigned
  * to the Linux Foundation.
  */
-
 // Project/System dependant defines and typedefs
 
 #ifndef __FSMDEFS_H__