qcacmn: 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 win & mcl sub structures.
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: 2120295
此提交包含在:
Vivek
2017-11-30 17:24:18 +05:30
提交者 snandini
父節點 6fee59c4d5
當前提交 de90e59667
共有 10 個檔案被更改,包括 757 行新增495 行删除

查看文件

@@ -265,10 +265,10 @@ dp_rx_deliver_raw(struct dp_vdev *vdev, qdf_nbuf_t nbuf_list,
* as this is a non-amsdu pkt and RAW mode simulation expects
* these bit s to be 0 for non-amsdu pkt.
*/
if (qdf_nbuf_is_chfrag_start(nbuf) &&
qdf_nbuf_is_chfrag_end(nbuf)) {
qdf_nbuf_set_chfrag_start(nbuf, 0);
qdf_nbuf_set_chfrag_end(nbuf, 0);
if (qdf_nbuf_is_rx_chfrag_start(nbuf) &&
qdf_nbuf_is_rx_chfrag_end(nbuf)) {
qdf_nbuf_set_rx_chfrag_start(nbuf, 0);
qdf_nbuf_set_rx_chfrag_end(nbuf, 0);
}
nbuf = next;
@@ -471,10 +471,10 @@ void dp_rx_fill_mesh_stats(struct dp_vdev *vdev, qdf_nbuf_t nbuf,
}
rx_info->rs_flags = MESH_RXHDR_VER1;
if (qdf_nbuf_is_chfrag_start(nbuf))
if (qdf_nbuf_is_rx_chfrag_start(nbuf))
rx_info->rs_flags |= MESH_RX_FIRST_MSDU;
if (qdf_nbuf_is_chfrag_end(nbuf))
if (qdf_nbuf_is_rx_chfrag_end(nbuf))
rx_info->rs_flags |= MESH_RX_LAST_MSDU;
if (hal_rx_attn_msdu_get_is_decrypted(rx_tlv_hdr)) {
@@ -496,7 +496,7 @@ void dp_rx_fill_mesh_stats(struct dp_vdev *vdev, qdf_nbuf_t nbuf,
rx_info->rs_ratephy1 = rate_mcs | (nss << 0x8) | (pkt_type << 16) |
(bw << 24);
qdf_nbuf_set_fctx_type(nbuf, (void *)rx_info, CB_FTYPE_MESH_RX_INFO);
qdf_nbuf_set_rx_fctx_type(nbuf, (void *)rx_info, CB_FTYPE_MESH_RX_INFO);
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
FL("Mesh rx stats: flags %x, rssi %x, chn %x, rate %x, kix %x"),
@@ -821,10 +821,10 @@ void dp_rx_sg_create(qdf_nbuf_t nbuf, uint8_t *rx_tlv_hdr,
uint16_t *frag_list_len, qdf_nbuf_t *head_frag_nbuf,
qdf_nbuf_t *frag_list_head, qdf_nbuf_t *frag_list_tail)
{
if (qdf_unlikely(qdf_nbuf_is_chfrag_cont(nbuf))) {
if (qdf_unlikely(qdf_nbuf_is_rx_chfrag_cont(nbuf))) {
if (!(*is_first_frag)) {
*is_first_frag = 1;
qdf_nbuf_set_chfrag_start(nbuf, 1);
qdf_nbuf_set_rx_chfrag_start(nbuf, 1);
*mpdu_len = hal_rx_msdu_start_msdu_len_get(rx_tlv_hdr);
dp_rx_adjust_nbuf_len(nbuf, mpdu_len);
@@ -840,7 +840,7 @@ void dp_rx_sg_create(qdf_nbuf_t nbuf, uint8_t *rx_tlv_hdr,
}
} else {
if (qdf_unlikely(*is_first_frag)) {
qdf_nbuf_set_chfrag_start(nbuf, 0);
qdf_nbuf_set_rx_chfrag_start(nbuf, 0);
dp_rx_adjust_nbuf_len(nbuf, mpdu_len);
qdf_nbuf_pull_head(nbuf,
RX_PKT_TLVS_LEN);
@@ -1033,13 +1033,13 @@ dp_rx_process(struct dp_intr *int_ctx, void *hal_ring, uint32_t quota)
* nbuf->cb
*/
if (msdu_desc_info.msdu_flags & HAL_MSDU_F_FIRST_MSDU_IN_MPDU)
qdf_nbuf_set_chfrag_start(rx_desc->nbuf, 1);
qdf_nbuf_set_rx_chfrag_start(rx_desc->nbuf, 1);
if (msdu_desc_info.msdu_flags & HAL_MSDU_F_MSDU_CONTINUATION)
qdf_nbuf_set_chfrag_cont(rx_desc->nbuf, 1);
qdf_nbuf_set_rx_chfrag_cont(rx_desc->nbuf, 1);
if (msdu_desc_info.msdu_flags & HAL_MSDU_F_LAST_MSDU_IN_MPDU)
qdf_nbuf_set_chfrag_end(rx_desc->nbuf, 1);
qdf_nbuf_set_rx_chfrag_end(rx_desc->nbuf, 1);
DP_STATS_INC_PKT(peer, rx.rcvd_reo[ring_id], 1,
qdf_nbuf_len(rx_desc->nbuf));
@@ -1068,7 +1068,7 @@ fail:
* across multiple buffers, let us not decrement quota
* till we reap all buffers of that MSDU.
*/
if (qdf_likely(!qdf_nbuf_is_chfrag_cont(rx_desc->nbuf)))
if (qdf_likely(!qdf_nbuf_is_rx_chfrag_cont(rx_desc->nbuf)))
quota -= 1;