wlan: Disassoc/Deauth reducing log levels from error to info/warn
This change is to reduce some of the logs from error levels to
info and warning level.
Change-Id: If736b88fd57649782eb150c189ae56a11c6e472a
CRs-Fixed: 487284
diff --git a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
index eedfab7..7926a1f 100644
--- a/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDeauthFrame.c
@@ -1,55 +1,23 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *
- * This file limProcessDeauthFrame.cc contains the code
- * for processing Deauthentication Frame.
- * Author: Chandra Modumudi
- * Date: 03/24/02
- * History:-
- * Date Modified by Modification Information
- * --------------------------------------------------------------------
- *
- */
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
+ * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
+ *
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
#include "palTypes.h"
#include "aniGlobal.h"
@@ -156,7 +124,7 @@
if (limCheckDisassocDeauthAckPending(pMac, (tANI_U8*)pHdr->sa))
{
- PELOGW(limLog(pMac, LOGE,
+ PELOGW(limLog(pMac, LOGW,
FL("Ignore the Deauth received, while waiting for ack of disassoc/deauth"));)
limCleanUpDisassocDeauthReq(pMac,(tANI_U8*)pHdr->sa, 1);
return;
@@ -210,11 +178,11 @@
else
{
// Received Deauth frame in either IBSS
- // or un-known role. Log error and ignore it
- limLog(pMac, LOGE,
+ // or un-known role. Log and ignore it
+ limLog(pMac, LOG1,
FL("received Deauth frame with reasonCode %d in role %d from "),
reasonCode, psessionEntry->limSystemRole);
- limPrintMacAddr(pMac, pHdr->sa, LOGE);
+ limPrintMacAddr(pMac, pHdr->sa, LOG1);
return;
}
@@ -272,7 +240,7 @@
PELOGE(limLog(pMac, LOGE, FL("received DeAuth from an AP other than we're trying to join. Ignore. "));)
if (limSearchPreAuthList(pMac, pHdr->sa))
{
- PELOGE(limLog(pMac, LOGE, FL("Preauth entry exist. Deleting... "));)
+ PELOG1(limLog(pMac, LOG1, FL("Preauth entry exist. Deleting... "));)
limDeletePreAuthNode(pMac, pHdr->sa);
}
return;
diff --git a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
index b35d7f3..9cdfcf2 100644
--- a/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
+++ b/CORE/MAC/src/pe/lim/limProcessDisassocFrame.c
@@ -1,45 +1,25 @@
/*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
+ * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
+ * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
+ *
+ *
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all
+ * copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+ * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+*/
/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
+ * Airgo Networks, Inc proprietary. All rights reserved.
* This file limProcessDisassocFrame.cc contains the code
* for processing Disassocation Frame.
* Author: Chandra Modumudi
@@ -164,7 +144,7 @@
if (limCheckDisassocDeauthAckPending(pMac, (tANI_U8*)pHdr->sa))
{
- PELOGW(limLog(pMac, LOGE,
+ PELOGW(limLog(pMac, LOGW,
FL("Ignore the DisAssoc received, while waiting for ack of disassoc/deauth"));)
limCleanUpDisassocDeauthReq(pMac,(tANI_U8*)pHdr->sa, 1);
return;
@@ -240,6 +220,7 @@
// Valid reasonCode in received Disassociation frame
break;
+ case eSIR_MAC_DEAUTH_LEAVING_BSS_REASON:
case eSIR_MAC_DISASSOC_LEAVING_BSS_REASON:
// Valid reasonCode in received Disassociation frame
// as long as we're not about to channel switch
@@ -267,18 +248,18 @@
else
{
// Received Disassociation frame in either IBSS
- // or un-known role. Log error and ignore it
- limLog(pMac, LOGE,
+ // or un-known role. Log and ignore it
+ limLog(pMac, LOG1,
FL("received Disassoc frame with invalid reasonCode %d in role %d in sme state %d from "),
reasonCode, psessionEntry->limSystemRole, psessionEntry->limSmeState);
- limPrintMacAddr(pMac, pHdr->sa, LOGE);
+ limPrintMacAddr(pMac, pHdr->sa, LOG1);
return;
}
// Disassociation from peer MAC entity
- PELOGE(limLog(pMac, LOGE,
+ PELOG1(limLog(pMac, LOG1,
FL("Received Disassoc frame from sta with assocId=%d with reasonCode=%d. Peer MAC is "MAC_ADDRESS_STR),
pStaDs->assocId, reasonCode, MAC_ADDR_ARRAY(pHdr->sa));)
diff --git a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
index 549aab2..f015dd2 100644
--- a/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
+++ b/CORE/MAC/src/pe/lim/limProcessMlmReqMessages.c
@@ -2927,12 +2927,12 @@
sizeof(tSirMacAddr))))
)
{
- PELOGE(limLog(pMac, LOGE,FL("Disassoc/Deauth ack pending"));)
+ PELOG1(limLog(pMac, LOG1, FL("Disassoc/Deauth ack pending"));)
return eANI_BOOLEAN_TRUE;
}
else
{
- PELOGE(limLog(pMac, LOGE,FL("Disassoc/Deauth Ack not pending"));)
+ PELOG1(limLog(pMac, LOG1, FL("Disassoc/Deauth Ack not pending"));)
return eANI_BOOLEAN_FALSE;
}
}