diff options
Diffstat (limited to 'qdf/linux/src')
| -rw-r--r-- | qdf/linux/src/i_qdf_nbuf.h | 13 | ||||
| -rw-r--r-- | qdf/linux/src/qdf_nbuf.c | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h index d94f0709845b..ac1177e8001b 100644 --- a/qdf/linux/src/i_qdf_nbuf.h +++ b/qdf/linux/src/i_qdf_nbuf.h @@ -116,6 +116,7 @@ typedef union { * @tx.trace : combined structure for DP and protocol trace * @tx.trace.packet_state: {NBUF_TX_PKT_[(HDD)|(TXRX_ENQUEUE)|(TXRX_DEQUEUE)| * + (TXRX)|(HTT)|(HTC)|(HIF)|(CE)|(FREE)] + * @tx.trace.is_packet_priv: flag, pkt generated internally or come from NS * @tx.trace.packet_track: {NBUF_TX_PKT_[(DATA)|(MGMT)]_TRACK} * @tx.trace.proto_type : bitmap of NBUF_PKT_TRAC_TYPE[(EAPOL)|(DHCP)| * + (MGMT_ACTION)] - 4 bits @@ -182,7 +183,8 @@ struct qdf_nbuf_cb { struct { uint32_t data_attr; /* 4 bytes */ struct{ - uint8_t packet_state; + uint8_t packet_state:7, + is_packet_priv:1; uint8_t packet_track:4, proto_type:4; uint8_t dp_trace:1, @@ -274,6 +276,9 @@ struct qdf_nbuf_cb { #define QDF_NBUF_CB_TX_PACKET_STATE(skb) \ (((struct qdf_nbuf_cb *) \ ((skb)->cb))->u.tx.dev.mcl.trace.packet_state) +#define QDF_NBUF_CB_TX_IS_PACKET_PRIV(skb) \ + (((struct qdf_nbuf_cb *) \ + ((skb)->cb))->u.tx.dev.mcl.trace.is_packet_priv) #define QDF_NBUF_CB_TX_PACKET_TRACK(skb) \ (((struct qdf_nbuf_cb *) \ ((skb)->cb))->u.tx.dev.mcl.trace.packet_track) @@ -501,6 +506,7 @@ void __qdf_nbuf_unmap_nbytes_single( void __qdf_nbuf_dma_map_info(__qdf_dma_map_t bmap, qdf_dmamap_info_t *sg); uint32_t __qdf_nbuf_get_frag_size(__qdf_nbuf_t nbuf, uint32_t cur_frag); void __qdf_nbuf_frag_info(struct sk_buff *skb, qdf_sglist_t *sg); +void qdf_net_buf_debug_delete_node(struct sk_buff *net_buf); QDF_STATUS __qdf_nbuf_frag_map( qdf_device_t osdev, __qdf_nbuf_t nbuf, int offset, qdf_dma_dir_t dir, int cur_frag); @@ -941,6 +947,11 @@ static inline void __qdf_nbuf_tx_free(struct sk_buff *bufs, int tx_err) { while (bufs) { struct sk_buff *next = __qdf_nbuf_next(bufs); + + if (QDF_NBUF_CB_TX_IS_PACKET_PRIV(bufs)) { + if (qdf_likely(bufs)) + qdf_net_buf_debug_delete_node(bufs); + } __qdf_nbuf_free(bufs); bufs = next; } diff --git a/qdf/linux/src/qdf_nbuf.c b/qdf/linux/src/qdf_nbuf.c index df2831c04577..8e771bfee684 100644 --- a/qdf/linux/src/qdf_nbuf.c +++ b/qdf/linux/src/qdf_nbuf.c @@ -1527,9 +1527,7 @@ void qdf_net_buf_debug_add_node(qdf_nbuf_t net_buf, size_t size, qdf_print("Double allocation of skb ! Already allocated from %p %s %d current alloc from %p %s %d", p_node->net_buf, p_node->file_name, p_node->line_num, net_buf, file_name, line_num); - QDF_ASSERT(0); qdf_nbuf_track_free(new_node); - goto done; } else { p_node = new_node; if (p_node) { @@ -1539,15 +1537,11 @@ void qdf_net_buf_debug_add_node(qdf_nbuf_t net_buf, size_t size, p_node->size = size; p_node->p_next = gp_qdf_net_buf_track_tbl[i]; gp_qdf_net_buf_track_tbl[i] = p_node; - } else { + } else qdf_print( "Mem alloc failed ! Could not track skb from %s %d of size %zu", file_name, line_num, size); - QDF_ASSERT(0); - } } - -done: spin_unlock_irqrestore(&g_qdf_net_buf_track_lock[i], irq_flag); return; |