qcacld-3.0: Reorganize the tx & rx member of skb->cb structure

The current tx & rx member of skb->cb structure has lot of common members
duplicated across CONFIG_WIN and CONFIG_MCL.
The common members are now moved out and new members are added as per the
requirement. Also the members are organized to avoid additional padding
and fit within the 48 byte boundary for both 32bit & 64 bit platforms.

Change-Id: I27abc95d51127513cf2e7e9657a4ee84324b2cc9
CRs-Fixed: 2142792

core/dp/htt/htt_internal.h

@@ -136,7 +136,7 @@ struct htt_host_rx_desc_base {
 
 #ifdef DEBUG_RX_RING_BUFFER
 #define NBUF_MAP_ID(skb) \
-	(((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.map_index)
+	(((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m.map_index)
 
 #ifdef MSM_PLATFORM
 #define HTT_ADDRESS_MASK   0xfffffffffffffffe
@@ -265,7 +265,7 @@ static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu,
 			rx_desc->msdu_start.ipv6_proto;
 		QDF_NBUF_CB_RX_TCP_OFFSET(msdu) =
 			rx_desc->msdu_start.l4_offset;
-		QDF_NBUF_CB_RX_FLOW_ID_TOEPLITZ(msdu) =
+		QDF_NBUF_CB_RX_FLOW_ID(msdu) =
 			rx_desc->msdu_start.flow_id_toeplitz;
 	}
 }