wlan: lim: fix logging format/argument mismatch
Source code analysis uncovered mismatches between format and argument
in invocations of logging APIs in the lim code, so fix them.
Change-Id: I4a8a9bc6fe0492e08fb7b81e1b231e14f80820d6
CRs-fixed: 570511
diff --git a/CORE/MAC/src/pe/lim/limSendManagementFrames.c b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
index b12149e..1e7a0e9 100644
--- a/CORE/MAC/src/pe/lim/limSendManagementFrames.c
+++ b/CORE/MAC/src/pe/lim/limSendManagementFrames.c
@@ -396,7 +396,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Request (0x%08x).") );
+ "robe Request (0x%08x)."), nStatus );
}
// Append any AddIE if present.
@@ -870,7 +870,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Response (0x%08x).") );
+ "robe Response (0x%08x)."), nStatus );
}
PELOG3(limLog( pMac, LOG3, FL("Sending Probe Response frame to ") );
@@ -1141,8 +1141,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "an Add TS Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "an Add TS Request (0x%08x)."), nStatus );
}
}
else
@@ -1160,8 +1160,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Add TS Request (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Add TS Request (0x%08x)."), nStatus );
}
}
@@ -1360,7 +1360,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an Association Re"
"sponse (0x%08x)."), nStatus );
}
@@ -1446,7 +1446,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing an "
- "Association Response (0x%08x).") );
+ "Association Response (0x%08x)."), nStatus );
}
macAddr = pMacHdr->da;
@@ -1627,7 +1627,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while calcula"
- "tingthe packed size for an Add TS"
+ "ting the packed size for an Add TS"
" Response (0x%08x)."), nStatus );
}
}
@@ -1654,7 +1654,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while calcula"
- "tingthe packed size for a WMM Add"
+ "ting the packed size for a WMM Add"
"TS Response (0x%08x)."), nStatus );
}
}
@@ -1719,8 +1719,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "an Add TS Response (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "an Add TS Response (0x%08x)."), nStatus );
}
}
else
@@ -1738,8 +1738,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Add TS Response (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Add TS Response (0x%08x)."), nStatus );
}
}
@@ -1904,8 +1904,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a Del TS frame (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a Del TS frame (0x%08x)."), nStatus );
}
}
else
@@ -1922,8 +1922,8 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while packing"
- "a WMM Del TS frame (0x%08x).") );
+ limLog( pMac, LOGW, FL("There were warnings while packing "
+ "a WMM Del TS frame (0x%08x)."), nStatus );
}
}
@@ -2204,7 +2204,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -2272,7 +2272,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a P"
- "robe Response (0x%08x).") );
+ "robe Response (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Association Request length %d"
@@ -2598,7 +2598,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Re-Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -2664,7 +2664,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a R"
- "e-Association Request (0x%08x).") );
+ "e-Association Request (0x%08x)."), nStatus );
}
PELOG3(limLog( pMac, LOG3,
@@ -3011,7 +3011,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Re-Association Re "
"quest(0x%08x)."), nStatus );
}
@@ -3062,7 +3062,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a R"
- "e-Association Request (0x%08x).") );
+ "e-Association Request (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Re-Association Request length %d"
@@ -3666,7 +3666,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Disassociation "
"(0x%08x)."), nStatus );
}
@@ -3722,7 +3722,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a D"
- "isassociation (0x%08x).") );
+ "isassociation (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending Disassociation frame with rea"
@@ -3846,7 +3846,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a De-Authentication "
"(0x%08x)."), nStatus );
}
@@ -3902,7 +3902,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a D"
- "e-Authentication (0x%08x).") );
+ "e-Authentication (0x%08x)."), nStatus );
}
PELOG1(limLog( pMac, LOG1, FL("*** Sending De-Authentication frame with rea"
@@ -4075,7 +4075,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Measurement Rep"
"ort (0x%08x)."), nStatus );
}
@@ -4135,7 +4135,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a M"
- "easurement Report (0x%08x).") );
+ "easurement Report (0x%08x)."), nStatus );
}
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) nBytes,
@@ -4198,7 +4198,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a TPC Request (0x"
"%08x)."), nStatus );
}
@@ -4258,7 +4258,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a T"
- "PC Request (0x%08x).") );
+ "PC Request (0x%08x)."), nStatus );
}
halstatus = halTxFrame( pMac, pPacket, ( tANI_U16 ) nBytes,
@@ -4329,7 +4329,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a TPC Report (0x"
"%08x)."), nStatus );
}
@@ -4389,7 +4389,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a T"
- "PC Report (0x%08x).") );
+ "PC Report (0x%08x)."), nStatus );
}
@@ -4469,7 +4469,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Channel Switch (0x"
"%08x)."), nStatus );
}
@@ -4535,7 +4535,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a C"
- "hannel Switch (0x%08x).") );
+ "hannel Switch (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
@@ -4600,7 +4600,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Operating Mode (0x"
"%08x)."), nStatus );
}
@@ -4651,7 +4651,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a Operating Mode"
- " (0x%08x).") );
+ " (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
|| ( psessionEntry->pePersona == VOS_P2P_CLIENT_MODE ) ||
@@ -4739,7 +4739,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Channel Switch (0x"
"%08x)."), nStatus );
}
@@ -4784,7 +4784,7 @@
else if ( DOT11F_WARNED( nStatus ) )
{
limLog( pMac, LOGW, FL("There were warnings while packing a C"
- "hannel Switch (0x%08x).") );
+ "hannel Switch (0x%08x)."), nStatus );
}
if( ( SIR_BAND_5_GHZ == limGetRFBand(psessionEntry->currentOperChannel))
@@ -4891,7 +4891,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an ADDBA Req (0x%08x)."),
nStatus );
}
@@ -4973,7 +4973,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an ADDBA Req (0x%08x)." ));
+ FL( "There were warnings while packing an ADDBA Req (0x%08x)."),
+ nStatus );
}
limLog( pMac, LOGW,
@@ -5102,7 +5103,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an ADDBA Rsp (0x%08x)."),
nStatus );
}
@@ -5185,7 +5186,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an ADDBA Rsp (0x%08x)." ));
+ FL( "There were warnings while packing an ADDBA Rsp (0x%08x)." ),
+ nStatus);
}
limLog( pMac, LOGW,
@@ -5301,7 +5303,7 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while calculating"
+ FL( "There were warnings while calculating "
"the packed size for an DELBA Ind (0x%08x)."),
nStatus );
}
@@ -5383,7 +5385,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing an DELBA Ind (0x%08x)." ));
+ FL( "There were warnings while packing an DELBA Ind (0x%08x)." ),
+ nStatus);
}
limLog( pMac, LOGW,
@@ -5491,7 +5494,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Neighbor Rep"
"ort Request(0x%08x)."), nStatus );
}
@@ -5547,7 +5550,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Neighbor Report Request (0x%08x)." ));
+ FL( "There were warnings while packing Neighbor Report "
+ "Request (0x%08x)." ), nStatus);
}
limLog( pMac, LOGW,
@@ -5659,7 +5663,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Link Rep"
"ort (0x%08x)."), nStatus );
}
@@ -5715,7 +5719,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Link Report (0x%08x)." ));
+ FL( "There were warnings while packing Link Report (0x%08x)." ),
+ nStatus );
}
limLog( pMac, LOGW,
@@ -5848,7 +5853,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for a Radio Measure Rep"
"ort (0x%08x)."), nStatus );
}
@@ -5905,7 +5910,8 @@
else if( DOT11F_WARNED( nStatus ))
{
limLog( pMac, LOGW,
- FL( "There were warnings while packing Radio Measure Report (0x%08x)." ));
+ FL( "There were warnings while packing Radio "
+ "Measure Report (0x%08x)." ), nStatus);
}
limLog( pMac, LOGW,
@@ -6002,7 +6008,7 @@
}
else if ( DOT11F_WARNED( nStatus ) )
{
- limLog( pMac, LOGW, FL("There were warnings while calculating"
+ limLog( pMac, LOGW, FL("There were warnings while calculating "
"the packed size for an SA Query Response"
" (0x%08x)."), nStatus );
}