source: G950FXXS5DSI1

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / drivers / net / wireless / bcmdhd4361 / linux_pkt.c

diff --git a/drivers/net/wireless/bcmdhd4361/linux_pkt.c b/drivers/net/wireless/bcmdhd4361/linux_pkt.c
index 15ab16c53e23bea61908f9064e14a0e2d753f619..8231e583e6ab1691c8c997fbe92a863b9e77020d 100755 (executable)
--- a/drivers/net/wireless/bcmdhd4361/linux_pkt.c
+++ b/drivers/net/wireless/bcmdhd4361/linux_pkt.c
@@ -24,7 +24,7 @@
  *
  * <<Broadcom-WL-IPTag/Open:>>
  *
- * $Id: linux_pkt.c 769679 2018-06-27 07:14:30Z $
+ * $Id: linux_pkt.c 800754 2019-01-23 08:38:54Z $
  */
 
 #include <typedefs.h>
@@ -54,21 +54,17 @@ void* wifi_platform_prealloc(void *adapter, int section, unsigned long size);
 #define OSL_PKTTAG_CLEAR(p) \
 do { \
        struct sk_buff *s = (struct sk_buff *)(p); \
-       ASSERT(OSL_PKTTAG_SZ == 32); \
-       *(uint32 *)(&s->cb[4]) = 0; \
-       *(uint32 *)(&s->cb[8]) = 0; *(uint32 *)(&s->cb[12]) = 0; \
-       *(uint32 *)(&s->cb[16]) = 0; *(uint32 *)(&s->cb[20]) = 0; \
-       *(uint32 *)(&s->cb[24]) = 0; *(uint32 *)(&s->cb[28]) = 0; \
+       uint tagsz = sizeof(s->cb); \
+       ASSERT(OSL_PKTTAG_SZ <= tagsz); \
+       memset(s->cb + 4, 0, tagsz - 4); \
 } while (0)
 #else
 #define OSL_PKTTAG_CLEAR(p) \
 do { \
        struct sk_buff *s = (struct sk_buff *)(p); \
-       ASSERT(OSL_PKTTAG_SZ == 32); \
-       *(uint32 *)(&s->cb[0]) = 0; *(uint32 *)(&s->cb[4]) = 0; \
-       *(uint32 *)(&s->cb[8]) = 0; *(uint32 *)(&s->cb[12]) = 0; \
-       *(uint32 *)(&s->cb[16]) = 0; *(uint32 *)(&s->cb[20]) = 0; \
-       *(uint32 *)(&s->cb[24]) = 0; *(uint32 *)(&s->cb[28]) = 0; \
+       uint tagsz = sizeof(s->cb); \
+       ASSERT(OSL_PKTTAG_SZ <= tagsz); \
+       memset(s->cb, 0, tagsz); \
 } while (0)
 #endif /* BCM_OBJECT_TRACE */