From f1392936e6c35fd22d5e0139bb9171bbaab9dcf7 Mon Sep 17 00:00:00 2001 From: Shivani Soni Date: Thu, 17 Sep 2020 11:28:09 +0530 Subject: [PATCH] qcacmn: Reserve 128 bytes headroom in monitor status buffer Reserve 128 bytes headroom for monitor status buffer to accomadate feature specific radiotap header or any other info in the headroom. CRs-Fixed: 2775118 Change-Id: I2b1aba26e565b58c48a2e24ad17965aacd6b4526 --- dp/wifi3.0/dp_rx_mon_status.c | 2 +- hal/wifi3.0/hal_rx.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 34e184e21c59..fcf5d426ba16 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -1838,7 +1838,7 @@ dp_rx_nbuf_prepare(struct dp_soc *soc, struct dp_pdev *pdev) nbuf_retry_count++) { /* Allocate a new skb using alloc_skb */ nbuf = qdf_nbuf_alloc_no_recycler(RX_MON_STATUS_BUF_SIZE, - RX_BUFFER_RESERVATION, + RX_MON_STATUS_BUF_RESERVATION, RX_DATA_BUFFER_ALIGNMENT); if (!nbuf) { diff --git a/hal/wifi3.0/hal_rx.h b/hal/wifi3.0/hal_rx.h index 1ef460b529d2..e08144b8e487 100644 --- a/hal/wifi3.0/hal_rx.h +++ b/hal/wifi3.0/hal_rx.h @@ -40,13 +40,15 @@ #define RX_MONITOR_BUFFER_SIZE 2048 #endif -/* MONITOR STATUS BUFFER SIZE = 1536 data bytes, buffer allocation of 2k bytes - * including skb shared info and buffer alignment. +/* MONITOR STATUS BUFFER SIZE = 1408 data bytes, buffer allocation of 2k bytes + * including buffer reservation, buffer alignment and skb shared info size. */ #define RX_MON_STATUS_BASE_BUF_SIZE 2048 #define RX_MON_STATUS_BUF_ALIGN 128 +#define RX_MON_STATUS_BUF_RESERVATION 128 #define RX_MON_STATUS_BUF_SIZE (RX_MON_STATUS_BASE_BUF_SIZE - \ - RX_MON_STATUS_BUF_ALIGN - QDF_SHINFO_SIZE) + (RX_MON_STATUS_BUF_RESERVATION + \ + RX_MON_STATUS_BUF_ALIGN + QDF_SHINFO_SIZE)) /* HAL_RX_NON_QOS_TID = NON_QOS_TID which is 16 */ #define HAL_RX_NON_QOS_TID 16