From 3666b075cf220cea62b0f02bcabc4b4cffa70b72 Mon Sep 17 00:00:00 2001 From: kaliu Date: Mon, 19 Dec 2016 11:00:24 +0800 Subject: qcacld-2.0: Adjust struct cvg_nbuf_cb to byte alignment Max size of control buffer in skb is 48 and the resource is scarce, so adjust driver corresponding struct cvg_nbuf_cb to byte alignment. Also remove the member vdev_id that is not used. If don't change, in 64bits SDIO case, it will overflow. Change-Id: I2315672a87f3bc456d5f8cff2c7f672af602e04b CRs-Fixed: 1102695 --- CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h index 1c0efb7000a5..b6f99dadfa77 100644 --- a/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h +++ b/CORE/SERVICES/COMMON/adf/linux/adf_nbuf_pvt.h @@ -66,6 +66,8 @@ typedef void (*__adf_nbuf_callback_fn) (struct sk_buff *skb); typedef void (*adf_nbuf_trace_update_t)(char *); +#pragma pack(push) +#pragma pack(1) struct cvg_nbuf_cb { /* * Store a pointer to a parent network buffer. @@ -136,7 +138,6 @@ struct cvg_nbuf_cb { #endif /* QCA_MDM_DEVICE */ #ifdef QCA_PKT_PROTO_TRACE unsigned char proto_type; - unsigned char vdev_id; #endif /* QCA_PKT_PROTO_TRACE */ #ifdef QOS_FWD_SUPPORT unsigned char fwd_flag: 1; @@ -154,6 +155,7 @@ struct cvg_nbuf_cb { uint8_t reserved: 2; } packet_type; } __packed; +#pragma pack(pop) #ifdef QCA_ARP_SPOOFING_WAR #define NBUF_CB_PTR(skb) \ -- cgit v1.2.3