wlan : [HDD_ACTION_FRAME]Display action frame info with wlan_hdd_action
The received action frame info is not available over the logs while
getting processed in hdd layer. Printing of action frame info,
based on the type is added to the existing print.
Change-Id: I5fae1c5eab684f79317208eb578eea207fcbc0ec
CRs-Fixed: 590432
(cherry picked from commit 95af7145ffa7f77eb5e2786dfc30d0cf239816cd)
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index c230be3..e0b86d0 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -44,6 +44,7 @@
#include "wlan_hdd_p2p.h"
#include "sapApi.h"
#include "wlan_hdd_main.h"
+#include "vos_trace.h"
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <linux/etherdevice.h>
@@ -57,6 +58,34 @@
//Ms to Micro Sec
#define MS_TO_MUS(x) ((x)*1000);
+tANI_U8* hdd_getActionString( tANI_U16 MsgType )
+{
+ switch (MsgType)
+ {
+ CASE_RETURN_STRING(SIR_MAC_ACTION_SPECTRUM_MGMT);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_QOS_MGMT);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_DLP);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_BLKACK);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_PUBLIC_USAGE);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_RRM);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_FAST_BSS_TRNST);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_HT);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_SA_QUERY);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_PROT_DUAL_PUB);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_WNM);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_UNPROT_WNM);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_TDLS);
+ CASE_RETURN_STRING(SIR_MAC_ACITON_MESH);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_MULTIHOP);
+ CASE_RETURN_STRING(SIR_MAC_SELF_PROTECTED);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_WME);
+ CASE_RETURN_STRING(SIR_MAC_ACTION_VHT);
+ default:
+ return ("UNKNOWN");
+ }
+}
+
+
#ifdef WLAN_FEATURE_P2P_DEBUG
#define MAX_P2P_ACTION_FRAME_TYPE 9
const char *p2p_action_frame_type[]={"GO Negotiation Request",
@@ -167,7 +196,7 @@
{
if( cfgState->buf )
{
- hddLog( LOGE,
+ hddLog( LOGP,
"%s: We need to receive yet an ack from one of tx packet",
__func__);
}
@@ -228,9 +257,9 @@
"Cancel Existing ROC (cookie=%llu)",
cfgState->remain_on_chan_ctx->cookie);
- /* 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
+ /* 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,
@@ -243,7 +272,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.
@@ -372,7 +401,7 @@
pRemainChanCtx->rem_on_chan_request = request_type;
cfgState->remain_on_chan_ctx = pRemainChanCtx;
cfgState->current_freq = chan->center_freq;
-
+
INIT_COMPLETION(pAdapter->rem_on_chan_ready_event);
//call sme API to start remain on channel.
@@ -589,7 +618,7 @@
( WLAN_HDD_P2P_DEVICE == pAdapter->device_mode )
)
{
- tANI_U8 sessionId = pAdapter->sessionId;
+ tANI_U8 sessionId = pAdapter->sessionId;
sme_CancelRemainOnChannel( WLAN_HDD_GET_HAL_CTX( pAdapter ),
sessionId );
}
@@ -600,7 +629,7 @@
WLANSAP_CancelRemainOnChannel(
(WLAN_HDD_GET_CTX(pAdapter))->pvosContext);
}
- else
+ else
{
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: Invalid device_mode = %d",
__func__, pAdapter->device_mode);
@@ -737,9 +766,9 @@
{
if (subType == SIR_MAC_MGMT_PROBE_RSP)
{
- /* Drop Probe response recieved from supplicant, as for GO and
+ /* Drop Probe response recieved from supplicant, as for GO and
SAP PE itself sends probe response
- */
+ */
goto err_rem_channel;
}
else if ((subType == SIR_MAC_MGMT_DISASSOC) ||
@@ -780,7 +809,11 @@
}
}
- hddLog( LOG1, "Action frame tx request");
+ if( subType == SIR_MAC_MGMT_ACTION)
+ {
+ hddLog( LOG1, "Action frame tx request : %s",
+ hdd_getActionString(buf[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET]));
+ }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
goAdapter = hdd_get_adapter( pAdapter->pHddCtx, WLAN_HDD_P2P_GO );
@@ -930,7 +963,7 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
}
#endif
- }
+ }
if ( (WLAN_HDD_INFRA_STATION == pAdapter->device_mode) ||
(WLAN_HDD_P2P_CLIENT == pAdapter->device_mode) ||
@@ -1098,11 +1131,11 @@
* hdd_setP2pNoa
*
*FUNCTION:
- * This function is called from hdd_hostapd_ioctl function when Driver
+ * This function is called from hdd_hostapd_ioctl function when Driver
* get P2P_SET_NOA comand from wpa_supplicant using private ioctl
*
*LOGIC:
- * Fill NoA Struct According to P2P Power save Option and Pass it to SME layer
+ * Fill NoA Struct According to P2P Power save Option and Pass it to SME layer
*
*ASSUMPTIONS:
*
@@ -1110,7 +1143,7 @@
*NOTE:
*
* @param dev Pointer to net device structure
- * @param command Pointer to command
+ * @param command Pointer to command
*
* @return Status
*/
@@ -1238,12 +1271,12 @@
/* From wpa_cli user need to use separate command to set ctWindow and Opps
* When user want to set ctWindow during that time other parameters
- * values are coming from wpa_supplicant as -1.
- * Example : User want to set ctWindow with 30 then wpa_cli command :
- * P2P_SET ctwindow 30
- * Command Received at hdd_hostapd_ioctl is as below:
+ * values are coming from wpa_supplicant as -1.
+ * Example : User want to set ctWindow with 30 then wpa_cli command :
+ * P2P_SET ctwindow 30
+ * Command Received at hdd_hostapd_ioctl is as below:
* P2P_SET_PS -1 -1 30 (legacy_ps = -1, opp_ps = -1, ctwindow = 30)
- */
+ */
if (ctwindow != -1)
{
@@ -1254,7 +1287,7 @@
if (ctwindow != pAdapter->ctw)
{
pAdapter->ctw = ctwindow;
-
+
if(pAdapter->ops)
{
NoA.opp_ps = pAdapter->ops;
@@ -1265,7 +1298,7 @@
NoA.count = 0;
NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
NoA.sessionid = pAdapter->sessionId;
-
+
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO,
"%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
"interval %d count %d single noa duration %d "
@@ -1284,7 +1317,7 @@
{
pAdapter->ops = opp_ps;
- if ((opp_ps != -1) && (pAdapter->ctw))
+ if ((opp_ps != -1) && (pAdapter->ctw))
{
NoA.opp_ps = opp_ps;
NoA.ctWindow = pAdapter->ctw;
@@ -1410,7 +1443,7 @@
*/
v_MACADDR_t p2pDeviceAddress = pHddCtx->p2pDeviceAddress;
p2pDeviceAddress.bytes[4] ^= 0x80;
- pAdapter = hdd_open_adapter( pHddCtx,
+ pAdapter = hdd_open_adapter( pHddCtx,
wlan_hdd_get_session_type(type),
name, p2pDeviceAddress.bytes,
VOS_TRUE );
@@ -1482,7 +1515,7 @@
void hdd_sendMgmtFrameOverMonitorIface( hdd_adapter_t *pMonAdapter,
tANI_U32 nFrameLength,
tANI_U8* pbFrames,
- tANI_U8 frameType )
+ tANI_U8 frameType )
{
//Indicate a Frame over Monitor Intf.
int rxstat;
@@ -1558,7 +1591,7 @@
}
void hdd_indicateMgmtFrame( hdd_adapter_t *pAdapter,
- tANI_U32 nFrameLength,
+ tANI_U32 nFrameLength,
tANI_U8* pbFrames,
tANI_U8 frameType,
tANI_U32 rxChan,
@@ -1665,8 +1698,8 @@
}
cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
-
- if ((type == SIR_MAC_MGMT_FRAME) &&
+
+ if ((type == SIR_MAC_MGMT_FRAME) &&
(subType == SIR_MAC_MGMT_ACTION))
{
if(pbFrames[WLAN_HDD_PUBLIC_ACTION_FRAME_OFFSET] == WLAN_HDD_PUBLIC_ACTION_FRAME)
@@ -1816,7 +1849,7 @@
pos++;
put_unaligned_le16(rx_flags, pos);
pos += 2;
-
+
// actually push the data
memcpy(skb_push(skb, rtap_len), &rtap_temp[0], rtap_len);