From 2be79bf9fd3af1251ce7707452180e2c602fe864 Mon Sep 17 00:00:00 2001 From: bings Date: Fri, 17 Apr 2020 16:52:43 +0800 Subject: [PATCH] qcacmn: sizeof_field support for 4.16+ kernel sizeof_field is defined from kernel 4.16. So use sizeof_field instead of FIELD_SIZEOF from kernel 4.16. Change-Id: I291531ea86499a7c0ba52fbb6607b19dff533111 CRs-Fixed: 2666512 --- qdf/linux/src/i_qdf_nbuf.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h index 9e291cd0fd89..90744e9ef723 100644 --- a/qdf/linux/src/i_qdf_nbuf.h +++ b/qdf/linux/src/i_qdf_nbuf.h @@ -336,8 +336,15 @@ struct qdf_nbuf_cb { } u; }; /* struct qdf_nbuf_cb: MAX 48 bytes */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) QDF_COMPILE_TIME_ASSERT(qdf_nbuf_cb_size, - (sizeof(struct qdf_nbuf_cb)) <= FIELD_SIZEOF(struct sk_buff, cb)); + (sizeof(struct qdf_nbuf_cb)) <= + sizeof_field(struct sk_buff, cb)); +#else +QDF_COMPILE_TIME_ASSERT(qdf_nbuf_cb_size, + (sizeof(struct qdf_nbuf_cb)) <= + FIELD_SIZEOF(struct sk_buff, cb)); +#endif /** * access macros to qdf_nbuf_cb