Merge "wlan: During FW logging, program DXE transfer length appropriately"
diff --git a/CORE/DXE/inc/wlan_qct_dxe.h b/CORE/DXE/inc/wlan_qct_dxe.h
index 6204aa5..91f917c 100644
--- a/CORE/DXE/inc/wlan_qct_dxe.h
+++ b/CORE/DXE/inc/wlan_qct_dxe.h
@@ -83,7 +83,12 @@
* Size must be same with Vos Packet Size */
#define WLANDXE_DEFAULT_RX_OS_BUFFER_SIZE (VPKT_SIZE_BUFFER)
-#define WLANDXE_H2H_HEADER_OFFSET (80)
+/*reserve 30B of skb buff, to add NL header*/
+#define WLANDXE_NL_HEADER_SZ (30)
+
+/*MAX data transferred in one skb*/
+#define WLANDXE_FW_LOGGING_XFSIZE (WLANDXE_DEFAULT_RX_OS_BUFFER_SIZE - \
+ WLANDXE_NL_HEADER_SZ)
/*The maximum number of packets that can be chained in dxe for the Low
priority channel
diff --git a/CORE/DXE/src/wlan_qct_dxe.c b/CORE/DXE/src/wlan_qct_dxe.c
index 6708c72..5b28e8d 100644
--- a/CORE/DXE/src/wlan_qct_dxe.c
+++ b/CORE/DXE/src/wlan_qct_dxe.c
@@ -1964,7 +1964,7 @@
currentPalPacketBuffer->BDLength = 0;
if (channelEntry->channelType == WDTS_CHANNEL_RX_FW_LOG)
- wpalPacketRawTrimHead(currentCtrlBlock->xfrFrame, WLANDXE_H2H_HEADER_OFFSET);
+ wpalPacketRawTrimHead(currentCtrlBlock->xfrFrame, WLANDXE_NL_HEADER_SZ);
status = wpalLockPacketForTransfer(currentPalPacketBuffer);
@@ -2122,8 +2122,8 @@
currentDesc = currentCtrlBlk->linkedDesc;
currentDesc->descCtrl.ctrl = channelEntry->extraConfig.cw_ctrl_read;
- xfrSize = WLANDXE_DEFAULT_RX_OS_BUFFER_SIZE > bufferLen ?
- bufferLen : WLANDXE_DEFAULT_RX_OS_BUFFER_SIZE;
+ xfrSize = WLANDXE_FW_LOGGING_XFSIZE > bufferLen ?
+ bufferLen : WLANDXE_FW_LOGGING_XFSIZE;
currentDesc->xfrSize = xfrSize;
allocatedLen += xfrSize;
bufferLen -= xfrSize;