From 111e9faf7675fe24029fdd0feaf939fd2b541d95 Mon Sep 17 00:00:00 2001 From: Vevek Venkatesan Date: Tue, 22 Sep 2020 11:57:08 +0530 Subject: [PATCH] Revert "qcacmn: Fix align issue for nbuf alloc" This reverts Change-Id: I8eca9a085c0270f47318e64cefba686eac39a69a That causes nbuf alloc size 64 bytes short of 2K, which leads nbuf data to corrupt SKB shared info. Change-Id: Iece451b4611c3fe9aaac00cc8aa7abbf79093b22 CRs-Fixed: 2779177 --- qdf/linux/src/qdf_nbuf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index 3a86f026fefc..b0c99be128e8 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -456,7 +456,7 @@ struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve, uint32_t lowmem_alloc_tries = 0; if (align) - size = qdf_align(size, align); + size += (align - 1); realloc: skb = dev_alloc_skb(size); @@ -529,7 +529,7 @@ struct sk_buff *__qdf_nbuf_alloc(qdf_device_t osdev, size_t size, int reserve, int flags = GFP_KERNEL; if (align) - size = qdf_align(size, align); + size += (align - 1); if (in_interrupt() || irqs_disabled() || in_atomic()) { flags = GFP_ATOMIC; @@ -600,7 +600,7 @@ __qdf_nbuf_t __qdf_nbuf_alloc_no_recycler(size_t size, int reserve, int align, unsigned long offset; if (align) - size = qdf_align(size, align); + size += (align - 1); nbuf = alloc_skb(size, GFP_ATOMIC); if (!nbuf)