qcacld-3.0: Update driver to use QDF NBUF APIs(1/2)
Update driver to use QDF NBUF APIs
Change-Id: I4409b6c046de1221b57baed45088d5f3b898b565
CRs-Fixed: 981188
diff --git a/core/dp/htt/htt.c b/core/dp/htt/htt.c
index ea8a933..58a7dcc 100644
--- a/core/dp/htt/htt.c
+++ b/core/dp/htt/htt.c
@@ -121,14 +121,14 @@
void htt_htc_misc_pkt_pool_free(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt_union *pkt, *next;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
pkt = pdev->htt_htc_pkt_misclist;
while (pkt) {
next = pkt->u.next;
- netbuf = (cdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext);
- cdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE);
- cdf_nbuf_free(netbuf);
+ netbuf = (qdf_nbuf_t) (pkt->u.pkt.htc_pkt.pNetBufContext);
+ qdf_nbuf_unmap(pdev->osdev, netbuf, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_free(netbuf);
qdf_mem_free(pkt);
pkt = next;
}
diff --git a/core/dp/htt/htt_fw_stats.c b/core/dp/htt/htt_fw_stats.c
index eb86320..0bf4c13 100644
--- a/core/dp/htt/htt_fw_stats.c
+++ b/core/dp/htt/htt_fw_stats.c
@@ -32,7 +32,7 @@
#include <htc_api.h> /* HTC_PACKET */
#include <htt.h> /* HTT_T2H_MSG_TYPE, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_mem.h> /* qdf_mem_set */
#include <ol_fw_tx_dbg.h> /* ol_fw_tx_dbg_ppdu_base */
diff --git a/core/dp/htt/htt_h2t.c b/core/dp/htt/htt_h2t.c
index bb8e714..39762b5 100644
--- a/core/dp/htt/htt_h2t.c
+++ b/core/dp/htt/htt_h2t.c
@@ -43,7 +43,7 @@
*/
#include <qdf_mem.h> /* qdf_mem_copy */
-#include <cdf_nbuf.h> /* cdf_nbuf_map_single */
+#include <qdf_nbuf.h> /* qdf_nbuf_map_single */
#include <htc_api.h> /* HTC_PACKET */
#include <htc.h> /* HTC_HDR_ALIGNMENT_PADDING */
#include <htt.h> /* HTT host->target msg defs */
@@ -62,25 +62,25 @@
static void
htt_h2t_send_complete_free_netbuf(void *pdev, A_STATUS status,
- cdf_nbuf_t netbuf, uint16_t msdu_id)
+ qdf_nbuf_t netbuf, uint16_t msdu_id)
{
- cdf_nbuf_free(netbuf);
+ qdf_nbuf_free(netbuf);
}
void htt_h2t_send_complete(void *context, HTC_PACKET *htc_pkt)
{
void (*send_complete_part2)(void *pdev, A_STATUS status,
- cdf_nbuf_t msdu, uint16_t msdu_id);
+ qdf_nbuf_t msdu, uint16_t msdu_id);
struct htt_pdev_t *pdev = (struct htt_pdev_t *)context;
struct htt_htc_pkt *htt_pkt;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
send_complete_part2 = htc_pkt->pPktContext;
htt_pkt = container_of(htc_pkt, struct htt_htc_pkt, htc_pkt);
/* process (free or keep) the netbuf that held the message */
- netbuf = (cdf_nbuf_t) htc_pkt->pNetBufContext;
+ netbuf = (qdf_nbuf_t) htc_pkt->pNetBufContext;
if (send_complete_part2 != NULL) {
send_complete_part2(htt_pkt->pdev_ctxt, htc_pkt->Status, netbuf,
htt_pkt->msdu_id);
@@ -101,7 +101,7 @@
A_STATUS rc = A_OK;
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
u_int32_t *msg_word;
struct htt_tx_frag_desc_bank_cfg_t *bank_cfg;
@@ -115,7 +115,7 @@
pkt->msdu_id = HTT_TX_COMPL_INV_MSDU_ID;
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
- msg = cdf_nbuf_alloc(
+ msg = qdf_nbuf_alloc(
pdev->osdev,
HTT_MSG_BUF_SIZE(sizeof(struct htt_tx_frag_desc_bank_cfg_t)),
/* reserve room for the HTC header */
@@ -131,14 +131,14 @@
* separately during the below call to adf_nbuf_push_head.
* The contribution from the HTC header is added separately inside HTC.
*/
- cdf_nbuf_put_tail(msg, sizeof(struct htt_tx_frag_desc_bank_cfg_t));
+ qdf_nbuf_put_tail(msg, sizeof(struct htt_tx_frag_desc_bank_cfg_t));
/* fill in the message contents */
- msg_word = (u_int32_t *) cdf_nbuf_data(msg);
+ msg_word = (u_int32_t *) qdf_nbuf_data(msg);
memset(msg_word, 0 , sizeof(struct htt_tx_frag_desc_bank_cfg_t));
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_FRAG_DESC_BANK_CFG);
@@ -170,8 +170,8 @@
SET_HTC_PACKET_INFO_TX(
&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
1); /* tag - not relevant here */
@@ -187,7 +187,7 @@
A_STATUS htt_h2t_ver_req_msg(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -201,7 +201,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for the HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_VER_REQ_BYTES),
+ msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_VER_REQ_BYTES),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
true);
if (!msg) {
@@ -212,23 +212,23 @@
/*
* Set the length of the message.
* The contribution from the HTC_HDR_ALIGNMENT_PADDING is added
- * separately during the below call to cdf_nbuf_push_head.
+ * separately during the below call to qdf_nbuf_push_head.
* The contribution from the HTC header is added separately inside HTC.
*/
- cdf_nbuf_put_tail(msg, HTT_VER_REQ_BYTES);
+ qdf_nbuf_put_tail(msg, HTT_VER_REQ_BYTES);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_VERSION_REQ);
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg), cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg), qdf_nbuf_len(msg),
pdev->htc_endpoint,
1); /* tag - not relevant here */
@@ -247,7 +247,7 @@
A_STATUS htt_h2t_rx_ring_cfg_msg_ll(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
int enable_ctrl_data, enable_mgmt_data,
enable_null_data, enable_phy_data, enable_hdr,
@@ -264,7 +264,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for the HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev,
+ msg = qdf_nbuf_alloc(pdev->osdev,
HTT_MSG_BUF_SIZE(HTT_RX_RING_CFG_BYTES(1)),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
true);
@@ -275,16 +275,16 @@
/*
* Set the length of the message.
* The contribution from the HTC_HDR_ALIGNMENT_PADDING is added
- * separately during the below call to cdf_nbuf_push_head.
+ * separately during the below call to qdf_nbuf_push_head.
* The contribution from the HTC header is added separately inside HTC.
*/
- cdf_nbuf_put_tail(msg, HTT_RX_RING_CFG_BYTES(1));
+ qdf_nbuf_put_tail(msg, HTT_RX_RING_CFG_BYTES(1));
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_RX_RING_CFG);
@@ -414,8 +414,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
HTC_TX_PACKET_TAG_RUNTIME_PUT);
@@ -437,7 +437,7 @@
uint8_t cfg_stat_type, uint32_t cfg_val, uint64_t cookie)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
uint16_t htc_tag = 1;
@@ -463,7 +463,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
- msg = cdf_nbuf_alloc(pdev->osdev,
+ msg = qdf_nbuf_alloc(pdev->osdev,
HTT_MSG_BUF_SIZE(HTT_H2T_STATS_REQ_MSG_SZ),
/* reserve room for HTC header */
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
@@ -473,13 +473,13 @@
return -EINVAL; /* failure */
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_H2T_STATS_REQ_MSG_SZ);
+ qdf_nbuf_put_tail(msg, HTT_H2T_STATS_REQ_MSG_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_STATS_REQ);
@@ -504,8 +504,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
htc_tag); /* tag - not relevant here */
@@ -524,7 +524,7 @@
A_STATUS htt_h2t_sync_msg(struct htt_pdev_t *pdev, uint8_t sync_cnt)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -538,7 +538,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_H2T_SYNC_MSG_SZ),
+ msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_H2T_SYNC_MSG_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
if (!msg) {
@@ -546,13 +546,13 @@
return A_NO_MEMORY;
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_H2T_SYNC_MSG_SZ);
+ qdf_nbuf_put_tail(msg, HTT_H2T_SYNC_MSG_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_SYNC);
@@ -560,8 +560,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
HTC_TX_PACKET_TAG_RUNTIME_PUT);
@@ -582,7 +582,7 @@
int max_subfrms_ampdu, int max_subfrms_amsdu)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -596,7 +596,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_AGGR_CFG_MSG_SZ),
+ msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_AGGR_CFG_MSG_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
if (!msg) {
@@ -604,13 +604,13 @@
return -EINVAL; /* failure */
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_AGGR_CFG_MSG_SZ);
+ qdf_nbuf_put_tail(msg, HTT_AGGR_CFG_MSG_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_H2T_MSG_TYPE_SET(*msg_word, HTT_H2T_MSG_TYPE_AGGR_CFG);
@@ -627,8 +627,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
HTC_TX_PACKET_TAG_RUNTIME_PUT);
@@ -657,7 +657,7 @@
int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -671,7 +671,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ),
+ msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
if (!msg) {
@@ -679,13 +679,13 @@
return A_NO_MEMORY;
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ);
+ qdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_WDI_IPA_CFG_TX_PKT_POOL_SIZE_SET(*msg_word,
@@ -734,8 +734,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
HTC_TX_PACKET_TAG_RUNTIME_PUT);
@@ -749,7 +749,7 @@
int htt_h2t_ipa_uc_rsc_cfg_msg(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -763,7 +763,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ),
+ msg = qdf_nbuf_alloc(pdev->osdev, HTT_MSG_BUF_SIZE(HTT_WDI_IPA_CFG_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
if (!msg) {
@@ -771,13 +771,13 @@
return -A_NO_MEMORY;
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ);
+ qdf_nbuf_put_tail(msg, HTT_WDI_IPA_CFG_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_WDI_IPA_CFG_TX_PKT_POOL_SIZE_SET(*msg_word,
@@ -878,8 +878,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
1); /* tag - not relevant here */
@@ -904,7 +904,7 @@
bool uc_active, bool is_tx)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
uint8_t active_target = 0;
@@ -919,7 +919,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev,
+ msg = qdf_nbuf_alloc(pdev->osdev,
HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
@@ -928,13 +928,13 @@
return -A_NO_MEMORY;
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ);
+ qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
if (uc_active && is_tx)
@@ -951,8 +951,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
1); /* tag - not relevant here */
@@ -973,7 +973,7 @@
int htt_h2t_ipa_uc_get_stats(struct htt_pdev_t *pdev)
{
struct htt_htc_pkt *pkt;
- cdf_nbuf_t msg;
+ qdf_nbuf_t msg;
uint32_t *msg_word;
pkt = htt_htc_pkt_alloc(pdev);
@@ -987,7 +987,7 @@
pkt->pdev_ctxt = NULL; /* not used during send-done callback */
/* reserve room for HTC header */
- msg = cdf_nbuf_alloc(pdev->osdev,
+ msg = qdf_nbuf_alloc(pdev->osdev,
HTT_MSG_BUF_SIZE(HTT_WDI_IPA_OP_REQUEST_SZ),
HTC_HEADER_LEN + HTC_HDR_ALIGNMENT_PADDING, 4,
false);
@@ -996,13 +996,13 @@
return -A_NO_MEMORY;
}
/* set the length of the message */
- cdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ);
+ qdf_nbuf_put_tail(msg, HTT_WDI_IPA_OP_REQUEST_SZ);
/* fill in the message contents */
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
/* rewind beyond alignment pad to get to the HTC header reserved area */
- cdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
+ qdf_nbuf_push_head(msg, HTC_HDR_ALIGNMENT_PADDING);
*msg_word = 0;
HTT_WDI_IPA_OP_REQUEST_OP_CODE_SET(*msg_word,
@@ -1011,8 +1011,8 @@
SET_HTC_PACKET_INFO_TX(&pkt->htc_pkt,
htt_h2t_send_complete_free_netbuf,
- cdf_nbuf_data(msg),
- cdf_nbuf_len(msg),
+ qdf_nbuf_data(msg),
+ qdf_nbuf_len(msg),
pdev->htc_endpoint,
1); /* tag - not relevant here */
diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h
index 8b1cb4c..e462b13 100644
--- a/core/dp/htt/htt_internal.h
+++ b/core/dp/htt/htt_internal.h
@@ -29,7 +29,7 @@
#define _HTT_INTERNAL__H_
#include <athdefs.h> /* A_STATUS */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_util.h> /* qdf_assert */
#include <htc_api.h> /* HTC_PACKET */
@@ -133,10 +133,10 @@
bool in_use;
};
#endif
-static inline struct htt_host_rx_desc_base *htt_rx_desc(cdf_nbuf_t msdu)
+static inline struct htt_host_rx_desc_base *htt_rx_desc(qdf_nbuf_t msdu)
{
return (struct htt_host_rx_desc_base *)
- (((size_t) (cdf_nbuf_head(msdu) + HTT_RX_DESC_ALIGN_MASK)) &
+ (((size_t) (qdf_nbuf_head(msdu) + HTT_RX_DESC_ALIGN_MASK)) &
~HTT_RX_DESC_ALIGN_MASK);
}
@@ -191,7 +191,7 @@
*
* Return: none
*/
-static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu,
+static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu,
struct htt_host_rx_desc_base *rx_desc)
{
NBUF_CB_RX_LRO_ELIGIBLE(msdu) = rx_desc->msdu_end.lro_eligible;
@@ -212,7 +212,7 @@
#else
static inline void htt_print_rx_desc_lro(struct htt_host_rx_desc_base *rx_desc)
{}
-static inline void htt_rx_extract_lro_info(cdf_nbuf_t msdu,
+static inline void htt_rx_extract_lro_info(qdf_nbuf_t msdu,
struct htt_host_rx_desc_base *rx_desc) {}
#endif /* FEATURE_LRO */
@@ -388,19 +388,19 @@
#define HTT_TX_NBUF_QUEUE_REMOVE(_pdev, _msdu) do { \
HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \
- _msdu = cdf_nbuf_queue_remove(&_pdev->txnbufq);\
+ _msdu = qdf_nbuf_queue_remove(&_pdev->txnbufq);\
HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \
} while (0)
#define HTT_TX_NBUF_QUEUE_ADD(_pdev, _msdu) do { \
HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \
- cdf_nbuf_queue_add(&_pdev->txnbufq, _msdu); \
+ qdf_nbuf_queue_add(&_pdev->txnbufq, _msdu); \
HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \
} while (0)
#define HTT_TX_NBUF_QUEUE_INSERT_HEAD(_pdev, _msdu) do { \
HTT_TX_MUTEX_ACQUIRE(&_pdev->txnbufq_mutex); \
- cdf_nbuf_queue_insert_head(&_pdev->txnbufq, _msdu);\
+ qdf_nbuf_queue_insert_head(&_pdev->txnbufq, _msdu);\
HTT_TX_MUTEX_RELEASE(&_pdev->txnbufq_mutex); \
} while (0)
#else
@@ -463,9 +463,9 @@
int
htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr,
- cdf_nbuf_t netbuf);
+ qdf_nbuf_t netbuf);
-cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr);
+qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr);
#ifdef IPA_OFFLOAD
int
@@ -551,7 +551,7 @@
static inline
void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev,
uint32_t paddr,
- cdf_nbuf_t rx_netbuf)
+ qdf_nbuf_t rx_netbuf)
{
if (pdev->rx_buff_list) {
pdev->rx_buff_list[pdev->rx_buff_index].paddr =
@@ -574,7 +574,7 @@
*/
static inline
void htt_rx_dbg_rxbuf_reset(struct htt_pdev_t *pdev,
- cdf_nbuf_t netbuf)
+ qdf_nbuf_t netbuf)
{
uint32_t index;
@@ -609,13 +609,13 @@
static inline
void htt_rx_dbg_rxbuf_set(struct htt_pdev_t *pdev,
uint32_t paddr,
- cdf_nbuf_t rx_netbuf)
+ qdf_nbuf_t rx_netbuf)
{
return;
}
static inline
void htt_rx_dbg_rxbuf_reset(struct htt_pdev_t *pdev,
- cdf_nbuf_t netbuf)
+ qdf_nbuf_t netbuf)
{
return;
}
diff --git a/core/dp/htt/htt_rx.c b/core/dp/htt/htt_rx.c
index eb532ce..72b7047 100644
--- a/core/dp/htt/htt_rx.c
+++ b/core/dp/htt/htt_rx.c
@@ -41,7 +41,7 @@
#include <qdf_mem.h> /* qdf_mem_malloc,free, etc. */
#include <qdf_types.h> /* qdf_print, bool */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_timer.h> /* qdf_timer_free */
#include <htt.h> /* HTT_HL_RX_DESC_SIZE */
@@ -128,13 +128,13 @@
listnode_offset);
if (hash_entry->netbuf) {
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
+ qdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
+ qdf_nbuf_unmap(pdev->osdev, hash_entry->netbuf,
QDF_DMA_FROM_DEVICE);
#endif
- cdf_nbuf_free(hash_entry->netbuf);
+ qdf_nbuf_free(hash_entry->netbuf);
hash_entry->paddr = 0;
}
list_iter = list_iter->next;
@@ -230,11 +230,11 @@
idx = *(pdev->rx_ring.alloc_idx.vaddr);
while (num > 0) {
qdf_dma_addr_t paddr;
- cdf_nbuf_t rx_netbuf;
+ qdf_nbuf_t rx_netbuf;
int headroom;
rx_netbuf =
- cdf_nbuf_alloc(pdev->osdev, HTT_RX_BUF_SIZE,
+ qdf_nbuf_alloc(pdev->osdev, HTT_RX_BUF_SIZE,
0, 4, false);
if (!rx_netbuf) {
qdf_timer_stop(&pdev->rx_ring.
@@ -269,26 +269,26 @@
smp_mb();
#endif
/*
- * Adjust cdf_nbuf_data to point to the location in the buffer
+ * Adjust qdf_nbuf_data to point to the location in the buffer
* where the rx descriptor will be filled in.
*/
- headroom = cdf_nbuf_data(rx_netbuf) - (uint8_t *) rx_desc;
- cdf_nbuf_push_head(rx_netbuf, headroom);
+ headroom = qdf_nbuf_data(rx_netbuf) - (uint8_t *) rx_desc;
+ qdf_nbuf_push_head(rx_netbuf, headroom);
#ifdef DEBUG_DMA_DONE
status =
- cdf_nbuf_map(pdev->osdev, rx_netbuf,
+ qdf_nbuf_map(pdev->osdev, rx_netbuf,
QDF_DMA_BIDIRECTIONAL);
#else
status =
- cdf_nbuf_map(pdev->osdev, rx_netbuf,
+ qdf_nbuf_map(pdev->osdev, rx_netbuf,
QDF_DMA_FROM_DEVICE);
#endif
if (status != QDF_STATUS_SUCCESS) {
- cdf_nbuf_free(rx_netbuf);
+ qdf_nbuf_free(rx_netbuf);
goto fail;
}
- paddr = cdf_nbuf_get_frag_paddr(rx_netbuf, 0);
+ paddr = qdf_nbuf_get_frag_paddr(rx_netbuf, 0);
if (pdev->cfg.is_full_reorder_offload) {
if (qdf_unlikely
(htt_rx_hash_list_insert(pdev, paddr,
@@ -296,13 +296,13 @@
qdf_print("%s: hash insert failed!\n",
__func__);
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, rx_netbuf,
+ qdf_nbuf_unmap(pdev->osdev, rx_netbuf,
QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, rx_netbuf,
+ qdf_nbuf_unmap(pdev->osdev, rx_netbuf,
QDF_DMA_FROM_DEVICE);
#endif
- cdf_nbuf_free(rx_netbuf);
+ qdf_nbuf_free(rx_netbuf);
goto fail;
}
htt_rx_dbg_rxbuf_set(pdev, paddr, rx_netbuf);
@@ -360,17 +360,17 @@
while (sw_rd_idx != *(pdev->rx_ring.alloc_idx.vaddr)) {
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev,
+ qdf_nbuf_unmap(pdev->osdev,
pdev->rx_ring.buf.
netbufs_ring[sw_rd_idx],
QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev,
+ qdf_nbuf_unmap(pdev->osdev,
pdev->rx_ring.buf.
netbufs_ring[sw_rd_idx],
QDF_DMA_FROM_DEVICE);
#endif
- cdf_nbuf_free(pdev->rx_ring.buf.
+ qdf_nbuf_free(pdev->rx_ring.buf.
netbufs_ring[sw_rd_idx]);
sw_rd_idx++;
sw_rd_idx &= pdev->rx_ring.size_mask;
@@ -623,10 +623,10 @@
*inspect = rx_msdu_fw_desc & FW_RX_DESC_INSPECT_M;
}
-static inline cdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev)
+static inline qdf_nbuf_t htt_rx_netbuf_pop(htt_pdev_handle pdev)
{
int idx;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
HTT_ASSERT1(htt_rx_ring_elems(pdev) != 0);
@@ -644,7 +644,7 @@
return msdu;
}
-static inline cdf_nbuf_t
+static inline qdf_nbuf_t
htt_rx_in_order_netbuf_pop(htt_pdev_handle pdev, uint32_t paddr)
{
HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0);
@@ -657,7 +657,7 @@
#ifdef CHECKSUM_OFFLOAD
static inline
void
-htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu,
+htt_set_checksum_result_ll(htt_pdev_handle pdev, qdf_nbuf_t msdu,
struct htt_host_rx_desc_base *rx_desc)
{
#define MAX_IP_VER 2
@@ -704,7 +704,7 @@
QDF_NBUF_RX_CKSUM_NONE :
QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY;
}
- cdf_nbuf_set_rx_cksum(msdu, &cksum);
+ qdf_nbuf_set_rx_cksum(msdu, &cksum);
#undef MAX_IP_VER
#undef MAX_PROTO_VAL
}
@@ -713,13 +713,13 @@
#endif
#ifdef DEBUG_DMA_DONE
-void htt_rx_print_rx_indication(cdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
+void htt_rx_print_rx_indication(qdf_nbuf_t rx_ind_msg, htt_pdev_handle pdev)
{
uint32_t *msg_word;
int byte_offset;
int mpdu_range, num_mpdu_range;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
qdf_print
("------------------HTT RX IND-----------------------------\n");
@@ -795,11 +795,11 @@
int
htt_rx_amsdu_pop_ll(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu)
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu)
{
int msdu_len, msdu_chaining = 0;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
struct htt_host_rx_desc_base *rx_desc;
uint8_t *rx_ind_data;
uint32_t *msg_word, num_msdu_bytes;
@@ -807,7 +807,7 @@
uint8_t pad_bytes = 0;
HTT_ASSERT1(htt_rx_ring_elems(pdev) != 0);
- rx_ind_data = cdf_nbuf_data(rx_ind_msg);
+ rx_ind_data = qdf_nbuf_data(rx_ind_msg);
msg_word = (uint32_t *) rx_ind_data;
msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word);
@@ -830,14 +830,14 @@
* Set the netbuf length to be the entire buffer length
* initially, so the unmap will unmap the entire buffer.
*/
- cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
+ qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
#endif
- /* cache consistency has been taken care of by cdf_nbuf_unmap */
+ /* cache consistency has been taken care of by qdf_nbuf_unmap */
/*
* Now read the rx descriptor.
@@ -854,7 +854,7 @@
* than the descriptor.
*/
- cdf_nbuf_pull_head(msdu,
+ qdf_nbuf_pull_head(msdu,
HTT_RX_STD_DESC_RESERVATION + pad_bytes);
/*
@@ -879,7 +879,7 @@
RX_ATTENTION_0_MSDU_DONE_MASK))) {
qdf_mdelay(1);
- cdf_invalidate_range((void *)rx_desc,
+ qdf_invalidate_range((void *)rx_desc,
(void *)((char *)rx_desc +
HTT_RX_STD_DESC_RESERVATION));
@@ -895,7 +895,7 @@
#ifdef HTT_RX_RESTORE
qdf_print("RX done bit error detected!\n");
- cdf_nbuf_set_next(msdu, NULL);
+ qdf_nbuf_set_next(msdu, NULL);
*tail_msdu = msdu;
pdev->rx_ring.rx_reset = 1;
return msdu_chaining;
@@ -997,7 +997,7 @@
if (msdu_len > 0x3000)
break;
#endif
- cdf_nbuf_trim_tail(msdu,
+ qdf_nbuf_trim_tail(msdu,
HTT_RX_BUF_SIZE -
(RX_STD_DESC_SIZE +
msdu_len));
@@ -1005,10 +1005,10 @@
} while (0);
while (msdu_chained--) {
- cdf_nbuf_t next = htt_rx_netbuf_pop(pdev);
- cdf_nbuf_set_pktlen(next, HTT_RX_BUF_SIZE);
+ qdf_nbuf_t next = htt_rx_netbuf_pop(pdev);
+ qdf_nbuf_set_pktlen(next, HTT_RX_BUF_SIZE);
msdu_len -= HTT_RX_BUF_SIZE;
- cdf_nbuf_set_next(msdu, next);
+ qdf_nbuf_set_next(msdu, next);
msdu = next;
msdu_chaining = 1;
@@ -1025,7 +1025,7 @@
RX_STD_DESC_SIZE);
}
- cdf_nbuf_trim_tail(next,
+ qdf_nbuf_trim_tail(next,
HTT_RX_BUF_SIZE -
(RX_STD_DESC_SIZE +
msdu_len));
@@ -1038,11 +1038,11 @@
RX_MSDU_END_4_LAST_MSDU_LSB;
if (last_msdu) {
- cdf_nbuf_set_next(msdu, NULL);
+ qdf_nbuf_set_next(msdu, NULL);
break;
} else {
- cdf_nbuf_t next = htt_rx_netbuf_pop(pdev);
- cdf_nbuf_set_next(msdu, next);
+ qdf_nbuf_t next = htt_rx_netbuf_pop(pdev);
+ qdf_nbuf_set_next(msdu, next);
msdu = next;
}
}
@@ -1065,26 +1065,26 @@
int
htt_rx_offload_msdu_pop_ll(htt_pdev_handle pdev,
- cdf_nbuf_t offload_deliver_msg,
+ qdf_nbuf_t offload_deliver_msg,
int *vdev_id,
int *peer_id,
int *tid,
uint8_t *fw_desc,
- cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf)
+ qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf)
{
- cdf_nbuf_t buf;
+ qdf_nbuf_t buf;
uint32_t *msdu_hdr, msdu_len;
*head_buf = *tail_buf = buf = htt_rx_netbuf_pop(pdev);
/* Fake read mpdu_desc to keep desc ptr in sync */
htt_rx_mpdu_desc_list_next(pdev, NULL);
- cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
+ qdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
+ qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
#endif
- msdu_hdr = (uint32_t *) cdf_nbuf_data(buf);
+ msdu_hdr = (uint32_t *) qdf_nbuf_data(buf);
/* First dword */
msdu_len = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_LEN_GET(*msdu_hdr);
@@ -1096,8 +1096,8 @@
*tid = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_TID_GET(*msdu_hdr);
*fw_desc = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_DESC_GET(*msdu_hdr);
- cdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES);
- cdf_nbuf_set_pktlen(buf, msdu_len);
+ qdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES);
+ qdf_nbuf_set_pktlen(buf, msdu_len);
return 0;
}
@@ -1109,9 +1109,9 @@
int *peer_id,
int *tid,
uint8_t *fw_desc,
- cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf)
+ qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf)
{
- cdf_nbuf_t buf;
+ qdf_nbuf_t buf;
uint32_t *msdu_hdr, msdu_len;
uint32_t *curr_msdu;
uint32_t paddr;
@@ -1125,13 +1125,13 @@
qdf_print("%s: netbuf pop failed!\n", __func__);
return 0;
}
- cdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
+ qdf_nbuf_set_pktlen(buf, HTT_RX_BUF_SIZE);
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
+ qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, buf, QDF_DMA_FROM_DEVICE);
#endif
- msdu_hdr = (uint32_t *) cdf_nbuf_data(buf);
+ msdu_hdr = (uint32_t *) qdf_nbuf_data(buf);
/* First dword */
msdu_len = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_LEN_GET(*msdu_hdr);
@@ -1143,13 +1143,13 @@
*tid = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_TID_GET(*msdu_hdr);
*fw_desc = HTT_RX_OFFLOAD_DELIVER_IND_MSDU_DESC_GET(*msdu_hdr);
- cdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES);
- cdf_nbuf_set_pktlen(buf, msdu_len);
+ qdf_nbuf_pull_head(buf, HTT_RX_OFFLOAD_DELIVER_IND_MSDU_HDR_BYTES);
+ qdf_nbuf_set_pktlen(buf, msdu_len);
return 0;
}
extern void
-dump_pkt(cdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len);
+dump_pkt(qdf_nbuf_t nbuf, uint32_t nbuf_paddr, int len);
#ifdef RX_HASH_DEBUG
#define HTT_RX_CHECK_MSDU_COUNT(msdu_count) HTT_ASSERT_ALWAYS(msdu_count)
@@ -1160,10 +1160,10 @@
/* Return values: 1 - success, 0 - failure */
int
htt_rx_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu)
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu)
{
- cdf_nbuf_t msdu, next, prev = NULL;
+ qdf_nbuf_t msdu, next, prev = NULL;
uint8_t *rx_ind_data;
uint32_t *msg_word;
unsigned int msdu_count = 0;
@@ -1172,7 +1172,7 @@
HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0);
- rx_ind_data = cdf_nbuf_data(rx_ind_msg);
+ rx_ind_data = qdf_nbuf_data(rx_ind_msg);
msg_word = (uint32_t *) rx_ind_data;
offload_ind = HTT_RX_IN_ORD_PADDR_IND_OFFLOAD_GET(*msg_word);
@@ -1206,14 +1206,14 @@
* Set the netbuf length to be the entire buffer length
* initially, so the unmap will unmap the entire buffer.
*/
- cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
+ qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
#ifdef DEBUG_DMA_DONE
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_BIDIRECTIONAL);
#else
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
#endif
- /* cache consistency has been taken care of by cdf_nbuf_unmap */
+ /* cache consistency has been taken care of by qdf_nbuf_unmap */
rx_desc = htt_rx_desc(msdu);
htt_rx_extract_lro_info(msdu, rx_desc);
@@ -1222,14 +1222,14 @@
* Make the netbuf's data pointer point to the payload rather
* than the descriptor.
*/
- cdf_nbuf_pull_head(msdu, HTT_RX_STD_DESC_RESERVATION);
+ qdf_nbuf_pull_head(msdu, HTT_RX_STD_DESC_RESERVATION);
#if HTT_PADDR64
#define NEXT_FIELD_OFFSET_IN32 2
#else /* ! HTT_PADDR64 */
#define NEXT_FIELD_OFFSET_IN32 1
#endif /* HTT_PADDR64 */
#
- cdf_nbuf_trim_tail(msdu,
+ qdf_nbuf_trim_tail(msdu,
HTT_RX_BUF_SIZE -
(RX_STD_DESC_SIZE +
HTT_RX_IN_ORD_PADDR_IND_MSDU_LEN_GET(
@@ -1263,7 +1263,7 @@
return 0;
} else {
*tail_msdu = prev;
- cdf_nbuf_set_next(prev, NULL);
+ qdf_nbuf_set_next(prev, NULL);
return 1;
}
} else { /* if this is not the last msdu */
@@ -1284,7 +1284,7 @@
* next pointer of the preceding msdu
*/
if (prev) {
- cdf_nbuf_set_next(prev, next);
+ qdf_nbuf_set_next(prev, next);
} else {
/* if this is the first msdu, update the
* head pointer
@@ -1311,22 +1311,22 @@
*tail_msdu = NULL;
return 0;
}
- cdf_nbuf_set_next(msdu, next);
+ qdf_nbuf_set_next(msdu, next);
prev = msdu;
msdu = next;
} else {
*tail_msdu = msdu;
- cdf_nbuf_set_next(msdu, NULL);
+ qdf_nbuf_set_next(msdu, NULL);
}
}
return 1;
}
-/* Util fake function that has same prototype as cdf_nbuf_clone that just
+/* Util fake function that has same prototype as qdf_nbuf_clone that just
* retures the same nbuf
*/
-cdf_nbuf_t htt_rx_cdf_noclone_buf(cdf_nbuf_t buf)
+qdf_nbuf_t htt_rx_cdf_noclone_buf(qdf_nbuf_t buf)
{
return buf;
}
@@ -1393,15 +1393,15 @@
/* This function is used by montior mode code to restitch an MSDU list
* corresponding to an MPDU back into an MPDU by linking up the skbs.
*/
-cdf_nbuf_t
+qdf_nbuf_t
htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
- cdf_nbuf_t head_msdu,
+ qdf_nbuf_t head_msdu,
struct ieee80211_rx_status *rx_status,
unsigned clone_not_reqd)
{
- cdf_nbuf_t msdu, mpdu_buf, prev_buf, msdu_orig, head_frag_list_cloned;
- cdf_nbuf_t (*clone_nbuf_fn)(cdf_nbuf_t buf);
+ qdf_nbuf_t msdu, mpdu_buf, prev_buf, msdu_orig, head_frag_list_cloned;
+ qdf_nbuf_t (*clone_nbuf_fn)(qdf_nbuf_t buf);
unsigned decap_format, wifi_hdr_len, sec_hdr_len, msdu_llc_len,
mpdu_buf_len, decap_hdr_pull_bytes, frag_list_sum_len, dir,
is_amsdu, is_first_frag, amsdu_pad, msdu_len;
@@ -1415,7 +1415,7 @@
* waste cycles cloning the packets
*/
clone_nbuf_fn =
- clone_not_reqd ? htt_rx_cdf_noclone_buf : cdf_nbuf_clone;
+ clone_not_reqd ? htt_rx_cdf_noclone_buf : qdf_nbuf_clone;
/* The nbuf has been pulled just beyond the status and points to the
* payload
@@ -1452,13 +1452,13 @@
frag_list_sum_len = 0;
is_first_frag = 1;
- msdu_len = cdf_nbuf_len(mpdu_buf);
+ msdu_len = qdf_nbuf_len(mpdu_buf);
/* Drop the zero-length msdu */
if (!msdu_len)
goto mpdu_stitch_fail;
- msdu_orig = cdf_nbuf_next(head_msdu);
+ msdu_orig = qdf_nbuf_next(head_msdu);
while (msdu_orig) {
@@ -1472,7 +1472,7 @@
head_frag_list_cloned = msdu;
}
- msdu_len = cdf_nbuf_len(msdu);
+ msdu_len = qdf_nbuf_len(msdu);
/* Drop the zero-length msdu */
if (!msdu_len)
goto mpdu_stitch_fail;
@@ -1480,22 +1480,22 @@
frag_list_sum_len += msdu_len;
/* Maintain the linking of the cloned MSDUS */
- cdf_nbuf_set_next_ext(prev_buf, msdu);
+ qdf_nbuf_set_next_ext(prev_buf, msdu);
/* Move to the next */
prev_buf = msdu;
- msdu_orig = cdf_nbuf_next(msdu_orig);
+ msdu_orig = qdf_nbuf_next(msdu_orig);
}
/* The last msdu length need be larger than HTT_FCS_LEN */
if (msdu_len < HTT_FCS_LEN)
goto mpdu_stitch_fail;
- cdf_nbuf_trim_tail(prev_buf, HTT_FCS_LEN);
+ qdf_nbuf_trim_tail(prev_buf, HTT_FCS_LEN);
/* If there were more fragments to this RAW frame */
if (head_frag_list_cloned) {
- cdf_nbuf_append_ext_list(mpdu_buf,
+ qdf_nbuf_append_ext_list(mpdu_buf,
head_frag_list_cloned,
frag_list_sum_len);
}
@@ -1544,7 +1544,7 @@
* accomodating any radio-tap /prism like PHY header
*/
#define HTT_MAX_MONITOR_HEADER (512)
- mpdu_buf = cdf_nbuf_alloc(pdev->osdev,
+ mpdu_buf = qdf_nbuf_alloc(pdev->osdev,
HTT_MAX_MONITOR_HEADER + mpdu_buf_len,
HTT_MAX_MONITOR_HEADER, 4, false);
@@ -1556,7 +1556,7 @@
*/
prev_buf = mpdu_buf;
- dest = cdf_nbuf_put_tail(prev_buf, wifi_hdr_len);
+ dest = qdf_nbuf_put_tail(prev_buf, wifi_hdr_len);
if (!dest)
goto mpdu_stitch_fail;
qdf_mem_copy(dest, hdr_desc, wifi_hdr_len);
@@ -1591,7 +1591,7 @@
} else {
/* Maintain the linking of the cloned MSDUS */
- cdf_nbuf_set_next_ext(prev_buf, msdu);
+ qdf_nbuf_set_next_ext(prev_buf, msdu);
/* Reload the hdr ptr only on non-first MSDUs */
rx_desc = htt_rx_desc(msdu_orig);
@@ -1600,18 +1600,18 @@
}
/* Copy this buffers MSDU related status into the prev buffer */
- dest = cdf_nbuf_put_tail(prev_buf, msdu_llc_len + amsdu_pad);
+ dest = qdf_nbuf_put_tail(prev_buf, msdu_llc_len + amsdu_pad);
dest += amsdu_pad;
qdf_mem_copy(dest, hdr_desc, msdu_llc_len);
/* Push the MSDU buffer beyond the decap header */
- cdf_nbuf_pull_head(msdu, decap_hdr_pull_bytes);
+ qdf_nbuf_pull_head(msdu, decap_hdr_pull_bytes);
frag_list_sum_len +=
- msdu_llc_len + cdf_nbuf_len(msdu) + amsdu_pad;
+ msdu_llc_len + qdf_nbuf_len(msdu) + amsdu_pad;
/* Set up intra-AMSDU pad to be added to start of next buffer -
* AMSDU pad is 4 byte pad on AMSDU subframe */
- amsdu_pad = (msdu_llc_len + cdf_nbuf_len(msdu)) & 0x3;
+ amsdu_pad = (msdu_llc_len + qdf_nbuf_len(msdu)) & 0x3;
amsdu_pad = amsdu_pad ? (4 - amsdu_pad) : 0;
/* TODO FIXME How do we handle MSDUs that have fraglist - Should
@@ -1621,12 +1621,12 @@
/* Move to the next */
prev_buf = msdu;
- msdu_orig = cdf_nbuf_next(msdu_orig);
+ msdu_orig = qdf_nbuf_next(msdu_orig);
}
/* TODO: Convert this to suitable cdf routines */
- cdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned,
+ qdf_nbuf_append_ext_list(mpdu_buf, head_frag_list_cloned,
frag_list_sum_len);
mpdu_stitch_done:
@@ -1644,8 +1644,8 @@
msdu = head_msdu;
while (msdu) {
msdu_orig = msdu;
- msdu = cdf_nbuf_next(msdu);
- cdf_nbuf_set_next(msdu_orig, NULL);
+ msdu = qdf_nbuf_next(msdu);
+ qdf_nbuf_set_next(msdu_orig, NULL);
}
}
@@ -1656,27 +1656,27 @@
if (!clone_not_reqd) {
/* Free the head buffer */
if (mpdu_buf)
- cdf_nbuf_free(mpdu_buf);
+ qdf_nbuf_free(mpdu_buf);
/* Free the partial list */
while (head_frag_list_cloned) {
msdu = head_frag_list_cloned;
head_frag_list_cloned =
- cdf_nbuf_next_ext(head_frag_list_cloned);
- cdf_nbuf_free(msdu);
+ qdf_nbuf_next_ext(head_frag_list_cloned);
+ qdf_nbuf_free(msdu);
}
} else {
/* Free the alloced head buffer */
if (decap_format != HW_RX_DECAP_FORMAT_RAW)
if (mpdu_buf)
- cdf_nbuf_free(mpdu_buf);
+ qdf_nbuf_free(mpdu_buf);
/* Free the orig buffers */
msdu = head_msdu;
while (msdu) {
msdu_orig = msdu;
- msdu = cdf_nbuf_next(msdu);
- cdf_nbuf_free(msdu_orig);
+ msdu = qdf_nbuf_next(msdu);
+ qdf_nbuf_free(msdu_orig);
}
}
@@ -1698,8 +1698,8 @@
* to either htt_rx_amsdu_pop_ll or htt_rx_amsdu_rx_in_order_pop_ll.
*/
int (*htt_rx_amsdu_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu);
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu);
/*
* htt_rx_frag_pop -
@@ -1707,20 +1707,20 @@
* to either htt_rx_amsdu_pop_ll
*/
int (*htt_rx_frag_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu);
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu);
int
(*htt_rx_offload_msdu_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t offload_deliver_msg,
+ qdf_nbuf_t offload_deliver_msg,
int *vdev_id,
int *peer_id,
int *tid,
uint8_t *fw_desc,
- cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf);
+ qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf);
void * (*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg);
+ qdf_nbuf_t rx_ind_msg);
bool (*htt_rx_mpdu_desc_retry)(
htt_pdev_handle pdev, void *mpdu_desc);
@@ -1744,17 +1744,17 @@
int (*htt_rx_msdu_is_frag)(htt_pdev_handle pdev, void *msdu_desc);
-void * (*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, cdf_nbuf_t msdu);
+void * (*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, qdf_nbuf_t msdu);
bool (*htt_rx_mpdu_is_encrypted)(htt_pdev_handle pdev, void *mpdu_desc);
bool (*htt_rx_msdu_desc_key_id)(htt_pdev_handle pdev,
void *mpdu_desc, uint8_t *key_id);
-void *htt_rx_mpdu_desc_list_next_ll(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+void *htt_rx_mpdu_desc_list_next_ll(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
int idx = pdev->rx_ring.sw_rd_idx.msdu_desc;
- cdf_nbuf_t netbuf = pdev->rx_ring.buf.netbufs_ring[idx];
+ qdf_nbuf_t netbuf = pdev->rx_ring.buf.netbufs_ring[idx];
pdev->rx_ring.sw_rd_idx.msdu_desc = pdev->rx_ring.sw_rd_idx.msdu_payld;
return (void *)htt_rx_desc(netbuf);
}
@@ -1773,12 +1773,12 @@
uint8_t *phy_mode);
void *htt_rx_in_ord_mpdu_desc_list_next_ll(htt_pdev_handle pdev,
- cdf_nbuf_t netbuf)
+ qdf_nbuf_t netbuf)
{
return (void *)htt_rx_desc(netbuf);
}
-void *htt_rx_msdu_desc_retrieve_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu)
+void *htt_rx_msdu_desc_retrieve_ll(htt_pdev_handle pdev, qdf_nbuf_t msdu)
{
return htt_rx_desc(msdu);
}
@@ -1834,12 +1834,12 @@
return true;
}
-void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu)
+void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu)
{
- cdf_nbuf_free(msdu);
+ qdf_nbuf_free(msdu);
}
-void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu)
+void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu)
{
/*
* The rx descriptor is in the same buffer as the rx MSDU payload,
@@ -1944,7 +1944,7 @@
Returns 0 - success, 1 - failure */
int
htt_rx_hash_list_insert(struct htt_pdev_t *pdev, uint32_t paddr,
- cdf_nbuf_t netbuf)
+ qdf_nbuf_t netbuf)
{
int i;
struct htt_rx_hash_entry *hash_element = NULL;
@@ -1994,11 +1994,11 @@
/* Given a physical address this function will find the corresponding network
buffer from the hash table.
Note: this function is not thread-safe */
-cdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr)
+qdf_nbuf_t htt_rx_hash_list_lookup(struct htt_pdev_t *pdev, uint32_t paddr)
{
uint32_t i;
struct htt_list_node *list_iter = NULL;
- cdf_nbuf_t netbuf = NULL;
+ qdf_nbuf_t netbuf = NULL;
struct htt_rx_hash_entry *hash_entry;
i = RX_HASH_FUNCTION(paddr);
@@ -2162,7 +2162,7 @@
*pdev->rx_ring.target_idx.vaddr = 0;
} else {
pdev->rx_ring.buf.netbufs_ring =
- qdf_mem_malloc(pdev->rx_ring.size * sizeof(cdf_nbuf_t));
+ qdf_mem_malloc(pdev->rx_ring.size * sizeof(qdf_nbuf_t));
if (!pdev->rx_ring.buf.netbufs_ring)
goto fail1;
diff --git a/core/dp/htt/htt_t2h.c b/core/dp/htt/htt_t2h.c
index 6cf12e9..efefeb4 100644
--- a/core/dp/htt/htt_t2h.c
+++ b/core/dp/htt/htt_t2h.c
@@ -38,7 +38,7 @@
#include <wma.h>
#include <htc_api.h> /* HTC_PACKET */
#include <htt.h> /* HTT_T2H_MSG_TYPE, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_htt_rx_api.h>
#include <ol_htt_tx_api.h>
@@ -86,16 +86,16 @@
#endif
}
-static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, cdf_nbuf_t msg)
+static void htt_rx_frag_set_last_msdu(struct htt_pdev_t *pdev, qdf_nbuf_t msg)
{
uint32_t *msg_word;
unsigned num_msdu_bytes;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
struct htt_host_rx_desc_base *rx_desc;
int start_idx;
uint8_t *p_fw_msdu_rx_desc = 0;
- msg_word = (uint32_t *) cdf_nbuf_data(msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(msg);
num_msdu_bytes = HTT_RX_FRAG_IND_FW_RX_DESC_BYTES_GET(
*(msg_word + HTT_RX_FRAG_IND_HDR_PREFIX_SIZE32));
/*
@@ -123,22 +123,22 @@
*/
start_idx = pdev->rx_ring.sw_rd_idx.msdu_payld;
msdu = pdev->rx_ring.buf.netbufs_ring[start_idx];
- cdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_set_pktlen(msdu, HTT_RX_BUF_SIZE);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
rx_desc = htt_rx_desc(msdu);
*((uint8_t *) &rx_desc->fw_desc.u.val) = *p_fw_msdu_rx_desc;
rx_desc->msdu_end.last_msdu = 1;
- cdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
+ qdf_nbuf_map(pdev->osdev, msdu, QDF_DMA_FROM_DEVICE);
}
/* Target to host Msg/event handler for low priority messages*/
-void htt_t2h_lp_msg_handler(void *context, cdf_nbuf_t htt_t2h_msg)
+void htt_t2h_lp_msg_handler(void *context, qdf_nbuf_t htt_t2h_msg)
{
struct htt_pdev_t *pdev = (struct htt_pdev_t *)context;
uint32_t *msg_word;
enum htt_t2h_msg_type msg_type;
- msg_word = (uint32_t *) cdf_nbuf_data(htt_t2h_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg);
msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word);
switch (msg_type) {
case HTT_T2H_MSG_TYPE_VERSION_CONF:
@@ -473,7 +473,7 @@
break;
};
/* Free the indication buffer */
- cdf_nbuf_free(htt_t2h_msg);
+ qdf_nbuf_free(htt_t2h_msg);
}
/* Generic Target to host Msg/event handler for low priority messages
@@ -484,7 +484,7 @@
void htt_t2h_msg_handler(void *context, HTC_PACKET *pkt)
{
struct htt_pdev_t *pdev = (struct htt_pdev_t *)context;
- cdf_nbuf_t htt_t2h_msg = (cdf_nbuf_t) pkt->pPktContext;
+ qdf_nbuf_t htt_t2h_msg = (qdf_nbuf_t) pkt->pPktContext;
uint32_t *msg_word;
enum htt_t2h_msg_type msg_type;
@@ -492,21 +492,21 @@
if (pkt->Status != A_OK) {
if (pkt->Status != A_ECANCELED)
pdev->stats.htc_err_cnt++;
- cdf_nbuf_free(htt_t2h_msg);
+ qdf_nbuf_free(htt_t2h_msg);
return;
}
#ifdef HTT_RX_RESTORE
if (qdf_unlikely(pdev->rx_ring.rx_reset)) {
qdf_print("rx restore ..\n");
- cdf_nbuf_free(htt_t2h_msg);
+ qdf_nbuf_free(htt_t2h_msg);
return;
}
#endif
/* confirm alignment */
- HTT_ASSERT3((((unsigned long)cdf_nbuf_data(htt_t2h_msg)) & 0x3) == 0);
+ HTT_ASSERT3((((unsigned long)qdf_nbuf_data(htt_t2h_msg)) & 0x3) == 0);
- msg_word = (uint32_t *) cdf_nbuf_data(htt_t2h_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(htt_t2h_msg);
msg_type = HTT_T2H_MSG_TYPE_GET(*msg_word);
#if defined(HELIUMPLUS_DEBUG)
@@ -686,7 +686,7 @@
};
/* Free the indication buffer */
- cdf_nbuf_free(htt_t2h_msg);
+ qdf_nbuf_free(htt_t2h_msg);
}
/*--- target->host HTT message Info Element access methods ------------------*/
@@ -717,43 +717,43 @@
/*--- rx indication message ---*/
-int htt_rx_ind_flush(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+int htt_rx_ind_flush(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
return HTT_RX_IND_FLUSH_VALID_GET(*msg_word);
}
void
htt_rx_ind_flush_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
unsigned *seq_num_start, unsigned *seq_num_end)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
msg_word++;
*seq_num_start = HTT_RX_IND_FLUSH_SEQ_NUM_START_GET(*msg_word);
*seq_num_end = HTT_RX_IND_FLUSH_SEQ_NUM_END_GET(*msg_word);
}
-int htt_rx_ind_release(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+int htt_rx_ind_release(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
return HTT_RX_IND_REL_VALID_GET(*msg_word);
}
void
htt_rx_ind_release_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
unsigned *seq_num_start, unsigned *seq_num_end)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
msg_word++;
*seq_num_start = HTT_RX_IND_REL_SEQ_NUM_START_GET(*msg_word);
*seq_num_end = HTT_RX_IND_REL_SEQ_NUM_END_GET(*msg_word);
@@ -761,13 +761,13 @@
void
htt_rx_ind_mpdu_range_info(struct htt_pdev_t *pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
int mpdu_range_num,
enum htt_rx_status *status, int *mpdu_count)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_ind_msg);
msg_word += pdev->rx_mpdu_range_offset_words + mpdu_range_num;
*status = HTT_RX_IND_MPDU_STATUS_GET(*msg_word);
*mpdu_count = HTT_RX_IND_MPDU_COUNT_GET(*msg_word);
@@ -783,13 +783,13 @@
*
* Return: RSSI in dBm, or HTT_INVALID_RSSI
*/
-int16_t htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+int16_t htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
int8_t rssi;
uint32_t *msg_word;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg) +
+ (qdf_nbuf_data(rx_ind_msg) +
HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET);
/* check if the RX_IND message contains valid rx PPDU start info */
@@ -813,7 +813,7 @@
* Return: RSSI, or HTT_INVALID_RSSI
*/
int16_t
-htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
int8_t chain)
{
int8_t rssi;
@@ -823,7 +823,7 @@
return HTT_RSSI_INVALID;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg) +
+ (qdf_nbuf_data(rx_ind_msg) +
HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET);
/* check if the RX_IND message contains valid rx PPDU start info */
@@ -869,13 +869,13 @@
* Return the data rate provided in a rx indication message.
*/
void
-htt_rx_ind_legacy_rate(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_legacy_rate(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
uint8_t *legacy_rate, uint8_t *legacy_rate_sel)
{
uint32_t *msg_word;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg) +
+ (qdf_nbuf_data(rx_ind_msg) +
HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET);
/* check if the RX_IND message contains valid rx PPDU start info */
@@ -901,14 +901,14 @@
* Return the timestamp provided in a rx indication message.
*/
void
-htt_rx_ind_timestamp(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_timestamp(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
uint32_t *timestamp_microsec,
uint8_t *timestamp_submicrosec)
{
uint32_t *msg_word;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg) +
+ (qdf_nbuf_data(rx_ind_msg) +
HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET);
/* check if the RX_IND message contains valid rx PPDU start info */
@@ -934,12 +934,12 @@
* Return: TSF timestamp
*/
uint32_t
-htt_rx_ind_tsf32(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+htt_rx_ind_tsf32(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
uint32_t *msg_word;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg) +
+ (qdf_nbuf_data(rx_ind_msg) +
HTT_RX_IND_FW_RX_PPDU_DESC_BYTE_OFFSET);
/* check if the RX_IND message contains valid rx PPDU start info */
@@ -959,12 +959,12 @@
* Return: Extended TID
*/
uint8_t
-htt_rx_ind_ext_tid(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg)
+htt_rx_ind_ext_tid(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg)
{
uint32_t *msg_word;
msg_word = (uint32_t *)
- (cdf_nbuf_data(rx_ind_msg));
+ (qdf_nbuf_data(rx_ind_msg));
return HTT_RX_IND_EXT_TID_GET(*msg_word);
}
@@ -987,12 +987,12 @@
void
htt_rx_frag_ind_flush_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_frag_ind_msg,
+ qdf_nbuf_t rx_frag_ind_msg,
int *seq_num_start, int *seq_num_end)
{
uint32_t *msg_word;
- msg_word = (uint32_t *) cdf_nbuf_data(rx_frag_ind_msg);
+ msg_word = (uint32_t *) qdf_nbuf_data(rx_frag_ind_msg);
msg_word++;
*seq_num_start = HTT_RX_FRAG_IND_FLUSH_SEQ_NUM_START_GET(*msg_word);
*seq_num_end = HTT_RX_FRAG_IND_FLUSH_SEQ_NUM_END_GET(*msg_word);
diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c
index d53caf9..757ba44 100644
--- a/core/dp/htt/htt_tx.c
+++ b/core/dp/htt/htt_tx.c
@@ -39,7 +39,7 @@
#include <osdep.h> /* uint32_t, offsetof, etc. */
#include <qdf_types.h> /* qdf_dma_addr_t */
#include <qdf_mem.h> /* qdf_mem_alloc_consistent et al */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_time.h> /* qdf_mdelay */
#include <htt.h> /* htt_tx_msdu_desc_t */
@@ -548,7 +548,7 @@
because of No CE desc*/
void htt_tx_sched(htt_pdev_handle pdev)
{
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
int download_len = pdev->download_len;
int packet_len;
@@ -556,7 +556,7 @@
while (msdu != NULL) {
int not_accepted;
/* packet length includes HTT tx desc frag added above */
- packet_len = cdf_nbuf_len(msdu);
+ packet_len = qdf_nbuf_len(msdu);
if (packet_len < download_len) {
/*
* This case of packet length being less than the
@@ -583,7 +583,7 @@
}
}
-int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id)
+int htt_tx_send_std(htt_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t msdu_id)
{
int download_len = pdev->download_len;
@@ -591,7 +591,7 @@
int packet_len;
/* packet length includes HTT tx desc frag added above */
- packet_len = cdf_nbuf_len(msdu);
+ packet_len = qdf_nbuf_len(msdu);
if (packet_len < download_len) {
/*
* This case of packet length being less than the nominal
@@ -605,17 +605,17 @@
download_len = packet_len;
}
- NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_HTT);
DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
- (uint8_t *)(cdf_nbuf_data(msdu)),
- sizeof(cdf_nbuf_data(msdu))));
- if (cdf_nbuf_queue_len(&pdev->txnbufq) > 0) {
+ (uint8_t *)(qdf_nbuf_data(msdu)),
+ sizeof(qdf_nbuf_data(msdu))));
+ if (qdf_nbuf_queue_len(&pdev->txnbufq) > 0) {
HTT_TX_NBUF_QUEUE_ADD(pdev, msdu);
htt_tx_sched(pdev);
return 0;
}
- cdf_nbuf_trace_update(msdu, "HT:T:");
+ qdf_nbuf_trace_update(msdu, "HT:T:");
if (htc_send_data_pkt
(pdev->htc_pdev, msdu, pdev->htc_endpoint, download_len)) {
HTT_TX_NBUF_QUEUE_ADD(pdev, msdu);
@@ -643,8 +643,8 @@
htt_tx_resume_handler(void *context) { }
#endif
-cdf_nbuf_t
-htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus)
+qdf_nbuf_t
+htt_tx_send_batch(htt_pdev_handle pdev, qdf_nbuf_t head_msdu, int num_msdus)
{
qdf_print("*** %s curently only applies for HL systems\n", __func__);
qdf_assert(0);
@@ -654,7 +654,7 @@
int
htt_tx_send_nonstd(htt_pdev_handle pdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
uint16_t msdu_id, enum htt_pkt_type pkt_type)
{
int download_len;
@@ -678,15 +678,15 @@
#ifdef QCA_TX_HTT2_SUPPORT
static inline HTC_ENDPOINT_ID
-htt_tx_htt2_get_ep_id(htt_pdev_handle pdev, cdf_nbuf_t msdu)
+htt_tx_htt2_get_ep_id(htt_pdev_handle pdev, qdf_nbuf_t msdu)
{
/*
* TX HTT2 service mainly for small sized frame and check if
* this candidate frame allow or not.
*/
if ((pdev->htc_tx_htt2_endpoint != ENDPOINT_UNUSED) &&
- cdf_nbuf_get_tx_parallel_dnload_frm(msdu) &&
- (cdf_nbuf_len(msdu) < pdev->htc_tx_htt2_max_size))
+ qdf_nbuf_get_tx_parallel_dnload_frm(msdu) &&
+ (qdf_nbuf_len(msdu) < pdev->htc_tx_htt2_max_size))
return pdev->htc_tx_htt2_endpoint;
else
return pdev->htc_endpoint;
@@ -697,7 +697,7 @@
static inline int
htt_tx_send_base(htt_pdev_handle pdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
uint16_t msdu_id, int download_len, uint8_t more_data)
{
struct htt_host_tx_desc_t *htt_host_tx_desc;
@@ -711,7 +711,7 @@
* Retrieve it so we can provide its HTC header space to HTC.
*/
htt_host_tx_desc = (struct htt_host_tx_desc_t *)
- cdf_nbuf_get_frag_vaddr(msdu, 0);
+ qdf_nbuf_get_frag_vaddr(msdu, 0);
pkt = htt_htc_pkt_alloc(pdev);
if (!pkt)
@@ -721,7 +721,7 @@
pkt->pdev_ctxt = pdev->txrx_pdev;
/* packet length includes HTT tx desc frag added above */
- packet_len = cdf_nbuf_len(msdu);
+ packet_len = qdf_nbuf_len(msdu);
if (packet_len < download_len) {
/*
* This case of packet length being less than the nominal
@@ -746,23 +746,23 @@
SET_HTC_PACKET_NET_BUF_CONTEXT(&pkt->htc_pkt, msdu);
- cdf_nbuf_trace_update(msdu, "HT:T:");
- NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT);
+ qdf_nbuf_trace_update(msdu, "HT:T:");
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_HTT);
DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
- (uint8_t *)(cdf_nbuf_data(msdu)),
- sizeof(cdf_nbuf_data(msdu))));
+ (uint8_t *)(qdf_nbuf_data(msdu)),
+ sizeof(qdf_nbuf_data(msdu))));
htc_send_data_pkt(pdev->htc_pdev, &pkt->htc_pkt, more_data);
return 0; /* success */
}
-cdf_nbuf_t
-htt_tx_send_batch(htt_pdev_handle pdev, cdf_nbuf_t head_msdu, int num_msdus)
+qdf_nbuf_t
+htt_tx_send_batch(htt_pdev_handle pdev, qdf_nbuf_t head_msdu, int num_msdus)
{
- cdf_nbuf_t rejected = NULL;
+ qdf_nbuf_t rejected = NULL;
uint16_t *msdu_id_storage;
uint16_t msdu_id;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
/*
* FOR NOW, iterate through the batch, sending the frames singly.
* Eventually HTC and HIF should be able to accept a batch of
@@ -770,14 +770,14 @@
*/
msdu = head_msdu;
while (num_msdus--) {
- cdf_nbuf_t next_msdu = cdf_nbuf_next(msdu);
+ qdf_nbuf_t next_msdu = qdf_nbuf_next(msdu);
msdu_id_storage = ol_tx_msdu_id_storage(msdu);
msdu_id = *msdu_id_storage;
/* htt_tx_send_base returns 0 as success and 1 as failure */
if (htt_tx_send_base(pdev, msdu, msdu_id, pdev->download_len,
num_msdus)) {
- cdf_nbuf_set_next(msdu, rejected);
+ qdf_nbuf_set_next(msdu, rejected);
rejected = msdu;
}
msdu = next_msdu;
@@ -787,7 +787,7 @@
int
htt_tx_send_nonstd(htt_pdev_handle pdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
uint16_t msdu_id, enum htt_pkt_type pkt_type)
{
int download_len;
@@ -806,7 +806,7 @@
return htt_tx_send_base(pdev, msdu, msdu_id, download_len, 0);
}
-int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id)
+int htt_tx_send_std(htt_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t msdu_id)
{
return htt_tx_send_base(pdev, msdu, msdu_id, pdev->download_len, 0);
}
@@ -865,7 +865,7 @@
unsigned int uc_tx_partition_base)
{
unsigned int tx_buffer_count;
- cdf_nbuf_t buffer_vaddr;
+ qdf_nbuf_t buffer_vaddr;
qdf_dma_addr_t buffer_paddr;
uint32_t *header_ptr;
uint32_t *ring_vaddr;
@@ -876,7 +876,7 @@
/* Allocate TX buffers as many as possible */
for (tx_buffer_count = 0;
tx_buffer_count < (uc_tx_buf_cnt - 1); tx_buffer_count++) {
- buffer_vaddr = cdf_nbuf_alloc(pdev->osdev,
+ buffer_vaddr = qdf_nbuf_alloc(pdev->osdev,
uc_tx_buf_sz, 0, 4, false);
if (!buffer_vaddr) {
qdf_print("%s: TX BUF alloc fail, loop index: %d",
@@ -885,8 +885,8 @@
}
/* Init buffer */
- qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz);
- header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr);
+ qdf_mem_zero(qdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz);
+ header_ptr = (uint32_t *) qdf_nbuf_data(buffer_vaddr);
/* HTT control header */
*header_ptr = HTT_IPA_UC_OFFLOAD_TX_HEADER_DEFAULT;
@@ -896,8 +896,8 @@
*header_ptr |= ((uint16_t) uc_tx_partition_base +
tx_buffer_count) << 16;
- cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
- buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
+ qdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
+ buffer_paddr = qdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
header_ptr++;
*header_ptr = (uint32_t) (buffer_paddr +
IPA_UC_TX_BUF_FRAG_DESC_OFFSET);
@@ -924,7 +924,7 @@
unsigned int uc_tx_partition_base)
{
unsigned int tx_buffer_count;
- cdf_nbuf_t buffer_vaddr;
+ qdf_nbuf_t buffer_vaddr;
qdf_dma_addr_t buffer_paddr;
uint32_t *header_ptr;
uint32_t *ring_vaddr;
@@ -936,7 +936,7 @@
/* Allocate TX buffers as many as possible */
for (tx_buffer_count = 0;
tx_buffer_count < (uc_tx_buf_cnt - 1); tx_buffer_count++) {
- buffer_vaddr = cdf_nbuf_alloc(pdev->osdev,
+ buffer_vaddr = qdf_nbuf_alloc(pdev->osdev,
uc_tx_buf_sz, 0, 4, false);
if (!buffer_vaddr) {
qdf_print("%s: TX BUF alloc fail, loop index: %d",
@@ -945,8 +945,8 @@
}
/* Init buffer */
- qdf_mem_zero(cdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz);
- header_ptr = (uint32_t *) cdf_nbuf_data(buffer_vaddr);
+ qdf_mem_zero(qdf_nbuf_data(buffer_vaddr), uc_tx_buf_sz);
+ header_ptr = (uint32_t *) qdf_nbuf_data(buffer_vaddr);
/* HTT control header */
*header_ptr = HTT_IPA_UC_OFFLOAD_TX_HEADER_DEFAULT;
@@ -956,8 +956,8 @@
*header_ptr |= ((uint16_t) uc_tx_partition_base +
tx_buffer_count) << 16;
- cdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
- buffer_paddr = cdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
+ qdf_nbuf_map(pdev->osdev, buffer_vaddr, QDF_DMA_BIDIRECTIONAL);
+ buffer_paddr = qdf_nbuf_get_frag_paddr(buffer_vaddr, 0);
header_ptr++;
/* Frag Desc Pointer */
@@ -1019,7 +1019,7 @@
}
/* Allocate TX COMP Ring */
- tx_comp_ring_size = uc_tx_buf_cnt * sizeof(cdf_nbuf_t);
+ tx_comp_ring_size = uc_tx_buf_cnt * sizeof(qdf_nbuf_t);
pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr =
qdf_mem_alloc_consistent(
pdev->osdev, pdev->osdev->dev,
@@ -1035,15 +1035,15 @@
/* Allocate TX BUF vAddress Storage */
pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg =
- (cdf_nbuf_t *) qdf_mem_malloc(uc_tx_buf_cnt *
- sizeof(cdf_nbuf_t));
+ (qdf_nbuf_t *) qdf_mem_malloc(uc_tx_buf_cnt *
+ sizeof(qdf_nbuf_t));
if (!pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg) {
qdf_print("%s: TX BUF POOL vaddr storage alloc fail", __func__);
return_code = -ENOBUFS;
goto free_tx_comp_base;
}
qdf_mem_zero(pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg,
- uc_tx_buf_cnt * sizeof(cdf_nbuf_t));
+ uc_tx_buf_cnt * sizeof(qdf_nbuf_t));
pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt = htt_tx_ipa_uc_wdi_tx_buf_alloc(
pdev, uc_tx_buf_sz, uc_tx_buf_cnt, uc_tx_partition_base);
@@ -1090,7 +1090,8 @@
if (pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr) {
qdf_mem_free_consistent(
pdev->osdev,
- ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) * sizeof(cdf_nbuf_t),
+ ol_cfg_ipa_uc_tx_max_buf_cnt(pdev->ctrl_pdev) *
+ sizeof(qdf_nbuf_t),
pdev->ipa_uc_tx_rsc.tx_comp_base.vaddr,
pdev->ipa_uc_tx_rsc.tx_comp_base.paddr,
qdf_get_dma_mem_context((&pdev->ipa_uc_tx_rsc.
@@ -1101,11 +1102,11 @@
/* Free each single buffer */
for (idx = 0; idx < pdev->ipa_uc_tx_rsc.alloc_tx_buf_cnt; idx++) {
if (pdev->ipa_uc_tx_rsc.tx_buf_pool_vaddr_strg[idx]) {
- cdf_nbuf_unmap(pdev->osdev,
+ qdf_nbuf_unmap(pdev->osdev,
pdev->ipa_uc_tx_rsc.
tx_buf_pool_vaddr_strg[idx],
QDF_DMA_FROM_DEVICE);
- cdf_nbuf_free(pdev->ipa_uc_tx_rsc.
+ qdf_nbuf_free(pdev->ipa_uc_tx_rsc.
tx_buf_pool_vaddr_strg[idx]);
}
}
diff --git a/core/dp/htt/htt_types.h b/core/dp/htt/htt_types.h
index 671200c..0be83c8 100644
--- a/core/dp/htt/htt_types.h
+++ b/core/dp/htt/htt_types.h
@@ -33,7 +33,7 @@
#include <qdf_lock.h> /* qdf_spinlock_t */
#include <qdf_timer.h> /* qdf_timer_t */
#include <qdf_atomic.h> /* qdf_atomic_inc */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <htc_api.h> /* HTC_PACKET */
#include <ol_ctrl_api.h> /* ol_pdev_handle */
@@ -83,9 +83,9 @@
};
struct htt_tx_mgmt_desc_buf {
- cdf_nbuf_t msg_buf;
+ qdf_nbuf_t msg_buf;
A_BOOL is_inuse;
- cdf_nbuf_t mgmt_frm;
+ qdf_nbuf_t mgmt_frm;
};
struct htt_tx_mgmt_desc_ctxt {
@@ -100,7 +100,7 @@
struct htt_rx_hash_entry {
A_UINT32 paddr;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
A_UINT8 fromlist;
struct htt_list_node listnode;
#ifdef RX_HASH_DEBUG
@@ -133,7 +133,7 @@
struct uc_shared_mem_t tx_comp_base;
uint32_t tx_comp_idx_paddr;
- cdf_nbuf_t *tx_buf_pool_vaddr_strg;
+ qdf_nbuf_t *tx_buf_pool_vaddr_strg;
uint32_t alloc_tx_buf_cnt;
};
@@ -229,7 +229,7 @@
#ifdef ATH_11AC_TXCOMPACT
HTT_TX_MUTEX_TYPE txnbufq_mutex;
- cdf_nbuf_queue_t txnbufq;
+ qdf_nbuf_queue_t txnbufq;
struct htt_htc_pkt_union *htt_htc_pkt_misclist;
#endif
@@ -259,7 +259,7 @@
* The host SW uses this netbufs ring to locate the nw
* buffer objects whose data buffers the HW has filled.
*/
- cdf_nbuf_t *netbufs_ring;
+ qdf_nbuf_t *netbufs_ring;
/*
* Ring of buffer addresses -
* This ring holds the "physical" device address of the
@@ -370,7 +370,7 @@
int download_len;
void (*tx_send_complete_part2)(void *pdev, A_STATUS status,
- cdf_nbuf_t msdu, uint16_t msdu_id);
+ qdf_nbuf_t msdu, uint16_t msdu_id);
HTT_TX_MUTEX_TYPE htt_tx_mutex;
diff --git a/core/dp/ol/inc/ol_htt_api.h b/core/dp/ol/inc/ol_htt_api.h
index 0cf49b5..e0a7cd8 100644
--- a/core/dp/ol/inc/ol_htt_api.h
+++ b/core/dp/ol/inc/ol_htt_api.h
@@ -36,7 +36,7 @@
#define _OL_HTT_API__H_
#include <qdf_types.h> /* qdf_device_t */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <athdefs.h> /* A_STATUS */
#include <htc_api.h> /* HTC_HANDLE */
#include <ol_ctrl_api.h> /* ol_pdev_handle */
diff --git a/core/dp/ol/inc/ol_htt_rx_api.h b/core/dp/ol/inc/ol_htt_rx_api.h
index 230d87b..942b4cb 100644
--- a/core/dp/ol/inc/ol_htt_rx_api.h
+++ b/core/dp/ol/inc/ol_htt_rx_api.h
@@ -40,7 +40,7 @@
/* #include <osapi_linux.h> / * uint16_t, etc. * / */
#include <osdep.h> /* uint16_t, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_types.h> /* bool */
#include <htt.h> /* HTT_RX_IND_MPDU_STATUS */
@@ -109,7 +109,7 @@
* -OR-
* 0 - the message's rx flush command is invalid and should be ignored
*/
-int htt_rx_ind_flush(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+int htt_rx_ind_flush(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
/**
* @brief Return the sequence number starting the range of MPDUs to flush.
@@ -138,7 +138,7 @@
*/
void
htt_rx_ind_flush_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
unsigned *seq_num_start, unsigned *seq_num_end);
/**
@@ -160,7 +160,7 @@
* -OR-
* 0 - the message's rx release command is invalid and should be ignored
*/
-int htt_rx_ind_release(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+int htt_rx_ind_release(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
/**
* @brief Return the sequence number starting the range of MPDUs to release.
@@ -189,7 +189,7 @@
*/
void
htt_rx_ind_release_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
unsigned *seq_num_start,
unsigned *seq_num_end);
@@ -234,7 +234,7 @@
*/
void
htt_rx_ind_mpdu_range_info(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
int mpdu_range_num,
enum htt_rx_status *status, int *mpdu_count);
@@ -248,27 +248,27 @@
* @return RSSI in dBm, or HTT_INVALID_RSSI
*/
int16_t
-htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+htt_rx_ind_rssi_dbm(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
int16_t
-htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_rssi_dbm_chain(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
int8_t chain);
void
-htt_rx_ind_legacy_rate(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_legacy_rate(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
uint8_t *legacy_rate, uint8_t *legacy_rate_sel);
void
-htt_rx_ind_timestamp(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg,
+htt_rx_ind_timestamp(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg,
uint32_t *timestamp_microsec,
uint8_t *timestamp_submicrosec);
uint32_t
-htt_rx_ind_tsf32(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+htt_rx_ind_tsf32(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
uint8_t
-htt_rx_ind_ext_tid(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+htt_rx_ind_ext_tid(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
/*==================== rx MPDU descriptor access methods ====================*/
@@ -654,13 +654,13 @@
*/
extern int
(*htt_rx_amsdu_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu);
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu);
extern int
(*htt_rx_frag_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
- cdf_nbuf_t *head_msdu, cdf_nbuf_t *tail_msdu);
+ qdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t *head_msdu, qdf_nbuf_t *tail_msdu);
/**
* @brief Return a linked list of buffers holding one MSDU
@@ -685,12 +685,12 @@
*/
extern int
(*htt_rx_offload_msdu_pop)(htt_pdev_handle pdev,
- cdf_nbuf_t offload_deliver_msg,
+ qdf_nbuf_t offload_deliver_msg,
int *vdev_id,
int *peer_id,
int *tid,
uint8_t *fw_desc,
- cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf);
+ qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf);
/**
* @brief Return the rx descriptor for the next rx MPDU.
@@ -713,7 +713,7 @@
* by an rx ind msg
*/
extern void *
-(*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev, cdf_nbuf_t rx_ind_msg);
+(*htt_rx_mpdu_desc_list_next)(htt_pdev_handle pdev, qdf_nbuf_t rx_ind_msg);
/**
* @brief Retrieve a previously-stored rx descriptor from a MSDU buffer.
@@ -727,7 +727,7 @@
* @return the corresponding abstract rx MSDU descriptor
*/
extern void *
-(*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, cdf_nbuf_t msdu);
+(*htt_rx_msdu_desc_retrieve)(htt_pdev_handle pdev, qdf_nbuf_t msdu);
/**
* @brief Free both an rx MSDU descriptor and the associated MSDU buffer.
@@ -749,7 +749,7 @@
* @param rx_msdu_desc - rx descriptor for the MSDU being freed
* @param msdu - rx frame buffer for the MSDU being freed
*/
-void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu);
+void htt_rx_desc_frame_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu);
/**
* @brief Look up and free the rx descriptor for a MSDU.
@@ -766,7 +766,7 @@
* @param htt_pdev - the HTT instance the rx data was received on
* @param msdu - rx frame buffer for the rx MSDU descriptor being freed
*/
-void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu);
+void htt_rx_msdu_desc_free(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu);
/**
* @brief Add new MSDU buffers for the target to fill.
@@ -805,9 +805,9 @@
* list, else operates on a cloned nbuf
* @return network buffer handle to the MPDU
*/
-cdf_nbuf_t
+qdf_nbuf_t
htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
- cdf_nbuf_t head_msdu,
+ qdf_nbuf_t head_msdu,
struct ieee80211_rx_status *rx_status,
unsigned clone_not_reqd);
@@ -822,7 +822,7 @@
*/
void
htt_rx_frag_ind_flush_seq_num_range(htt_pdev_handle pdev,
- cdf_nbuf_t rx_frag_ind_msg,
+ qdf_nbuf_t rx_frag_ind_msg,
int *seq_num_start, int *seq_num_end);
/**
* @brief Return the HL rx desc size
@@ -837,7 +837,7 @@
* @param msdu - network buffer handle
* @param vowstats - handle to vow ext stats.
*/
-void htt_rx_get_vowext_stats(cdf_nbuf_t msdu, struct vow_extstats *vowstats);
+void htt_rx_get_vowext_stats(qdf_nbuf_t msdu, struct vow_extstats *vowstats);
/**
* @brief parses the offload message passed by the target.
@@ -859,5 +859,5 @@
int *peer_id,
int *tid,
uint8_t *fw_desc,
- cdf_nbuf_t *head_buf, cdf_nbuf_t *tail_buf);
+ qdf_nbuf_t *head_buf, qdf_nbuf_t *tail_buf);
#endif /* _OL_HTT_RX_API__H_ */
diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h
index e2497f3..a6b785c 100644
--- a/core/dp/ol/inc/ol_htt_tx_api.h
+++ b/core/dp/ol/inc/ol_htt_tx_api.h
@@ -39,7 +39,7 @@
/* #include <osapi_linux.h> / * uint16_t, etc. * / */
#include <osdep.h> /* uint16_t, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_cfg.h> /* wlan_frm_fmt */
#include <htt.h> /* needed by inline functions */
@@ -256,13 +256,13 @@
uint8_t *dest_addr;
*/
- uint8_t l3_hdr_offset; /* wrt cdf_nbuf_data(msdu), in bytes */
+ uint8_t l3_hdr_offset; /* wrt qdf_nbuf_data(msdu), in bytes */
/* l4_hdr_offset is not currently used.
* It could be used to specify to a TCP/UDP checksum computation
* engine where the TCP/UDP header starts.
*/
- /* uint8_t l4_hdr_offset; - wrt cdf_nbuf_data(msdu), in bytes */
+ /* uint8_t l4_hdr_offset; - wrt qdf_nbuf_data(msdu), in bytes */
} info;
/* the action sub-struct specifies how to process the MSDU */
struct {
@@ -419,7 +419,7 @@
* function assumes the tx frame is the default frame type, as specified
* by ol_cfg_frame_type. "Raw" frames need to be transmitted through the
* alternate htt_tx_send_nonstd function.
- * The tx descriptor has already been attached to the cdf_nbuf object during
+ * The tx descriptor has already been attached to the qdf_nbuf object during
* a preceding call to htt_tx_desc_init.
*
* @param htt_pdev - the handle of the physical device sending the tx data
@@ -428,7 +428,7 @@
* @return 0 -> success, -OR- 1 -> failure
*/
int
-htt_tx_send_std(htt_pdev_handle htt_pdev, cdf_nbuf_t msdu, uint16_t msdu_id);
+htt_tx_send_std(htt_pdev_handle htt_pdev, qdf_nbuf_t msdu, uint16_t msdu_id);
/**
* @brief Download a Batch Of Tx MSDUs
@@ -442,9 +442,9 @@
* @param num_msdus - The total Number of MSDU's provided for batch tx
* @return null-terminated linked-list of unaccepted frames
*/
-cdf_nbuf_t
+qdf_nbuf_t
htt_tx_send_batch(htt_pdev_handle htt_pdev,
- cdf_nbuf_t head_msdu, int num_msdus);
+ qdf_nbuf_t head_msdu, int num_msdus);
/* The htt scheduler for queued packets in htt
* htt when unable to send to HTC because of lack of resource
@@ -459,7 +459,7 @@
*/
int
htt_tx_send_nonstd(htt_pdev_handle htt_pdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
uint16_t msdu_id, enum htt_pkt_type pkt_type);
/**
@@ -532,7 +532,7 @@
void *htt_tx_desc,
qdf_dma_addr_t htt_tx_desc_paddr,
uint16_t msdu_id,
- cdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info,
+ qdf_nbuf_t msdu, struct htt_msdu_info_t *msdu_info,
struct qdf_tso_info_t *tso_info,
struct ocb_tx_ctrl_hdr_t *tx_ctrl,
uint8_t is_dsrc)
@@ -568,7 +568,7 @@
if (qdf_likely(pdev->cfg.ce_classify_enabled)) {
if (qdf_likely(pkt_type == htt_pkt_type_eth2 ||
pkt_type == htt_pkt_type_ethernet))
- cdf_nbuf_tx_info_get(msdu, pkt_type, pkt_subtype,
+ qdf_nbuf_tx_info_get(msdu, pkt_type, pkt_subtype,
hw_classify);
ce_pkt_type = htt_to_ce_pkt_type[pkt_type];
@@ -611,7 +611,7 @@
if (tso_info->is_tso)
HTT_TX_DESC_FRM_LEN_SET(local_word1, tso_info->total_len);
else
- HTT_TX_DESC_FRM_LEN_SET(local_word1, cdf_nbuf_len(msdu));
+ HTT_TX_DESC_FRM_LEN_SET(local_word1, qdf_nbuf_len(msdu));
HTT_TX_DESC_FRM_ID_SET(local_word1, msdu_id);
*word1 = local_word1;
@@ -659,8 +659,8 @@
local_desc_ext.is_dsrc = (is_dsrc != 0);
- cdf_nbuf_push_head(msdu, sizeof(local_desc_ext));
- qdf_mem_copy(cdf_nbuf_data(msdu), &local_desc_ext,
+ qdf_nbuf_push_head(msdu, sizeof(local_desc_ext));
+ qdf_mem_copy(qdf_nbuf_data(msdu), &local_desc_ext,
sizeof(local_desc_ext));
}
@@ -675,11 +675,11 @@
* Setting the flag for this final fragment suffices for specifying
* all fragments provided by the OS rather than added by the driver.
*/
- cdf_nbuf_set_frag_is_wordstream(msdu, cdf_nbuf_get_num_frags(msdu) - 1,
+ qdf_nbuf_set_frag_is_wordstream(msdu, qdf_nbuf_get_num_frags(msdu) - 1,
0);
/* store a link to the HTT tx descriptor within the netbuf */
- cdf_nbuf_frag_push_head(msdu, sizeof(struct htt_host_tx_desc_t),
+ qdf_nbuf_frag_push_head(msdu, sizeof(struct htt_host_tx_desc_t),
(char *)htt_host_tx_desc, /* virtual addr */
htt_tx_desc_paddr);
@@ -691,17 +691,17 @@
* the host is big-endian, to convert to the target's little-endian
* format.
*/
- cdf_nbuf_set_frag_is_wordstream(msdu, 0, 1);
+ qdf_nbuf_set_frag_is_wordstream(msdu, 0, 1);
if (qdf_likely(pdev->cfg.ce_classify_enabled &&
(msdu_info->info.l2_hdr_type != htt_pkt_type_mgmt))) {
- uint32_t pkt_offset = cdf_nbuf_get_frag_len(msdu, 0);
+ uint32_t pkt_offset = qdf_nbuf_get_frag_len(msdu, 0);
data_attr = hw_classify << QDF_CE_TX_CLASSIFY_BIT_S;
data_attr |= ce_pkt_type << QDF_CE_TX_PKT_TYPE_BIT_S;
data_attr |= pkt_offset << QDF_CE_TX_PKT_OFFSET_BIT_S;
}
- cdf_nbuf_data_attr_set(msdu, data_attr);
+ qdf_nbuf_data_attr_set(msdu, data_attr);
}
/**
@@ -909,9 +909,9 @@
* @param - pointer to the mamangement from UMAC
* @return - pointer the allocated mgmt descriptor
*/
-cdf_nbuf_t
+qdf_nbuf_t
htt_tx_mgmt_desc_alloc(struct htt_pdev_t *pdev, A_UINT32 *desc_id,
- cdf_nbuf_t mgmt_frm);
+ qdf_nbuf_t mgmt_frm);
/** htt_tx_mgmt_desc_free
* @description - releases the management descriptor back to the pool
diff --git a/core/dp/ol/inc/ol_txrx_ctrl_api.h b/core/dp/ol/inc/ol_txrx_ctrl_api.h
index b08c5dd..79b830e 100644
--- a/core/dp/ol/inc/ol_txrx_ctrl_api.h
+++ b/core/dp/ol/inc/ol_txrx_ctrl_api.h
@@ -33,7 +33,7 @@
#define _OL_TXRX_CTRL_API__H_
#include <athdefs.h> /* A_STATUS */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_types.h> /* qdf_device_t */
#include <htc_api.h> /* HTC_HANDLE */
@@ -543,7 +543,7 @@
void ol_txrx_pdev_detach(ol_txrx_pdev_handle data_pdev, int force);
typedef void
-(*ol_txrx_data_tx_cb)(void *ctxt, cdf_nbuf_t tx_frm, int had_error);
+(*ol_txrx_data_tx_cb)(void *ctxt, qdf_nbuf_t tx_frm, int had_error);
/**
* @brief Store a delivery notification callback for specific data frames.
@@ -583,12 +583,12 @@
* @param tx_spec - what non-standard handling to apply to the tx data frames
* @param msdu_list - NULL-terminated list of tx MSDUs
*/
-cdf_nbuf_t
+qdf_nbuf_t
ol_tx_non_std(ol_txrx_vdev_handle data_vdev,
- enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list);
+ enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list);
typedef void
-(*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error);
+(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error);
/**
* @brief Store a callback for delivery notifications for management frames.
@@ -634,7 +634,7 @@
*/
int
ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev,
- cdf_nbuf_t tx_mgmt_frm,
+ qdf_nbuf_t tx_mgmt_frm,
uint8_t type, uint8_t use_6mbps, uint16_t chanfreq);
/**
diff --git a/core/dp/ol/inc/ol_txrx_htt_api.h b/core/dp/ol/inc/ol_txrx_htt_api.h
index d84b3ee..00d612c 100644
--- a/core/dp/ol/inc/ol_txrx_htt_api.h
+++ b/core/dp/ol/inc/ol_txrx_htt_api.h
@@ -34,14 +34,14 @@
#include <htt.h> /* HTT_TX_COMPL_IND_STAT */
#include <athdefs.h> /* A_STATUS */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_api.h> /* ol_txrx_pdev_handle */
-static inline uint16_t *ol_tx_msdu_id_storage(cdf_nbuf_t msdu)
+static inline uint16_t *ol_tx_msdu_id_storage(qdf_nbuf_t msdu)
{
- qdf_assert(cdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1));
- return (uint16_t *) (((qdf_size_t) (cdf_nbuf_head(msdu) + 1)) & ~0x1);
+ qdf_assert(qdf_nbuf_headroom(msdu) >= (sizeof(uint16_t) * 2 - 1));
+ return (uint16_t *) (((qdf_size_t) (qdf_nbuf_head(msdu) + 1)) & ~0x1);
}
/**
@@ -59,7 +59,7 @@
*/
void
ol_tx_download_done_ll(void *pdev,
- A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id);
+ A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id);
/**
* @brief Tx MSDU download completion for HL system without tx completion msgs
@@ -75,7 +75,7 @@
*/
void
ol_tx_download_done_hl_free(void *pdev,
- A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id);
+ A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id);
/**
* @brief Tx MSDU download completion for HL system with tx completion msgs
@@ -96,7 +96,7 @@
void
ol_tx_download_done_hl_retain(void *pdev,
A_STATUS status,
- cdf_nbuf_t msdu, uint16_t msdu_id);
+ qdf_nbuf_t msdu, uint16_t msdu_id);
/*
* For now, make the host HTT -> host txrx tx completion status
@@ -233,7 +233,7 @@
*/
void
ol_rx_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
uint16_t peer_id, uint8_t tid, int num_mpdu_ranges);
/**
@@ -253,7 +253,7 @@
* @param tid - what (extended) traffic type the rx data is
*/
void ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_frag_ind_msg,
+ qdf_nbuf_t rx_frag_ind_msg,
uint16_t peer_id, uint8_t tid);
/**
@@ -277,7 +277,7 @@
*/
void
ol_rx_offload_deliver_ind_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t msg, int msdu_cnt);
+ qdf_nbuf_t msg, int msdu_cnt);
/**
* @brief Process a peer map message sent by the target.
@@ -572,7 +572,7 @@
*/
void
ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
uint16_t peer_id,
uint8_t tid, uint8_t is_offload);
diff --git a/core/dp/ol/inc/ol_txrx_osif_api.h b/core/dp/ol/inc/ol_txrx_osif_api.h
index 81fddfe..dd7acaf 100644
--- a/core/dp/ol/inc/ol_txrx_osif_api.h
+++ b/core/dp/ol/inc/ol_txrx_osif_api.h
@@ -32,7 +32,7 @@
#ifndef _OL_TXRX_OSIF_API__H_
#define _OL_TXRX_OSIF_API__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_osif_api.h> /* ol_osif_vdev_handle */
#include <ol_txrx_api.h> /* ol_txrx_pdev_handle, etc. */
@@ -46,21 +46,21 @@
*/
struct ol_rx_cached_buf {
struct list_head list;
- cdf_nbuf_t buf;
+ qdf_nbuf_t buf;
};
/**
* @typedef ol_txrx_rx_fp
* @brief receive function to hand batches of data frames from txrx to OS shim
*/
-typedef void (*ol_txrx_rx_fp)(void *osif_dev, cdf_nbuf_t msdus);
+typedef void (*ol_txrx_rx_fp)(void *osif_dev, qdf_nbuf_t msdus);
/**
* @typedef ol_txrx_tx_fp
* @brief top-level transmit function
*/
-typedef cdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev,
- cdf_nbuf_t msdu_list);
+typedef qdf_nbuf_t (*ol_txrx_tx_fp)(ol_txrx_vdev_handle data_vdev,
+ qdf_nbuf_t msdu_list);
/**
* @typedef ol_txrx_tx_non_std_fp
@@ -82,9 +82,9 @@
* @param tx_spec - what non-standard operations to apply to the tx frame
* @param msdu_list - tx frame(s), in a null-terminated list
*/
-typedef cdf_nbuf_t (*ol_txrx_tx_non_std_fp)(ol_txrx_vdev_handle data_vdev,
+typedef qdf_nbuf_t (*ol_txrx_tx_non_std_fp)(ol_txrx_vdev_handle data_vdev,
enum ol_tx_spec tx_spec,
- cdf_nbuf_t msdu_list);
+ qdf_nbuf_t msdu_list);
struct txrx_rx_metainfo;
@@ -111,7 +111,7 @@
typedef QDF_STATUS (*ol_rx_callback_fp)(void *p_cds_gctx,
- cdf_nbuf_t pDataBuff,
+ qdf_nbuf_t pDataBuff,
uint8_t ucSTAId);
typedef void (*ol_tx_pause_callback_fp)(uint8_t vdev_id,
@@ -250,16 +250,16 @@
* NULL if the segmentation fails, - OR -
* a NULL-terminated list of segment network buffers
*/
-cdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev,
+qdf_nbuf_t ol_txrx_osif_tso_segment(ol_txrx_vdev_handle txrx_vdev,
int max_seg_payload_bytes,
- cdf_nbuf_t jumbo_tcp_frame);
+ qdf_nbuf_t jumbo_tcp_frame);
-cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
+qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb,
uint8_t proto_type);
#ifdef IPA_OFFLOAD
-cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
- cdf_nbuf_t skb);
+qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
+ qdf_nbuf_t skb);
#endif
QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb,
@@ -272,7 +272,7 @@
bool roam_synch_in_progress);
void ol_rx_data_process(struct ol_txrx_peer_t *peer,
- cdf_nbuf_t rx_buf_list);
+ qdf_nbuf_t rx_buf_list);
void ol_txrx_flush_rx_frames(struct ol_txrx_peer_t *peer,
bool drop);
diff --git a/core/dp/ol/inc/ol_vowext_dbg_defs.h b/core/dp/ol/inc/ol_vowext_dbg_defs.h
index 3be07ac..4a9d3db 100644
--- a/core/dp/ol/inc/ol_vowext_dbg_defs.h
+++ b/core/dp/ol/inc/ol_vowext_dbg_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -61,6 +61,6 @@
* @param msdu - network buffer handle
* @param pdev - handle to htt dev.
*/
-void ol_ath_add_vow_extstats(htt_pdev_handle pdev, cdf_nbuf_t msdu);
+void ol_ath_add_vow_extstats(htt_pdev_handle pdev, qdf_nbuf_t msdu);
#endif /* _VOW_DEFINES__H_ */
diff --git a/core/dp/txrx/ol_ctrl_txrx_api.h b/core/dp/txrx/ol_ctrl_txrx_api.h
index 5a0d50f..d77a576 100644
--- a/core/dp/txrx/ol_ctrl_txrx_api.h
+++ b/core/dp/txrx/ol_ctrl_txrx_api.h
@@ -34,7 +34,7 @@
/* #include <osapi_linux.h> / * uint8_t * / */
#include <osdep.h> /* uint8_t */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_ctrl_api.h> /* ol_vdev_handle */
#include <ol_txrx_api.h> /* ol_txrx_peer_handle, etc. */
@@ -106,7 +106,7 @@
int tid,
uint32_t tsf32,
enum ol_rx_err_type err_type,
- cdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id);
+ qdf_nbuf_t rx_frame, uint64_t *pn, uint8_t key_id);
enum ol_rx_notify_type {
OL_RX_NOTIFY_IPV4_IGMP,
@@ -138,7 +138,7 @@
uint8_t *peer_mac_addr,
int tid,
uint32_t tsf32,
- enum ol_rx_notify_type notify_type, cdf_nbuf_t rx_frame);
+ enum ol_rx_notify_type notify_type, qdf_nbuf_t rx_frame);
/**
* @brief Indicate when a paused STA has tx data available.
diff --git a/core/dp/txrx/ol_osif_txrx_api.h b/core/dp/txrx/ol_osif_txrx_api.h
index 2014d4f..979b258 100644
--- a/core/dp/txrx/ol_osif_txrx_api.h
+++ b/core/dp/txrx/ol_osif_txrx_api.h
@@ -32,7 +32,7 @@
#ifndef _OL_OSIF_TXRX_API_H_
#define _OL_OSIF_TXRX_API_H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
/**
* @brief Call tx completion handler to release the buffers
diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c
index 263341c..c3f475e 100644
--- a/core/dp/txrx/ol_rx.c
+++ b/core/dp/txrx/ol_rx.c
@@ -25,7 +25,7 @@
* to the Linux Foundation.
*/
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_util.h> /* qdf_cpu_to_le64 */
#include <qdf_types.h> /* bool */
#include <cds_ieee80211_common.h> /* ieee80211_frame */
@@ -68,7 +68,7 @@
#endif
void ol_rx_data_process(struct ol_txrx_peer_t *peer,
- cdf_nbuf_t rx_buf_list);
+ qdf_nbuf_t rx_buf_list);
#ifdef HTT_RX_RESTORE
@@ -84,16 +84,16 @@
static DECLARE_WORK(ol_rx_restore_work, ol_rx_restore_handler);
-void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu,
- cdf_nbuf_t tail_msdu)
+void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, qdf_nbuf_t head_msdu,
+ qdf_nbuf_t tail_msdu)
{
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
while (head_msdu) {
- next = cdf_nbuf_next(head_msdu);
+ next = qdf_nbuf_next(head_msdu);
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
"freeing %p\n", head_msdu);
- cdf_nbuf_free(head_msdu);
+ qdf_nbuf_free(head_msdu);
head_msdu = next;
}
@@ -106,7 +106,7 @@
#endif
static void ol_rx_process_inv_peer(ol_txrx_pdev_handle pdev,
- void *rx_mpdu_desc, cdf_nbuf_t msdu)
+ void *rx_mpdu_desc, qdf_nbuf_t msdu)
{
uint8_t a1[IEEE80211_ADDR_LEN];
htt_pdev_handle htt_pdev = pdev->htt_pdev;
@@ -166,7 +166,7 @@
}
static void
-ol_rx_ind_rssi_update(struct ol_txrx_peer_t *peer, cdf_nbuf_t rx_ind_msg)
+ol_rx_ind_rssi_update(struct ol_txrx_peer_t *peer, qdf_nbuf_t rx_ind_msg)
{
struct ol_txrx_pdev_t *pdev = peer->vdev->pdev;
peer->rssi_dbm = ol_rx_rssi_avg(pdev, peer->rssi_dbm,
@@ -192,12 +192,12 @@
#endif /* QCA_SUPPORT_PEER_DATA_RX_RSSI */
void discard_msdus(htt_pdev_handle htt_pdev,
- cdf_nbuf_t head_msdu,
- cdf_nbuf_t tail_msdu)
+ qdf_nbuf_t head_msdu,
+ qdf_nbuf_t tail_msdu)
{
while (1) {
- cdf_nbuf_t next;
- next = cdf_nbuf_next(
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(
head_msdu);
htt_rx_desc_frame_free
(htt_pdev,
@@ -212,12 +212,12 @@
}
void chain_msdus(htt_pdev_handle htt_pdev,
- cdf_nbuf_t head_msdu,
- cdf_nbuf_t tail_msdu)
+ qdf_nbuf_t head_msdu,
+ qdf_nbuf_t tail_msdu)
{
while (1) {
- cdf_nbuf_t next;
- next = cdf_nbuf_next(head_msdu);
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(head_msdu);
htt_rx_desc_frame_free(
htt_pdev,
head_msdu);
@@ -232,8 +232,8 @@
void *rx_mpdu_desc,
uint8_t tid,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t head_msdu,
- cdf_nbuf_t tail_msdu,
+ qdf_nbuf_t head_msdu,
+ qdf_nbuf_t tail_msdu,
int num_mpdu_ranges,
int num_pdus,
bool rx_ind_release
@@ -310,7 +310,7 @@
void
ol_rx_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
uint16_t peer_id, uint8_t tid, int num_mpdu_ranges)
{
int mpdu_range, i;
@@ -383,7 +383,7 @@
if (htt_rx_ind_release(pdev->htt_pdev, rx_ind_msg)) {
/* the ind info of release is saved here and do release at the
- * end. This is for the reason of in HL case, the cdf_nbuf_t
+ * end. This is for the reason of in HL case, the qdf_nbuf_t
* for msg and payload are the same buf. And the buf will be
* changed during processing */
rx_ind_release = true;
@@ -398,7 +398,7 @@
for (mpdu_range = 0; mpdu_range < num_mpdu_ranges; mpdu_range++) {
enum htt_rx_status status;
int i, num_mpdus;
- cdf_nbuf_t head_msdu, tail_msdu, msdu;
+ qdf_nbuf_t head_msdu, tail_msdu, msdu;
void *rx_mpdu_desc;
#ifdef DEBUG_DMA_DONE
@@ -558,8 +558,8 @@
}
while (1) {
/* Free the nbuf */
- cdf_nbuf_t next;
- next = cdf_nbuf_next(msdu);
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(msdu);
htt_rx_desc_frame_free(htt_pdev, msdu);
if (msdu == tail_msdu)
break;
@@ -649,7 +649,7 @@
#include <cds_ieee80211_common.h>
-static void transcap_nwifi_to_8023(cdf_nbuf_t msdu)
+static void transcap_nwifi_to_8023(qdf_nbuf_t msdu)
{
struct ieee80211_frame *wh;
uint32_t hdrsize;
@@ -661,7 +661,7 @@
uint8_t a3[IEEE80211_ADDR_LEN];
uint8_t fc1;
- wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu);
+ wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu);
qdf_mem_copy(a1, wh->i_addr1, IEEE80211_ADDR_LEN);
qdf_mem_copy(a2, wh->i_addr2, IEEE80211_ADDR_LEN);
qdf_mem_copy(a3, wh->i_addr3, IEEE80211_ADDR_LEN);
@@ -669,17 +669,17 @@
/* Native Wifi header is 80211 non-QoS header */
hdrsize = sizeof(struct ieee80211_frame);
- llchdr = (struct llc *)(((uint8_t *) cdf_nbuf_data(msdu)) + hdrsize);
+ llchdr = (struct llc *)(((uint8_t *) qdf_nbuf_data(msdu)) + hdrsize);
ether_type = llchdr->llc_un.type_snap.ether_type;
/*
* Now move the data pointer to the beginning of the mac header :
* new-header = old-hdr + (wifhdrsize + llchdrsize - ethhdrsize)
*/
- cdf_nbuf_pull_head(msdu,
+ qdf_nbuf_pull_head(msdu,
(hdrsize + sizeof(struct llc) -
sizeof(struct ether_header)));
- eth_hdr = (struct ether_header *)(cdf_nbuf_data(msdu));
+ eth_hdr = (struct ether_header *)(qdf_nbuf_data(msdu));
switch (fc1) {
case IEEE80211_FC1_DIR_NODS:
qdf_mem_copy(eth_hdr->ether_dhost, a1, IEEE80211_ADDR_LEN);
@@ -705,7 +705,7 @@
uint8_t *peer_mac_addr,
int tid,
uint32_t tsf32,
- enum ol_rx_notify_type notify_type, cdf_nbuf_t rx_frame)
+ enum ol_rx_notify_type notify_type, qdf_nbuf_t rx_frame)
{
/*
* NOTE: This is used in qca_main for AP mode to handle IGMP
@@ -732,14 +732,14 @@
void
ol_rx_inspect(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu, void *rx_desc)
+ unsigned tid, qdf_nbuf_t msdu, void *rx_desc)
{
ol_txrx_pdev_handle pdev = vdev->pdev;
uint8_t *data, *l3_hdr;
uint16_t ethertype;
int offset;
- data = cdf_nbuf_data(msdu);
+ data = qdf_nbuf_data(msdu);
if (pdev->frame_format == wlan_frm_fmt_native_wifi) {
offset = SIZEOF_80211_HDR + LLC_SNAP_HDR_OFFSET_ETHERTYPE;
l3_hdr = data + SIZEOF_80211_HDR + LLC_SNAP_HDR_LEN;
@@ -764,10 +764,10 @@
void
ol_rx_offload_deliver_ind_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t msg, int msdu_cnt)
+ qdf_nbuf_t msg, int msdu_cnt)
{
int vdev_id, peer_id, tid;
- cdf_nbuf_t head_buf, tail_buf, buf;
+ qdf_nbuf_t head_buf, tail_buf, buf;
struct ol_txrx_peer_t *peer;
uint8_t fw_desc;
htt_pdev_handle htt_pdev = pdev->htt_pdev;
@@ -782,8 +782,8 @@
} else {
buf = head_buf;
while (1) {
- cdf_nbuf_t next;
- next = cdf_nbuf_next(buf);
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(buf);
htt_rx_desc_frame_free(htt_pdev, buf);
if (buf == tail_buf)
break;
@@ -801,7 +801,7 @@
u_int8_t tid,
u_int16_t peer_id,
void *msdu_desc,
- cdf_nbuf_t msdu)
+ qdf_nbuf_t msdu)
{
union htt_rx_pn_t pn = {0};
u_int8_t key_id = 0;
@@ -836,7 +836,7 @@
*/
bool
ol_rx_filter(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, cdf_nbuf_t msdu, void *rx_desc)
+ struct ol_txrx_peer_t *peer, qdf_nbuf_t msdu, void *rx_desc)
{
#define FILTER_STATUS_REJECT 1
#define FILTER_STATUS_ACCEPT 0
@@ -867,7 +867,7 @@
offset = ETHERNET_ADDR_LEN * 2;
}
/* get header info from msdu */
- wh = cdf_nbuf_data(msdu);
+ wh = qdf_nbuf_data(msdu);
/* get ether type */
ether_type = (wh[offset] << 8) | wh[offset + 1];
@@ -963,13 +963,13 @@
void
ol_rx_deliver(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list)
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list)
{
ol_txrx_pdev_handle pdev = vdev->pdev;
htt_pdev_handle htt_pdev = pdev->htt_pdev;
- cdf_nbuf_t deliver_list_head = NULL;
- cdf_nbuf_t deliver_list_tail = NULL;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t deliver_list_head = NULL;
+ qdf_nbuf_t deliver_list_tail = NULL;
+ qdf_nbuf_t msdu;
bool filter = false;
#ifdef QCA_SUPPORT_SW_TXRX_ENCAP
struct ol_rx_decap_info_t info;
@@ -984,7 +984,7 @@
while (msdu) {
void *rx_desc;
int discard, inspect, dummy_fwd;
- cdf_nbuf_t next = cdf_nbuf_next(msdu);
+ qdf_nbuf_t next = qdf_nbuf_next(msdu);
rx_desc = htt_rx_msdu_desc_retrieve(pdev->htt_pdev, msdu);
@@ -1002,7 +1002,7 @@
peer->mac_addr.raw[0], peer->mac_addr.raw[1],
peer->mac_addr.raw[2], peer->mac_addr.raw[3],
peer->mac_addr.raw[4], peer->mac_addr.raw[5],
- cdf_nbuf_len(msdu));
+ qdf_nbuf_len(msdu));
goto DONE;
}
#endif
@@ -1028,13 +1028,13 @@
ol_txrx_frm_dump_tcp_seq |
ol_txrx_frm_dump_contents,
0 /* don't print contents */);
- cdf_nbuf_free(msdu);
+ qdf_nbuf_free(msdu);
/* If discarding packet is last packet of the delivery
list, NULL terminator should be added
for delivery list. */
if (next == NULL && deliver_list_head) {
/* add NULL terminator */
- cdf_nbuf_set_next(deliver_list_tail, NULL);
+ qdf_nbuf_set_next(deliver_list_tail, NULL);
}
} else {
/*
@@ -1117,9 +1117,9 @@
rx_header.tsf32 = peer->last_pkt_tsf;
rx_header.ext_tid = peer->last_pkt_tid;
- cdf_nbuf_push_head(msdu,
+ qdf_nbuf_push_head(msdu,
sizeof(rx_header));
- qdf_mem_copy(cdf_nbuf_data(msdu),
+ qdf_mem_copy(qdf_nbuf_data(msdu),
&rx_header, sizeof(rx_header));
/* Construct the ethernet header with
@@ -1128,9 +1128,9 @@
RX stats header. */
eth_header.ether_type = QDF_SWAP_U16(
ETHERTYPE_OCB_RX);
- cdf_nbuf_push_head(msdu,
+ qdf_nbuf_push_head(msdu,
sizeof(eth_header));
- qdf_mem_copy(cdf_nbuf_data(msdu),
+ qdf_mem_copy(qdf_nbuf_data(msdu),
ð_header,
sizeof(eth_header));
}
@@ -1150,7 +1150,7 @@
#if defined(PERE_IP_HDR_ALIGNMENT_WAR)
if (pdev->host_80211_enable)
- for (msdu = deliver_list_head; msdu; msdu = cdf_nbuf_next(msdu))
+ for (msdu = deliver_list_head; msdu; msdu = qdf_nbuf_next(msdu))
transcap_nwifi_to_8023(msdu);
#endif
@@ -1164,15 +1164,15 @@
void
ol_rx_discard(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list)
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list)
{
ol_txrx_pdev_handle pdev = vdev->pdev;
htt_pdev_handle htt_pdev = pdev->htt_pdev;
while (msdu_list) {
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
- msdu_list = cdf_nbuf_next(msdu_list);
+ msdu_list = qdf_nbuf_next(msdu_list);
TXRX_PRINT(TXRX_PRINT_LEVEL_INFO1,
"discard rx %p from partly-deleted peer %p "
"(%02x:%02x:%02x:%02x:%02x:%02x)\n",
@@ -1214,12 +1214,12 @@
/*
* Free frames including both rx descriptors and buffers
*/
-void ol_rx_frames_free(htt_pdev_handle htt_pdev, cdf_nbuf_t frames)
+void ol_rx_frames_free(htt_pdev_handle htt_pdev, qdf_nbuf_t frames)
{
- cdf_nbuf_t next, frag = frames;
+ qdf_nbuf_t next, frag = frames;
while (frag) {
- next = cdf_nbuf_next(frag);
+ next = qdf_nbuf_next(frag);
htt_rx_desc_frame_free(htt_pdev, frag);
frag = next;
}
@@ -1227,7 +1227,7 @@
void
ol_rx_in_order_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_ind_msg,
+ qdf_nbuf_t rx_ind_msg,
uint16_t peer_id,
uint8_t tid, uint8_t is_offload)
{
@@ -1235,7 +1235,7 @@
struct ol_txrx_peer_t *peer = NULL;
htt_pdev_handle htt_pdev = NULL;
int status;
- cdf_nbuf_t head_msdu, tail_msdu = NULL;
+ qdf_nbuf_t head_msdu, tail_msdu = NULL;
if (pdev) {
peer = ol_txrx_peer_find_by_id(pdev, peer_id);
@@ -1271,7 +1271,7 @@
/* Send the chain of MSDUs to the OS */
/* rx_opt_proc takes a NULL-terminated list of msdu netbufs */
- cdf_nbuf_set_next(tail_msdu, NULL);
+ qdf_nbuf_set_next(tail_msdu, NULL);
/* Pktlog */
#ifdef WDI_EVENT_ENABLE
@@ -1287,8 +1287,8 @@
"%s: Couldn't find peer from ID 0x%x\n",
__func__, peer_id);
while (head_msdu) {
- cdf_nbuf_t msdu = head_msdu;
- head_msdu = cdf_nbuf_next(head_msdu);
+ qdf_nbuf_t msdu = head_msdu;
+ head_msdu = qdf_nbuf_next(head_msdu);
htt_rx_desc_frame_free(htt_pdev, msdu);
}
return;
@@ -1301,9 +1301,9 @@
void
ol_rx_in_order_deliver(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list)
+ unsigned tid, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
msdu = msdu_list;
/*
@@ -1314,7 +1314,7 @@
*/
while (msdu) {
- cdf_nbuf_t next = cdf_nbuf_next(msdu);
+ qdf_nbuf_t next = qdf_nbuf_next(msdu);
OL_RX_PEER_STATS_UPDATE(peer, msdu);
OL_RX_ERR_STATISTICS_1(vdev->pdev, vdev, peer, rx_desc,
@@ -1338,7 +1338,7 @@
uint32_t *msg_word)
{
int vdev_id, peer_id, tid;
- cdf_nbuf_t head_buf, tail_buf, buf;
+ qdf_nbuf_t head_buf, tail_buf, buf;
struct ol_txrx_peer_t *peer;
uint8_t fw_desc;
int msdu_iter = 0;
@@ -1355,8 +1355,8 @@
} else {
buf = head_buf;
while (1) {
- cdf_nbuf_t next;
- next = cdf_nbuf_next(buf);
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(buf);
htt_rx_desc_frame_free(htt_pdev, buf);
if (buf == tail_buf)
break;
@@ -1376,7 +1376,7 @@
* @param msdu - network buffer handle
* @param pdev - handle to htt dev.
*/
-void ol_ath_add_vow_extstats(htt_pdev_handle pdev, cdf_nbuf_t msdu)
+void ol_ath_add_vow_extstats(htt_pdev_handle pdev, qdf_nbuf_t msdu)
{
/* FIX THIS:
* txrx should not be directly using data types (scn)
@@ -1393,7 +1393,7 @@
int offset;
struct vow_extstats vowstats;
- data = cdf_nbuf_data(msdu);
+ data = qdf_nbuf_data(msdu);
offset = ETHERNET_ADDR_LEN * 2;
l3_hdr = data + ETHERNET_HDR_LEN;
diff --git a/core/dp/txrx/ol_rx.h b/core/dp/txrx/ol_rx.h
index 33d749f..ce1bbb0 100644
--- a/core/dp/txrx/ol_rx.h
+++ b/core/dp/txrx/ol_rx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -28,18 +28,18 @@
#ifndef _OL_RX__H_
#define _OL_RX__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_types.h> /* ol_txrx_vdev_t, etc. */
void
ol_rx_deliver(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t head_msdu);
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t head_msdu);
void
ol_rx_discard(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t head_msdu);
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t head_msdu);
-void ol_rx_frames_free(htt_pdev_handle htt_pdev, cdf_nbuf_t frames);
+void ol_rx_frames_free(htt_pdev_handle htt_pdev, qdf_nbuf_t frames);
void ol_rx_peer_init(struct ol_txrx_pdev_t *pdev, struct ol_txrx_peer_t *peer);
@@ -49,7 +49,7 @@
void
ol_rx_in_order_deliver(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t head_msdu);
+ unsigned tid, qdf_nbuf_t head_msdu);
void
ol_rx_offload_paddr_deliver_ind_handler(htt_pdev_handle htt_pdev,
@@ -62,6 +62,6 @@
u_int8_t tid,
u_int16_t peer_id,
void *msdu_desc,
- cdf_nbuf_t msdu);
+ qdf_nbuf_t msdu);
#endif /* _OL_RX__H_ */
diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c
index 58f5b90..f4c0768 100644
--- a/core/dp/txrx/ol_rx_defrag.c
+++ b/core/dp/txrx/ol_rx_defrag.c
@@ -61,7 +61,7 @@
#include <ol_txrx_internal.h>
#include <ol_ctrl_txrx_api.h>
#include <ol_txrx_peer_find.h>
-#include <cdf_nbuf.h>
+#include <qdf_nbuf.h>
#include <ieee80211.h>
#include <qdf_util.h>
#include <athdefs.h>
@@ -107,18 +107,18 @@
inline struct ieee80211_frame *ol_rx_frag_get_mac_hdr(
htt_pdev_handle htt_pdev,
- cdf_nbuf_t frag)
+ qdf_nbuf_t frag)
{
return
- (struct ieee80211_frame *) cdf_nbuf_data(frag);
+ (struct ieee80211_frame *) qdf_nbuf_data(frag);
}
#define ol_rx_frag_pull_hdr(pdev, frag, hdrsize) \
- cdf_nbuf_pull_head(frag, hdrsize);
+ qdf_nbuf_pull_head(frag, hdrsize);
#define OL_RX_FRAG_CLONE(frag) NULL /* no-op */
static inline void
ol_rx_frag_desc_adjust(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
void **rx_desc_old_position,
void **ind_old_position, int *rx_desc_len)
{
@@ -132,14 +132,14 @@
*/
void
ol_rx_frag_indication_handler(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t rx_frag_ind_msg,
+ qdf_nbuf_t rx_frag_ind_msg,
uint16_t peer_id, uint8_t tid)
{
uint16_t seq_num;
int seq_num_start, seq_num_end;
struct ol_txrx_peer_t *peer;
htt_pdev_handle htt_pdev;
- cdf_nbuf_t head_msdu, tail_msdu;
+ qdf_nbuf_t head_msdu, tail_msdu;
void *rx_mpdu_desc;
htt_pdev = pdev->htt_pdev;
@@ -213,7 +213,7 @@
void
ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, uint16_t seq_num, cdf_nbuf_t frag)
+ unsigned tid, uint16_t seq_num, qdf_nbuf_t frag)
{
struct ieee80211_frame *fmac_hdr, *mac_hdr;
uint8_t fragno, more_frag, all_frag_present = 0;
@@ -236,7 +236,7 @@
if ((!more_frag) && (!fragno) && (!rx_reorder_array_elem->head)) {
rx_reorder_array_elem->head = frag;
rx_reorder_array_elem->tail = frag;
- cdf_nbuf_set_next(frag, NULL);
+ qdf_nbuf_set_next(frag, NULL);
ol_rx_defrag(pdev, peer, tid, rx_reorder_array_elem->head);
rx_reorder_array_elem->head = NULL;
rx_reorder_array_elem->tail = NULL;
@@ -292,15 +292,15 @@
*/
void
ol_rx_fraglist_insert(htt_pdev_handle htt_pdev,
- cdf_nbuf_t *head_addr,
- cdf_nbuf_t *tail_addr,
- cdf_nbuf_t frag, uint8_t *all_frag_present)
+ qdf_nbuf_t *head_addr,
+ qdf_nbuf_t *tail_addr,
+ qdf_nbuf_t frag, uint8_t *all_frag_present)
{
- cdf_nbuf_t next, prev = NULL, cur = *head_addr;
+ qdf_nbuf_t next, prev = NULL, cur = *head_addr;
struct ieee80211_frame *mac_hdr, *cmac_hdr, *next_hdr, *lmac_hdr;
uint8_t fragno, cur_fragno, lfragno, next_fragno;
uint8_t last_morefrag = 1, count = 0;
- cdf_nbuf_t frag_clone;
+ qdf_nbuf_t frag_clone;
qdf_assert(frag);
frag_clone = OL_RX_FRAG_CLONE(frag);
@@ -314,7 +314,7 @@
if (!(*head_addr)) {
*head_addr = frag;
*tail_addr = frag;
- cdf_nbuf_set_next(*tail_addr, NULL);
+ qdf_nbuf_set_next(*tail_addr, NULL);
return;
}
/* For efficiency, compare with tail first */
@@ -323,9 +323,9 @@
lfragno = qdf_le16_to_cpu(*(uint16_t *) lmac_hdr->i_seq) &
IEEE80211_SEQ_FRAG_MASK;
if (fragno > lfragno) {
- cdf_nbuf_set_next(*tail_addr, frag);
+ qdf_nbuf_set_next(*tail_addr, frag);
*tail_addr = frag;
- cdf_nbuf_set_next(*tail_addr, NULL);
+ qdf_nbuf_set_next(*tail_addr, NULL);
} else {
do {
cmac_hdr = (struct ieee80211_frame *)
@@ -334,7 +334,7 @@
qdf_le16_to_cpu(*(uint16_t *) cmac_hdr->i_seq) &
IEEE80211_SEQ_FRAG_MASK;
prev = cur;
- cur = cdf_nbuf_next(cur);
+ cur = qdf_nbuf_next(cur);
} while (fragno > cur_fragno);
if (fragno == cur_fragno) {
@@ -342,11 +342,11 @@
*all_frag_present = 0;
return;
} else {
- cdf_nbuf_set_next(prev, frag);
- cdf_nbuf_set_next(frag, cur);
+ qdf_nbuf_set_next(prev, frag);
+ qdf_nbuf_set_next(frag, cur);
}
}
- next = cdf_nbuf_next(*head_addr);
+ next = qdf_nbuf_next(*head_addr);
lmac_hdr = (struct ieee80211_frame *)ol_rx_frag_get_mac_hdr(htt_pdev,
*tail_addr);
last_morefrag = lmac_hdr->i_fc[1] & IEEE80211_FC1_MORE_FRAG;
@@ -362,7 +362,7 @@
if (next_fragno != count)
break;
- next = cdf_nbuf_next(next);
+ next = qdf_nbuf_next(next);
} while (next);
if (!next) {
@@ -448,10 +448,10 @@
*/
void
ol_rx_defrag(ol_txrx_pdev_handle pdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t frag_list)
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t frag_list)
{
struct ol_txrx_vdev_t *vdev = NULL;
- cdf_nbuf_t tmp_next, msdu, prev = NULL, cur = frag_list;
+ qdf_nbuf_t tmp_next, msdu, prev = NULL, cur = frag_list;
uint8_t index, tkip_demic = 0;
uint16_t hdr_space;
void *rx_desc;
@@ -471,12 +471,12 @@
}
while (cur) {
- tmp_next = cdf_nbuf_next(cur);
- cdf_nbuf_set_next(cur, NULL);
+ tmp_next = qdf_nbuf_next(cur);
+ qdf_nbuf_set_next(cur, NULL);
if (!ol_rx_pn_check_base(vdev, peer, tid, cur)) {
/* PN check failed,discard frags */
if (prev) {
- cdf_nbuf_set_next(prev, NULL);
+ qdf_nbuf_set_next(prev, NULL);
ol_rx_frames_free(htt_pdev, frag_list);
}
ol_rx_frames_free(htt_pdev, tmp_next);
@@ -485,9 +485,9 @@
return;
}
/* remove FCS from each fragment */
- cdf_nbuf_trim_tail(cur, DEFRAG_IEEE80211_FCS_LEN);
+ qdf_nbuf_trim_tail(cur, DEFRAG_IEEE80211_FCS_LEN);
prev = cur;
- cdf_nbuf_set_next(cur, tmp_next);
+ qdf_nbuf_set_next(cur, tmp_next);
cur = tmp_next;
}
cur = frag_list;
@@ -504,7 +504,7 @@
/* fall-through to rest of tkip ops */
case htt_sec_type_tkip_nomic:
while (cur) {
- tmp_next = cdf_nbuf_next(cur);
+ tmp_next = qdf_nbuf_next(cur);
if (!ol_rx_frag_tkip_decap(pdev, cur, hdr_space)) {
/* TKIP decap failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
@@ -518,7 +518,7 @@
case htt_sec_type_aes_ccmp:
while (cur) {
- tmp_next = cdf_nbuf_next(cur);
+ tmp_next = qdf_nbuf_next(cur);
if (!ol_rx_frag_ccmp_demic(pdev, cur, hdr_space)) {
/* CCMP demic failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
@@ -541,7 +541,7 @@
case htt_sec_type_wep104:
case htt_sec_type_wep128:
while (cur) {
- tmp_next = cdf_nbuf_next(cur);
+ tmp_next = qdf_nbuf_next(cur);
if (!ol_rx_frag_wep_decap(pdev, cur, hdr_space)) {
/* wep decap failed, discard frags */
ol_rx_frames_free(htt_pdev, frag_list);
@@ -589,7 +589,7 @@
*/
int
ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t msdu, uint16_t hdrlen)
+ qdf_nbuf_t msdu, uint16_t hdrlen)
{
uint8_t *ivp, *origHdr;
@@ -602,15 +602,15 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
/* Header should have extended IV */
- origHdr = (uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len);
+ origHdr = (uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len);
ivp = origHdr + hdrlen;
if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV))
return OL_RX_DEFRAG_ERR;
qdf_mem_move(origHdr + f_tkip.ic_header, origHdr, hdrlen);
- cdf_nbuf_pull_head(msdu, f_tkip.ic_header);
- cdf_nbuf_trim_tail(msdu, f_tkip.ic_trailer);
+ qdf_nbuf_pull_head(msdu, f_tkip.ic_header);
+ qdf_nbuf_trim_tail(msdu, f_tkip.ic_trailer);
return OL_RX_DEFRAG_OK;
}
@@ -618,7 +618,7 @@
* Handling WEP processing for defragmentation
*/
int
-ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t hdrlen)
+ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu, uint16_t hdrlen)
{
uint8_t *origHdr;
void *rx_desc_old_position = NULL;
@@ -629,10 +629,10 @@
msdu,
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- origHdr = (uint8_t *) (cdf_nbuf_data(msdu) + rx_desc_len);
+ origHdr = (uint8_t *) (qdf_nbuf_data(msdu) + rx_desc_len);
qdf_mem_move(origHdr + f_wep.ic_header, origHdr, hdrlen);
- cdf_nbuf_pull_head(msdu, f_wep.ic_header);
- cdf_nbuf_trim_tail(msdu, f_wep.ic_trailer);
+ qdf_nbuf_pull_head(msdu, f_wep.ic_header);
+ qdf_nbuf_trim_tail(msdu, f_wep.ic_trailer);
return OL_RX_DEFRAG_OK;
}
@@ -641,7 +641,7 @@
*/
int
ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev, const uint8_t *key,
- cdf_nbuf_t msdu, uint16_t hdrlen)
+ qdf_nbuf_t msdu, uint16_t hdrlen)
{
int status;
uint32_t pktlen;
@@ -668,7 +668,7 @@
if (!qdf_mem_cmp(mic, mic0, f_tkip.ic_miclen))
return OL_RX_DEFRAG_ERR;
- cdf_nbuf_trim_tail(msdu, f_tkip.ic_miclen);
+ qdf_nbuf_trim_tail(msdu, f_tkip.ic_miclen);
return OL_RX_DEFRAG_OK;
}
@@ -677,7 +677,7 @@
*/
int
ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t nbuf, uint16_t hdrlen)
+ qdf_nbuf_t nbuf, uint16_t hdrlen)
{
uint8_t *ivp, *origHdr;
void *rx_desc_old_position = NULL;
@@ -689,13 +689,13 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- origHdr = (uint8_t *) (cdf_nbuf_data(nbuf) + rx_desc_len);
+ origHdr = (uint8_t *) (qdf_nbuf_data(nbuf) + rx_desc_len);
ivp = origHdr + hdrlen;
if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV))
return OL_RX_DEFRAG_ERR;
qdf_mem_move(origHdr + f_ccmp.ic_header, origHdr, hdrlen);
- cdf_nbuf_pull_head(nbuf, f_ccmp.ic_header);
+ qdf_nbuf_pull_head(nbuf, f_ccmp.ic_header);
return OL_RX_DEFRAG_OK;
}
@@ -705,7 +705,7 @@
*/
int
ol_rx_frag_ccmp_demic(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t wbuf, uint16_t hdrlen)
+ qdf_nbuf_t wbuf, uint16_t hdrlen)
{
uint8_t *ivp, *origHdr;
void *rx_desc_old_position = NULL;
@@ -717,13 +717,13 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- origHdr = (uint8_t *) (cdf_nbuf_data(wbuf) + rx_desc_len);
+ origHdr = (uint8_t *) (qdf_nbuf_data(wbuf) + rx_desc_len);
ivp = origHdr + hdrlen;
if (!(ivp[IEEE80211_WEP_IVLEN] & IEEE80211_WEP_EXTIV))
return OL_RX_DEFRAG_ERR;
- cdf_nbuf_trim_tail(wbuf, f_ccmp.ic_trailer);
+ qdf_nbuf_trim_tail(wbuf, f_ccmp.ic_trailer);
return OL_RX_DEFRAG_OK;
}
@@ -779,7 +779,7 @@
int
ol_rx_defrag_mic(ol_txrx_pdev_handle pdev,
const uint8_t *key,
- cdf_nbuf_t wbuf,
+ qdf_nbuf_t wbuf,
uint16_t off, uint16_t data_len, uint8_t mic[])
{
uint8_t hdr[16] = { 0, };
@@ -795,7 +795,7 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- ol_rx_defrag_michdr((struct ieee80211_frame *)(cdf_nbuf_data(wbuf) +
+ ol_rx_defrag_michdr((struct ieee80211_frame *)(qdf_nbuf_data(wbuf) +
rx_desc_len), hdr);
l = get_le32(key);
r = get_le32(key + 4);
@@ -811,7 +811,7 @@
michael_block(l, r);
/* first buffer has special handling */
- data = (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len + off;
+ data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len + off;
space = ol_rx_defrag_len(wbuf) - rx_desc_len - off;
for (;; ) {
if (space > data_len)
@@ -828,7 +828,7 @@
if (data_len < sizeof(uint32_t))
break;
- wbuf = cdf_nbuf_next(wbuf);
+ wbuf = qdf_nbuf_next(wbuf);
if (wbuf == NULL)
return OL_RX_DEFRAG_ERR;
@@ -840,7 +840,7 @@
* Block straddles buffers, split references.
*/
data_next =
- (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len;
+ (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len;
if ((ol_rx_defrag_len(wbuf) - rx_desc_len) <
sizeof(uint32_t) - space) {
return OL_RX_DEFRAG_ERR;
@@ -874,7 +874,7 @@
/*
* Setup for next buffer.
*/
- data = (uint8_t *) cdf_nbuf_data(wbuf) + rx_desc_len;
+ data = (uint8_t *) qdf_nbuf_data(wbuf) + rx_desc_len;
space = ol_rx_defrag_len(wbuf) - rx_desc_len;
}
}
@@ -923,26 +923,26 @@
/*
* Recombine and decap fragments
*/
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_defrag_decap_recombine(htt_pdev_handle htt_pdev,
- cdf_nbuf_t frag_list, uint16_t hdrsize)
+ qdf_nbuf_t frag_list, uint16_t hdrsize)
{
- cdf_nbuf_t tmp;
- cdf_nbuf_t msdu = frag_list;
- cdf_nbuf_t rx_nbuf = frag_list;
+ qdf_nbuf_t tmp;
+ qdf_nbuf_t msdu = frag_list;
+ qdf_nbuf_t rx_nbuf = frag_list;
struct ieee80211_frame *wh;
- msdu = cdf_nbuf_next(msdu);
- cdf_nbuf_set_next(rx_nbuf, NULL);
+ msdu = qdf_nbuf_next(msdu);
+ qdf_nbuf_set_next(rx_nbuf, NULL);
while (msdu) {
htt_rx_msdu_desc_free(htt_pdev, msdu);
- tmp = cdf_nbuf_next(msdu);
- cdf_nbuf_set_next(msdu, NULL);
+ tmp = qdf_nbuf_next(msdu);
+ qdf_nbuf_set_next(msdu, NULL);
ol_rx_frag_pull_hdr(htt_pdev, msdu, hdrsize);
if (!ol_rx_defrag_concat(rx_nbuf, msdu)) {
ol_rx_frames_free(htt_pdev, tmp);
htt_rx_desc_frame_free(htt_pdev, rx_nbuf);
- cdf_nbuf_free(msdu);
+ qdf_nbuf_free(msdu);
/* msdu rx desc already freed above */
return NULL;
}
@@ -956,7 +956,7 @@
return rx_nbuf;
}
-void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu)
+void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu)
{
struct ieee80211_frame wh;
uint32_t hdrsize;
@@ -972,10 +972,10 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- wh_ptr = (struct ieee80211_frame *)(cdf_nbuf_data(msdu) + rx_desc_len);
+ wh_ptr = (struct ieee80211_frame *)(qdf_nbuf_data(msdu) + rx_desc_len);
qdf_mem_copy(&wh, wh_ptr, sizeof(wh));
hdrsize = sizeof(struct ieee80211_frame);
- qdf_mem_copy(&llchdr, ((uint8_t *) (cdf_nbuf_data(msdu) +
+ qdf_mem_copy(&llchdr, ((uint8_t *) (qdf_nbuf_data(msdu) +
rx_desc_len)) + hdrsize,
sizeof(struct llc_snap_hdr_t));
@@ -983,10 +983,10 @@
* Now move the data pointer to the beginning of the mac header :
* new-header = old-hdr + (wifhdrsize + llchdrsize - ethhdrsize)
*/
- cdf_nbuf_pull_head(msdu, (rx_desc_len + hdrsize +
+ qdf_nbuf_pull_head(msdu, (rx_desc_len + hdrsize +
sizeof(struct llc_snap_hdr_t) -
sizeof(struct ethernet_hdr_t)));
- eth_hdr = (struct ethernet_hdr_t *)(cdf_nbuf_data(msdu));
+ eth_hdr = (struct ethernet_hdr_t *)(qdf_nbuf_data(msdu));
switch (wh.i_fc[1] & IEEE80211_FC1_DIR_MASK) {
case IEEE80211_FC1_DIR_NODS:
qdf_mem_copy(eth_hdr->dest_addr, wh.i_addr1,
@@ -1016,7 +1016,7 @@
*/
void
ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t nbuf, uint16_t hdrlen)
+ qdf_nbuf_t nbuf, uint16_t hdrlen)
{
struct ieee80211_frame *wh;
uint16_t qoslen;
@@ -1029,7 +1029,7 @@
&rx_desc_old_position,
&ind_old_position, &rx_desc_len);
- wh = (struct ieee80211_frame *)(cdf_nbuf_data(nbuf) + rx_desc_len);
+ wh = (struct ieee80211_frame *)(qdf_nbuf_data(nbuf) + rx_desc_len);
if (DEFRAG_IEEE80211_QOS_HAS_SEQ(wh)) {
qoslen = sizeof(struct ieee80211_qoscntl);
/* Qos frame with Order bit set indicates a HTC frame */
@@ -1039,19 +1039,19 @@
/* remove QoS filed from header */
hdrlen -= qoslen;
qdf_mem_move((uint8_t *) wh + qoslen, wh, hdrlen);
- wh = (struct ieee80211_frame *)cdf_nbuf_pull_head(nbuf,
+ wh = (struct ieee80211_frame *)qdf_nbuf_pull_head(nbuf,
rx_desc_len +
qoslen);
/* clear QoS bit */
/*
- * KW# 6154 'cdf_nbuf_pull_head' in turn calls
- * __cdf_nbuf_pull_head,
+ * KW# 6154 'qdf_nbuf_pull_head' in turn calls
+ * __qdf_nbuf_pull_head,
* which returns NULL if there is not sufficient data to pull.
- * It's guaranteed that cdf_nbuf_pull_head will succeed rather
+ * It's guaranteed that qdf_nbuf_pull_head will succeed rather
* than returning NULL, since the entire rx frame is already
* present in the rx buffer.
* However, to make it obvious to static analyzers that this
- * code is safe, add an explicit check that cdf_nbuf_pull_head
+ * code is safe, add an explicit check that qdf_nbuf_pull_head
* returns a non-NULL value.
* Since this part of the code is not performance-critical,
* adding this explicit check is okay.
diff --git a/core/dp/txrx/ol_rx_defrag.h b/core/dp/txrx/ol_rx_defrag.h
index 6ed90da..595d83a 100644
--- a/core/dp/txrx/ol_rx_defrag.h
+++ b/core/dp/txrx/ol_rx_defrag.h
@@ -28,7 +28,7 @@
#ifndef _OL_RX_DEFRAG_H_
#define _OL_RX_DEFRAG_H_
-#include <cdf_nbuf.h>
+#include <qdf_nbuf.h>
#include <cds_ieee80211_common.h>
#include <qdf_util.h>
#include <qdf_types.h>
@@ -54,16 +54,16 @@
};
#define ol_rx_defrag_copydata(buf, offset, len, _to) \
- cdf_nbuf_copy_bits(buf, offset, len, _to)
+ qdf_nbuf_copy_bits(buf, offset, len, _to)
#define ol_rx_defrag_len(buf) \
- cdf_nbuf_len(buf)
+ qdf_nbuf_len(buf)
void
ol_rx_fraglist_insert(htt_pdev_handle htt_pdev,
- cdf_nbuf_t *head_addr,
- cdf_nbuf_t *tail_addr,
- cdf_nbuf_t frag, uint8_t *all_frag_present);
+ qdf_nbuf_t *head_addr,
+ qdf_nbuf_t *tail_addr,
+ qdf_nbuf_t frag, uint8_t *all_frag_present);
void ol_rx_defrag_waitlist_add(struct ol_txrx_peer_t *peer, unsigned tid);
@@ -73,33 +73,33 @@
void
ol_rx_defrag(ol_txrx_pdev_handle pdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t frag_list);
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t frag_list);
int
ol_rx_frag_tkip_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t msdu, uint16_t hdrlen);
+ qdf_nbuf_t msdu, uint16_t hdrlen);
int
ol_rx_frag_wep_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t nbuf, uint16_t hdrlen);
+ qdf_nbuf_t nbuf, uint16_t hdrlen);
-void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, cdf_nbuf_t msdu);
+void ol_rx_defrag_nwifi_to_8023(ol_txrx_pdev_handle pdev, qdf_nbuf_t msdu);
void
ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t nbuf, uint16_t hdrlen);
+ qdf_nbuf_t nbuf, uint16_t hdrlen);
int
ol_rx_frag_tkip_demic(ol_txrx_pdev_handle pdev,
- const uint8_t *key, cdf_nbuf_t msdu, uint16_t hdrlen);
+ const uint8_t *key, qdf_nbuf_t msdu, uint16_t hdrlen);
int
ol_rx_frag_ccmp_decap(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t nbuf, uint16_t hdrlen);
+ qdf_nbuf_t nbuf, uint16_t hdrlen);
int
ol_rx_frag_ccmp_demic(ol_txrx_pdev_handle pdev,
- cdf_nbuf_t wbuf, uint16_t hdrlen);
+ qdf_nbuf_t wbuf, uint16_t hdrlen);
uint16_t ol_rx_frag_hdrsize(const void *data);
@@ -108,16 +108,16 @@
void
ol_rx_reorder_store_frag(ol_txrx_pdev_handle pdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, uint16_t seq_num, cdf_nbuf_t frag);
+ unsigned tid, uint16_t seq_num, qdf_nbuf_t frag);
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_defrag_decap_recombine(htt_pdev_handle htt_pdev,
- cdf_nbuf_t frag_list, uint16_t hdrsize);
+ qdf_nbuf_t frag_list, uint16_t hdrsize);
int
ol_rx_defrag_mic(ol_txrx_pdev_handle pdev,
const uint8_t *key,
- cdf_nbuf_t wbuf,
+ qdf_nbuf_t wbuf,
uint16_t off, uint16_t data_len, uint8_t mic[]);
void
@@ -167,16 +167,16 @@
p[3] = (v >> 24) & 0xff;
}
-static inline uint8_t ol_rx_defrag_concat(cdf_nbuf_t dst, cdf_nbuf_t src)
+static inline uint8_t ol_rx_defrag_concat(qdf_nbuf_t dst, qdf_nbuf_t src)
{
/*
- * Inside cdf_nbuf_cat, if it is necessary to reallocate dst
+ * Inside qdf_nbuf_cat, if it is necessary to reallocate dst
* to provide space for src, the headroom portion is copied from
* the original dst buffer to the larger new dst buffer.
* (This is needed, because the headroom of the dst buffer
* contains the rx desc.)
*/
- if (cdf_nbuf_cat(dst, src))
+ if (qdf_nbuf_cat(dst, src))
return OL_RX_DEFRAG_ERR;
return OL_RX_DEFRAG_OK;
diff --git a/core/dp/txrx/ol_rx_fwd.c b/core/dp/txrx/ol_rx_fwd.c
index f85df9d..7653928 100644
--- a/core/dp/txrx/ol_rx_fwd.c
+++ b/core/dp/txrx/ol_rx_fwd.c
@@ -26,7 +26,7 @@
*/
/* standard header files */
-#include <cdf_nbuf.h> /* cdf_nbuf_map */
+#include <qdf_nbuf.h> /* qdf_nbuf_map */
#include <qdf_mem.h> /* qdf_mem_cmp */
/* external header files */
@@ -48,7 +48,7 @@
* Check that this Packet is suitable for forwarding. If yes, then
* prepare the new 802.11 header.
*/
-static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu)
+static inline void ol_ap_fwd_check(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu)
{
struct ieee80211_frame *mac_header;
unsigned char tmp_addr[IEEE80211_ADDR_LEN];
@@ -57,7 +57,7 @@
unsigned char fromds;
unsigned char tods;
- mac_header = (struct ieee80211_frame *)(cdf_nbuf_data(msdu));
+ mac_header = (struct ieee80211_frame *)(qdf_nbuf_data(msdu));
TXRX_ASSERT1(mac_header);
type = mac_header->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
@@ -107,7 +107,7 @@
}
}
-static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu)
+static inline void ol_rx_fwd_to_tx(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
@@ -118,8 +118,8 @@
* Map the netbuf, so it's accessible to the DMA that
* sends it to the target.
*/
- cdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
- cdf_nbuf_set_next(msdu, NULL); /* add NULL terminator */
+ qdf_nbuf_map_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_set_next(msdu, NULL); /* add NULL terminator */
msdu = OL_TX_LL(vdev, msdu);
@@ -129,19 +129,19 @@
* We could store the frame and try again later,
* but the simplest solution is to discard the frames.
*/
- cdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
- cdf_nbuf_tx_free(msdu, NBUF_PKT_ERROR);
+ qdf_nbuf_unmap_single(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_tx_free(msdu, QDF_NBUF_PKT_ERROR);
}
}
void
ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list)
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
- cdf_nbuf_t deliver_list_head = NULL;
- cdf_nbuf_t deliver_list_tail = NULL;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t deliver_list_head = NULL;
+ qdf_nbuf_t deliver_list_tail = NULL;
+ qdf_nbuf_t msdu;
msdu = msdu_list;
while (msdu) {
@@ -151,7 +151,7 @@
* Remember the next list elem, because our processing
* may cause the MSDU to get linked into a different list.
*/
- msdu_list = cdf_nbuf_next(msdu);
+ msdu_list = qdf_nbuf_next(msdu);
rx_desc = htt_rx_msdu_desc_retrieve(pdev->htt_pdev, msdu);
@@ -182,9 +182,9 @@
* Fw will take care of filling proper tid.
*/
if (tid != HTT_NON_QOS_TID) {
- cdf_nbuf_set_tid(msdu, tid);
+ qdf_nbuf_set_tid(msdu, tid);
} else {
- cdf_nbuf_set_tid(msdu,
+ qdf_nbuf_set_tid(msdu,
QDF_NBUF_TX_EXT_TID_INVALID);
}
/*
@@ -195,14 +195,14 @@
*/
if (htt_rx_msdu_discard(pdev->htt_pdev, rx_desc)) {
htt_rx_msdu_desc_free(pdev->htt_pdev, msdu);
- cdf_net_buf_debug_release_skb(msdu);
+ qdf_net_buf_debug_release_skb(msdu);
ol_rx_fwd_to_tx(tx_vdev, msdu);
msdu = NULL; /* already handled this MSDU */
TXRX_STATS_ADD(pdev,
pub.rx.intra_bss_fwd.packets_fwd, 1);
} else {
- cdf_nbuf_t copy;
- copy = cdf_nbuf_copy(msdu);
+ qdf_nbuf_t copy;
+ copy = qdf_nbuf_copy(msdu);
if (copy)
ol_rx_fwd_to_tx(tx_vdev, copy);
TXRX_STATS_ADD(pdev,
@@ -221,7 +221,7 @@
}
if (deliver_list_head) {
/* add NULL terminator */
- cdf_nbuf_set_next(deliver_list_tail, NULL);
+ qdf_nbuf_set_next(deliver_list_tail, NULL);
if (ol_cfg_is_full_reorder_offload(pdev->ctrl_pdev)) {
ol_rx_in_order_deliver(vdev, peer, tid,
deliver_list_head);
diff --git a/core/dp/txrx/ol_rx_fwd.h b/core/dp/txrx/ol_rx_fwd.h
index fe570c5..79d1e2d 100644
--- a/core/dp/txrx/ol_rx_fwd.h
+++ b/core/dp/txrx/ol_rx_fwd.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -28,19 +28,19 @@
#ifndef _OL_RX_FWD_H_
#define _OL_RX_FWD_H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <ol_txrx_api.h> /* ol_txrx_peer_t, etc. */
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_fwd_mcast_check_sta(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast);
+ qdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast);
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_fwd_mcast_check_ap(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast);
+ qdf_nbuf_t msdu, void *rx_desc, int is_wlan_mcast);
/**
* @brief Check if rx frames should be transmitted over WLAN.
@@ -70,6 +70,6 @@
void
ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list);
+ unsigned tid, qdf_nbuf_t msdu_list);
#endif /* _OL_RX_FWD_H_ */
diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c
index 4da66ef..fa4903d 100644
--- a/core/dp/txrx/ol_rx_pn.c
+++ b/core/dp/txrx/ol_rx_pn.c
@@ -25,7 +25,7 @@
* to the Linux Foundation.
*/
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_htt_rx_api.h> /* htt_rx_pn_t, etc. */
#include <ol_ctrl_txrx_api.h> /* ol_rx_err */
@@ -41,7 +41,7 @@
if (!head) { \
head = mpdu; \
} else { \
- cdf_nbuf_set_next(tail, mpdu); \
+ qdf_nbuf_set_next(tail, mpdu); \
} \
tail = mpdu_tail; \
} while (0)
@@ -80,16 +80,16 @@
return pn_is_replay;
}
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list)
+ unsigned tid, qdf_nbuf_t msdu_list)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
union htt_rx_pn_t *last_pn;
- cdf_nbuf_t out_list_head = NULL;
- cdf_nbuf_t out_list_tail = NULL;
- cdf_nbuf_t mpdu;
+ qdf_nbuf_t out_list_head = NULL;
+ qdf_nbuf_t out_list_tail = NULL;
+ qdf_nbuf_t mpdu;
int index; /* unicast vs. multicast */
int pn_len;
void *rx_desc;
@@ -114,7 +114,7 @@
last_pn = &peer->tids_last_pn[tid];
mpdu = msdu_list;
while (mpdu) {
- cdf_nbuf_t mpdu_tail, next_mpdu;
+ qdf_nbuf_t mpdu_tail, next_mpdu;
union htt_rx_pn_t new_pn;
int pn_is_replay = 0;
@@ -148,7 +148,7 @@
}
if (pn_is_replay) {
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
static uint32_t last_pncheck_print_time /* = 0 */;
int log_level;
uint32_t current_time_ms;
@@ -198,10 +198,10 @@
mpdu, NULL, 0);
/* free all MSDUs within this MPDU */
do {
- cdf_nbuf_t next_msdu;
+ qdf_nbuf_t next_msdu;
OL_RX_ERR_STATISTICS_1(pdev, vdev, peer,
rx_desc, OL_RX_ERR_PN);
- next_msdu = cdf_nbuf_next(msdu);
+ next_msdu = qdf_nbuf_next(msdu);
htt_rx_desc_frame_free(pdev->htt_pdev, msdu);
if (msdu == mpdu_tail)
break;
@@ -228,14 +228,14 @@
}
/* make sure the list is null-terminated */
if (out_list_tail)
- cdf_nbuf_set_next(out_list_tail, NULL);
+ qdf_nbuf_set_next(out_list_tail, NULL);
return out_list_head;
}
void
ol_rx_pn_check(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list)
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list)
{
msdu_list = ol_rx_pn_check_base(vdev, peer, tid, msdu_list);
ol_rx_fwd_check(vdev, peer, tid, msdu_list);
@@ -244,7 +244,7 @@
void
ol_rx_pn_check_only(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list)
+ unsigned tid, qdf_nbuf_t msdu_list)
{
msdu_list = ol_rx_pn_check_base(vdev, peer, tid, msdu_list);
ol_rx_deliver(vdev, peer, tid, msdu_list);
diff --git a/core/dp/txrx/ol_rx_pn.h b/core/dp/txrx/ol_rx_pn.h
index 845dc91..0b132f8 100644
--- a/core/dp/txrx/ol_rx_pn.h
+++ b/core/dp/txrx/ol_rx_pn.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -28,7 +28,7 @@
#ifndef _OL_RX_PN_H_
#define _OL_RX_PN_H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <ol_txrx_api.h> /* ol_txrx_peer_t, etc. */
@@ -60,7 +60,7 @@
*/
void
ol_rx_pn_check(struct ol_txrx_vdev_t *vdev,
- struct ol_txrx_peer_t *peer, unsigned tid, cdf_nbuf_t msdu_list);
+ struct ol_txrx_peer_t *peer, unsigned tid, qdf_nbuf_t msdu_list);
/**
* @brief If applicable, check the Packet Number to detect replays.
@@ -82,7 +82,7 @@
void
ol_rx_pn_check_only(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list);
+ unsigned tid, qdf_nbuf_t msdu_list);
/**
* @brief If applicable, check the Packet Number to detect replays.
@@ -97,9 +97,9 @@
* (if PN check is applicable, i.e. PN length > 0)
* @return list of netbufs that didn't fail the PN check
*/
-cdf_nbuf_t
+qdf_nbuf_t
ol_rx_pn_check_base(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list);
+ unsigned tid, qdf_nbuf_t msdu_list);
#endif /* _OL_RX_PN_H_ */
diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c
index 42fd4fb..f832aa6 100644
--- a/core/dp/txrx/ol_rx_reorder.c
+++ b/core/dp/txrx/ol_rx_reorder.c
@@ -27,7 +27,7 @@
/*=== header file includes ===*/
/* generic utilities */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* cdf_nbuf_t, etc. */
#include <qdf_mem.h> /* qdf_mem_malloc */
#include <ieee80211.h> /* IEEE80211_SEQ_MAX */
@@ -86,7 +86,7 @@
#define OL_RX_REORDER_LIST_APPEND(head_msdu, tail_msdu, rx_reorder_array_elem) \
do { \
if (tail_msdu) { \
- cdf_nbuf_set_next(tail_msdu, \
+ qdf_nbuf_set_next(tail_msdu, \
rx_reorder_array_elem->head); \
} \
} while (0)
@@ -223,14 +223,14 @@
ol_rx_reorder_store(struct ol_txrx_pdev_t *pdev,
struct ol_txrx_peer_t *peer,
unsigned tid,
- unsigned idx, cdf_nbuf_t head_msdu, cdf_nbuf_t tail_msdu)
+ unsigned idx, qdf_nbuf_t head_msdu, qdf_nbuf_t tail_msdu)
{
struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem;
idx &= peer->tids_rx_reorder[tid].win_sz_mask;
rx_reorder_array_elem = &peer->tids_rx_reorder[tid].array[idx];
if (rx_reorder_array_elem->head) {
- cdf_nbuf_set_next(rx_reorder_array_elem->tail, head_msdu);
+ qdf_nbuf_set_next(rx_reorder_array_elem->tail, head_msdu);
} else {
rx_reorder_array_elem->head = head_msdu;
OL_RX_REORDER_MPDU_CNT_INCR(&peer->tids_rx_reorder[tid], 1);
@@ -246,8 +246,8 @@
unsigned idx;
unsigned win_sz, win_sz_mask;
struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem;
- cdf_nbuf_t head_msdu;
- cdf_nbuf_t tail_msdu;
+ qdf_nbuf_t head_msdu;
+ qdf_nbuf_t tail_msdu;
OL_RX_REORDER_IDX_START_SELF_SELECT(peer, tid, &idx_start);
/* may get reset below */
@@ -305,7 +305,7 @@
head_msdu));
peer->tids_last_seq[tid] = seq_num;
/* rx_opt_proc takes a NULL-terminated list of msdu netbufs */
- cdf_nbuf_set_next(tail_msdu, NULL);
+ qdf_nbuf_set_next(tail_msdu, NULL);
peer->rx_opt_proc(vdev, peer, tid, head_msdu);
}
/*
@@ -327,8 +327,8 @@
unsigned win_sz;
uint8_t win_sz_mask;
struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem;
- cdf_nbuf_t head_msdu = NULL;
- cdf_nbuf_t tail_msdu = NULL;
+ qdf_nbuf_t head_msdu = NULL;
+ qdf_nbuf_t tail_msdu = NULL;
pdev = vdev->pdev;
win_sz = peer->tids_rx_reorder[tid].win_sz;
@@ -371,7 +371,7 @@
rx_reorder_array_elem->tail = NULL;
continue;
}
- cdf_nbuf_set_next(tail_msdu,
+ qdf_nbuf_set_next(tail_msdu,
rx_reorder_array_elem->head);
tail_msdu = rx_reorder_array_elem->tail;
rx_reorder_array_elem->head =
@@ -390,13 +390,13 @@
htt_rx_msdu_desc_retrieve(htt_pdev, head_msdu));
peer->tids_last_seq[tid] = seq_num;
/* rx_opt_proc takes a NULL-terminated list of msdu netbufs */
- cdf_nbuf_set_next(tail_msdu, NULL);
+ qdf_nbuf_set_next(tail_msdu, NULL);
if (action == htt_rx_flush_release) {
peer->rx_opt_proc(vdev, peer, tid, head_msdu);
} else {
do {
- cdf_nbuf_t next;
- next = cdf_nbuf_next(head_msdu);
+ qdf_nbuf_t next;
+ next = qdf_nbuf_next(head_msdu);
htt_rx_desc_frame_free(pdev->htt_pdev,
head_msdu);
head_msdu = next;
@@ -596,8 +596,8 @@
struct ol_txrx_peer_t *peer;
struct ol_rx_reorder_array_elem_t *rx_reorder_array_elem;
unsigned win_sz_mask;
- cdf_nbuf_t head_msdu = NULL;
- cdf_nbuf_t tail_msdu = NULL;
+ qdf_nbuf_t head_msdu = NULL;
+ qdf_nbuf_t tail_msdu = NULL;
htt_pdev_handle htt_pdev = pdev->htt_pdev;
int seq_num, i = 0;
@@ -630,7 +630,7 @@
if (rx_reorder_array_elem->head) {
if (pn_ie_cnt && seq_num == (int)(pn_ie[i])) {
- cdf_nbuf_t msdu, next_msdu, mpdu_head,
+ qdf_nbuf_t msdu, next_msdu, mpdu_head,
mpdu_tail;
static uint32_t last_pncheck_print_time;
/* Do not need to initialize as C does it */
@@ -691,7 +691,7 @@
/* free all MSDUs within this MPDU */
do {
- next_msdu = cdf_nbuf_next(msdu);
+ next_msdu = qdf_nbuf_next(msdu);
htt_rx_desc_frame_free(htt_pdev, msdu);
if (msdu == mpdu_tail)
break;
@@ -704,7 +704,7 @@
head_msdu = rx_reorder_array_elem->head;
tail_msdu = rx_reorder_array_elem->tail;
} else {
- cdf_nbuf_set_next(
+ qdf_nbuf_set_next(
tail_msdu,
rx_reorder_array_elem->head);
tail_msdu = rx_reorder_array_elem->tail;
@@ -718,7 +718,7 @@
if (head_msdu) {
/* rx_opt_proc takes a NULL-terminated list of msdu netbufs */
- cdf_nbuf_set_next(tail_msdu, NULL);
+ qdf_nbuf_set_next(tail_msdu, NULL);
peer->rx_opt_proc(vdev, peer, tid, head_msdu);
}
}
diff --git a/core/dp/txrx/ol_rx_reorder.h b/core/dp/txrx/ol_rx_reorder.h
index 7629c6a..7017154 100644
--- a/core/dp/txrx/ol_rx_reorder.h
+++ b/core/dp/txrx/ol_rx_reorder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -28,7 +28,7 @@
#ifndef _OL_RX_REORDER__H_
#define _OL_RX_REORDER__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <ol_txrx_api.h> /* ol_txrx_peer_t, etc. */
@@ -39,7 +39,7 @@
struct ol_txrx_peer_t *peer,
unsigned tid,
unsigned reorder_array_index,
- cdf_nbuf_t head_msdu, cdf_nbuf_t tail_msdu);
+ qdf_nbuf_t head_msdu, qdf_nbuf_t tail_msdu);
void
ol_rx_reorder_release(struct ol_txrx_vdev_t *vdev,
diff --git a/core/dp/txrx/ol_rx_reorder_timeout.c b/core/dp/txrx/ol_rx_reorder_timeout.c
index 3175dc5..24b0ae5 100644
--- a/core/dp/txrx/ol_rx_reorder_timeout.c
+++ b/core/dp/txrx/ol_rx_reorder_timeout.c
@@ -27,7 +27,7 @@
/*=== header file includes ===*/
/* generic utilities */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_timer.h>
#include <qdf_time.h>
diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c
index 6ac608a..b5dedef 100644
--- a/core/dp/txrx/ol_tx.c
+++ b/core/dp/txrx/ol_tx.c
@@ -26,7 +26,7 @@
*/
/* OS abstraction libraries */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_atomic.h> /* qdf_atomic_read, etc. */
#include <qdf_util.h> /* qdf_unlikely */
@@ -56,7 +56,7 @@
#include <htt_internal.h>
#include <htt_types.h> /* htc_endpoint */
-int ce_send_fast(struct CE_handle *copyeng, cdf_nbuf_t *msdus,
+int ce_send_fast(struct CE_handle *copyeng, qdf_nbuf_t *msdus,
unsigned int num_msdus, unsigned int transfer_id);
#endif /* WLAN_FEATURE_FASTPATH */
@@ -91,11 +91,11 @@
* Return: 0 - success, >0 - error
*/
static inline uint8_t ol_tx_prepare_tso(ol_txrx_vdev_handle vdev,
- cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
+ qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
{
msdu_info->tso_info.curr_seg = NULL;
- if (cdf_nbuf_is_tso(msdu)) {
- int num_seg = cdf_nbuf_get_tso_num_seg(msdu);
+ if (qdf_nbuf_is_tso(msdu)) {
+ int num_seg = qdf_nbuf_get_tso_num_seg(msdu);
msdu_info->tso_info.tso_seg_list = NULL;
msdu_info->tso_info.num_segs = num_seg;
while (num_seg) {
@@ -121,7 +121,7 @@
return 1;
}
}
- cdf_nbuf_get_tso_info(vdev->pdev->osdev,
+ qdf_nbuf_get_tso_info(vdev->pdev->osdev,
msdu, &(msdu_info->tso_info));
msdu_info->tso_info.curr_seg =
msdu_info->tso_info.tso_seg_list;
@@ -142,13 +142,13 @@
*
* Return: skb/NULL for success
*/
-cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
+qdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, qdf_nbuf_t skb,
uint8_t proto_type)
{
void *qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE);
struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
struct ol_txrx_peer_t *peer;
- cdf_nbuf_t ret;
+ qdf_nbuf_t ret;
QDF_STATUS status;
if (qdf_unlikely(!pdev)) {
@@ -181,27 +181,27 @@
return skb;
}
- status = cdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE);
+ status = qdf_nbuf_map_single(qdf_ctx, skb, QDF_DMA_TO_DEVICE);
if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
"%s: nbuf map failed", __func__);
return skb;
}
- cdf_nbuf_trace_set_proto_type(skb, proto_type);
+ qdf_nbuf_trace_set_proto_type(skb, proto_type);
if ((ol_cfg_is_ip_tcp_udp_checksum_offload_enabled(pdev->ctrl_pdev))
- && (cdf_nbuf_get_protocol(skb) == htons(ETH_P_IP))
- && (cdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL))
- cdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE);
+ && (qdf_nbuf_get_protocol(skb) == htons(ETH_P_IP))
+ && (qdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL))
+ qdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE);
/* Terminate the (single-element) list of tx frames */
- cdf_nbuf_set_next(skb, NULL);
+ qdf_nbuf_set_next(skb, NULL);
ret = OL_TX_LL(peer->vdev, skb);
if (ret) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
"%s: Failed to tx", __func__);
- cdf_nbuf_unmap_single(qdf_ctx, ret, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_unmap_single(qdf_ctx, ret, QDF_DMA_TO_DEVICE);
return ret;
}
@@ -216,11 +216,11 @@
*
* Return: skb/ NULL is for success
*/
-cdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
- cdf_nbuf_t skb)
+qdf_nbuf_t ol_tx_send_ipa_data_frame(void *vdev,
+ qdf_nbuf_t skb)
{
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
- cdf_nbuf_t ret;
+ qdf_nbuf_t ret;
if (qdf_unlikely(!pdev)) {
TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -229,12 +229,12 @@
}
if ((ol_cfg_is_ip_tcp_udp_checksum_offload_enabled(pdev->ctrl_pdev))
- && (cdf_nbuf_get_protocol(skb) == htons(ETH_P_IP))
- && (cdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL))
- cdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE);
+ && (qdf_nbuf_get_protocol(skb) == htons(ETH_P_IP))
+ && (qdf_nbuf_get_ip_summed(skb) == CHECKSUM_PARTIAL))
+ qdf_nbuf_set_ip_summed(skb, CHECKSUM_COMPLETE);
/* Terminate the (single-element) list of tx frames */
- cdf_nbuf_set_next(skb, NULL);
+ qdf_nbuf_set_next(skb, NULL);
ret = OL_TX_LL((struct ol_txrx_vdev_t *)vdev, skb);
if (ret) {
TXRX_PRINT(TXRX_PRINT_LEVEL_WARN,
@@ -248,9 +248,9 @@
#if defined(FEATURE_TSO)
-cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
struct ol_txrx_msdu_info_t msdu_info;
msdu_info.htt.info.l2_hdr_type = vdev->pdev->htt_pkt_type;
@@ -262,11 +262,11 @@
* within the list.
*/
while (msdu) {
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
struct ol_tx_desc_t *tx_desc;
int segments = 1;
- msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu);
+ msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu);
msdu_info.peer = NULL;
if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) {
@@ -283,7 +283,7 @@
* ol_tx_send function, so store the next pointer before the
* tx_send call.
*/
- next = cdf_nbuf_next(msdu);
+ next = qdf_nbuf_next(msdu);
/* init the current segment to the 1st segment in the list */
while (segments) {
@@ -301,7 +301,7 @@
* receiving tx completion for all segments of an nbuf
*/
if (segments)
- cdf_nbuf_inc_users(msdu);
+ qdf_nbuf_inc_users(msdu);
ol_tx_prepare_ll(tx_desc, vdev, msdu, &msdu_info);
@@ -318,7 +318,7 @@
msdu_info.tso_info.curr_seg->next;
}
- cdf_nbuf_reset_num_frags(msdu);
+ qdf_nbuf_reset_num_frags(msdu);
if (msdu_info.tso_info.is_tso) {
TXRX_STATS_TSO_INC_SEG(vdev->pdev);
@@ -336,9 +336,9 @@
}
#else /* TSO */
-cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
struct ol_txrx_msdu_info_t msdu_info;
msdu_info.htt.info.l2_hdr_type = vdev->pdev->htt_pkt_type;
@@ -351,10 +351,10 @@
* within the list.
*/
while (msdu) {
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
struct ol_tx_desc_t *tx_desc;
- msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu);
+ msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu);
msdu_info.peer = NULL;
ol_tx_prepare_ll(tx_desc, vdev, msdu, &msdu_info);
@@ -368,7 +368,7 @@
* ol_tx_send function, so store the next pointer before the
* tx_send call.
*/
- next = cdf_nbuf_next(msdu);
+ next = qdf_nbuf_next(msdu);
ol_tx_send(vdev->pdev, tx_desc, msdu);
msdu = next;
}
@@ -394,7 +394,7 @@
*/
static inline struct ol_tx_desc_t *
ol_tx_prepare_ll_fast(struct ol_txrx_pdev_t *pdev,
- ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu,
+ ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu,
uint32_t pkt_download_len, uint32_t ep_id,
struct ol_txrx_msdu_info_t *msdu_info)
{
@@ -436,10 +436,10 @@
&msdu_info->htt, &msdu_info->tso_info,
NULL, vdev->opmode == wlan_op_mode_ocb);
- num_frags = cdf_nbuf_get_num_frags(msdu);
+ num_frags = qdf_nbuf_get_num_frags(msdu);
/* num_frags are expected to be 2 max */
- num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS)
- ? NBUF_CB_TX_MAX_EXTRA_FRAGS
+ num_frags = (num_frags > QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS)
+ ? QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS
: num_frags;
#if defined(HELIUMPLUS_PADDR64)
/*
@@ -463,8 +463,8 @@
qdf_size_t frag_len;
qdf_dma_addr_t frag_paddr;
- frag_len = cdf_nbuf_get_frag_len(msdu, i);
- frag_paddr = cdf_nbuf_get_frag_paddr(msdu, i);
+ frag_len = qdf_nbuf_get_frag_len(msdu, i);
+ frag_paddr = qdf_nbuf_get_frag_paddr(msdu, i);
#if defined(HELIUMPLUS_PADDR64)
htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc,
i - 1, frag_paddr, frag_len);
@@ -491,8 +491,8 @@
/*
* TODO : Can we remove this check and always download a fixed length ?
* */
- if (qdf_unlikely(cdf_nbuf_len(msdu) < pkt_download_len))
- pkt_download_len = cdf_nbuf_len(msdu);
+ if (qdf_unlikely(qdf_nbuf_len(msdu) < pkt_download_len))
+ pkt_download_len = qdf_nbuf_len(msdu);
/* Fill the HTC header information */
/*
@@ -513,10 +513,10 @@
*
* Return: on success return NULL, pointer to nbuf when it fails to send.
*/
-cdf_nbuf_t
-ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+qdf_nbuf_t
+ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
struct ol_txrx_pdev_t *pdev = vdev->pdev;
uint32_t pkt_download_len =
((struct htt_pdev_t *)(pdev->htt_pdev))->download_len;
@@ -532,11 +532,11 @@
* within the list.
*/
while (msdu) {
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
struct ol_tx_desc_t *tx_desc;
int segments = 1;
- msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu);
+ msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu);
msdu_info.peer = NULL;
if (qdf_unlikely(ol_tx_prepare_tso(vdev, msdu, &msdu_info))) {
@@ -553,7 +553,7 @@
* inside the ce_send_fast function, so store the next
* pointer before the ce_send call.
*/
- next = cdf_nbuf_next(msdu);
+ next = qdf_nbuf_next(msdu);
/* init the current segment to the 1st segment in the list */
while (segments) {
@@ -570,13 +570,13 @@
* receiving tx completion for all segments of an nbuf
*/
if (segments)
- cdf_nbuf_inc_users(msdu);
+ qdf_nbuf_inc_users(msdu);
msdu_info.htt.info.frame_type = pdev->htt_pkt_type;
msdu_info.htt.info.vdev_id = vdev->vdev_id;
msdu_info.htt.action.cksum_offload =
- cdf_nbuf_get_tx_cksum(msdu);
- switch (cdf_nbuf_get_exemption_type(msdu)) {
+ qdf_nbuf_get_tx_cksum(msdu);
+ switch (qdf_nbuf_get_exemption_type(msdu)) {
case QDF_NBUF_EXEMPT_NO_EXEMPTION:
case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
/* We want to encrypt this frame */
@@ -619,7 +619,7 @@
}
if (msdu_info.tso_info.is_tso) {
- cdf_nbuf_reset_num_frags(msdu);
+ qdf_nbuf_reset_num_frags(msdu);
TXRX_STATS_TSO_INC_SEG(vdev->pdev);
TXRX_STATS_TSO_INC_SEG_IDX(vdev->pdev);
}
@@ -640,10 +640,10 @@
return NULL; /* all MSDUs were accepted */
}
#else
-cdf_nbuf_t
-ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+qdf_nbuf_t
+ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
struct ol_txrx_pdev_t *pdev = vdev->pdev;
uint32_t pkt_download_len =
((struct htt_pdev_t *)(pdev->htt_pdev))->download_len;
@@ -660,17 +660,17 @@
* within the list.
*/
while (msdu) {
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
struct ol_tx_desc_t *tx_desc;
- msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu);
+ msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu);
msdu_info.peer = NULL;
msdu_info.htt.info.frame_type = pdev->htt_pkt_type;
msdu_info.htt.info.vdev_id = vdev->vdev_id;
msdu_info.htt.action.cksum_offload =
- cdf_nbuf_get_tx_cksum(msdu);
- switch (cdf_nbuf_get_exemption_type(msdu)) {
+ qdf_nbuf_get_tx_cksum(msdu);
+ switch (qdf_nbuf_get_exemption_type(msdu)) {
case QDF_NBUF_EXEMPT_NO_EXEMPTION:
case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
/* We want to encrypt this frame */
@@ -701,7 +701,7 @@
* inside the ce_send_fast function, so store the next
* pointer before the ce_send call.
*/
- next = cdf_nbuf_next(msdu);
+ next = qdf_nbuf_next(msdu);
if ((0 == ce_send_fast(pdev->ce_tx_hdl, &msdu, 1,
ep_id))) {
/* The packet could not be sent */
@@ -728,8 +728,8 @@
* ol_tx_ll_wrapper() wrapper to ol_tx_ll
*
*/
-static inline cdf_nbuf_t
-ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+static inline qdf_nbuf_t
+ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
struct hif_opaque_softc *hif_device =
(struct hif_opaque_softc *)cds_get_context(QDF_MODULE_ID_HIF);
@@ -742,8 +742,8 @@
return msdu_list;
}
#else
-static inline cdf_nbuf_t
-ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+static inline qdf_nbuf_t
+ol_tx_ll_wrapper(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
return ol_tx_ll(vdev, msdu_list);
}
@@ -778,17 +778,17 @@
max_to_accept = vdev->pdev->tx_desc.num_free -
OL_TX_VDEV_PAUSE_QUEUE_SEND_MARGIN;
while (max_to_accept > 0 && vdev->ll_pause.txq.depth) {
- cdf_nbuf_t tx_msdu;
+ qdf_nbuf_t tx_msdu;
max_to_accept--;
vdev->ll_pause.txq.depth--;
tx_msdu = vdev->ll_pause.txq.head;
if (tx_msdu) {
- vdev->ll_pause.txq.head = cdf_nbuf_next(tx_msdu);
+ vdev->ll_pause.txq.head = qdf_nbuf_next(tx_msdu);
if (NULL == vdev->ll_pause.txq.head)
vdev->ll_pause.txq.tail = NULL;
- cdf_nbuf_set_next(tx_msdu, NULL);
- NBUF_UPDATE_TX_PKT_COUNT(tx_msdu,
- NBUF_TX_PKT_TXRX_DEQUEUE);
+ qdf_nbuf_set_next(tx_msdu, NULL);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(tx_msdu,
+ QDF_NBUF_TX_PKT_TXRX_DEQUEUE);
tx_msdu = ol_tx_ll_wrapper(vdev, tx_msdu);
/*
* It is unexpected that ol_tx_ll would reject the frame
@@ -799,9 +799,9 @@
* For simplicity, just drop the frame.
*/
if (tx_msdu) {
- cdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu,
+ qdf_nbuf_unmap(vdev->pdev->osdev, tx_msdu,
QDF_DMA_TO_DEVICE);
- cdf_nbuf_tx_free(tx_msdu, NBUF_PKT_ERROR);
+ qdf_nbuf_tx_free(tx_msdu, QDF_NBUF_PKT_ERROR);
}
}
}
@@ -817,33 +817,34 @@
qdf_spin_unlock_bh(&vdev->ll_pause.mutex);
}
-static cdf_nbuf_t
+static qdf_nbuf_t
ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu_list, uint8_t start_timer)
+ qdf_nbuf_t msdu_list, uint8_t start_timer)
{
qdf_spin_lock_bh(&vdev->ll_pause.mutex);
while (msdu_list &&
vdev->ll_pause.txq.depth < vdev->ll_pause.max_q_depth) {
- cdf_nbuf_t next = cdf_nbuf_next(msdu_list);
- NBUF_UPDATE_TX_PKT_COUNT(msdu_list, NBUF_TX_PKT_TXRX_ENQUEUE);
+ qdf_nbuf_t next = qdf_nbuf_next(msdu_list);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu_list,
+ QDF_NBUF_TX_PKT_TXRX_ENQUEUE);
DPTRACE(qdf_dp_trace(msdu_list,
QDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD,
- (uint8_t *)(cdf_nbuf_data(msdu_list)),
- sizeof(cdf_nbuf_data(msdu_list))));
+ (uint8_t *)(qdf_nbuf_data(msdu_list)),
+ sizeof(qdf_nbuf_data(msdu_list))));
vdev->ll_pause.txq.depth++;
if (!vdev->ll_pause.txq.head) {
vdev->ll_pause.txq.head = msdu_list;
vdev->ll_pause.txq.tail = msdu_list;
} else {
- cdf_nbuf_set_next(vdev->ll_pause.txq.tail, msdu_list);
+ qdf_nbuf_set_next(vdev->ll_pause.txq.tail, msdu_list);
}
vdev->ll_pause.txq.tail = msdu_list;
msdu_list = next;
}
if (vdev->ll_pause.txq.tail)
- cdf_nbuf_set_next(vdev->ll_pause.txq.tail, NULL);
+ qdf_nbuf_set_next(vdev->ll_pause.txq.tail, NULL);
if (start_timer) {
qdf_timer_stop(&vdev->ll_pause.timer);
@@ -860,7 +861,7 @@
* Store up the tx frame in the vdev's tx queue if the vdev is paused.
* If there are too many frames in the tx queue, reject it.
*/
-cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
+qdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list)
{
uint16_t eth_type;
uint32_t paused_reason;
@@ -874,10 +875,10 @@
OL_TXQ_PAUSE_REASON_PEER_UNAUTHORIZED) ==
paused_reason)) {
eth_type = (((struct ethernet_hdr_t *)
- cdf_nbuf_data(msdu_list))->
+ qdf_nbuf_data(msdu_list))->
ethertype[0] << 8) |
(((struct ethernet_hdr_t *)
- cdf_nbuf_data(msdu_list))->ethertype[1]);
+ qdf_nbuf_data(msdu_list))->ethertype[1]);
if (ETHERTYPE_IS_EAPOL_WAPI(eth_type)) {
msdu_list = ol_tx_ll_wrapper(vdev, msdu_list);
return msdu_list;
@@ -918,7 +919,7 @@
void ol_tx_pdev_ll_pause_queue_send_all(struct ol_txrx_pdev_t *pdev)
{
int max_to_send; /* tracks how many frames have been sent */
- cdf_nbuf_t tx_msdu;
+ qdf_nbuf_t tx_msdu;
struct ol_txrx_vdev_t *vdev = NULL;
uint8_t more;
@@ -961,12 +962,12 @@
vdev->ll_pause.txq.depth--;
vdev->ll_pause.txq.head =
- cdf_nbuf_next(tx_msdu);
+ qdf_nbuf_next(tx_msdu);
if (NULL == vdev->ll_pause.txq.head)
vdev->ll_pause.txq.tail = NULL;
- cdf_nbuf_set_next(tx_msdu, NULL);
+ qdf_nbuf_set_next(tx_msdu, NULL);
tx_msdu = ol_tx_ll_wrapper(vdev, tx_msdu);
/*
* It is unexpected that ol_tx_ll would reject
@@ -978,10 +979,10 @@
* For simplicity, just drop the frame.
*/
if (tx_msdu) {
- cdf_nbuf_unmap(pdev->osdev, tx_msdu,
+ qdf_nbuf_unmap(pdev->osdev, tx_msdu,
QDF_DMA_TO_DEVICE);
- cdf_nbuf_tx_free(tx_msdu,
- NBUF_PKT_ERROR);
+ qdf_nbuf_tx_free(tx_msdu,
+ QDF_NBUF_PKT_ERROR);
}
}
/*check if there are more msdus to transmit */
@@ -1038,11 +1039,11 @@
return sub_type;
}
-cdf_nbuf_t
+qdf_nbuf_t
ol_tx_non_std_ll(ol_txrx_vdev_handle vdev,
- enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list)
+ enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list)
{
- cdf_nbuf_t msdu = msdu_list;
+ qdf_nbuf_t msdu = msdu_list;
htt_pdev_handle htt_pdev = vdev->pdev->htt_pdev;
struct ol_txrx_msdu_info_t msdu_info;
@@ -1056,10 +1057,10 @@
* within the list.
*/
while (msdu) {
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
struct ol_tx_desc_t *tx_desc;
- msdu_info.htt.info.ext_tid = cdf_nbuf_get_tid(msdu);
+ msdu_info.htt.info.ext_tid = qdf_nbuf_get_tid(msdu);
msdu_info.peer = NULL;
msdu_info.tso_info.is_tso = 0;
@@ -1070,7 +1071,7 @@
* ol_tx_send function, so store the next pointer before the
* tx_send call.
*/
- next = cdf_nbuf_next(msdu);
+ next = qdf_nbuf_next(msdu);
if (tx_spec != ol_tx_spec_std) {
if (tx_spec & ol_tx_spec_no_free) {
@@ -1126,26 +1127,26 @@
* parse_ocb_tx_header() - Function to check for OCB
* TX control header on a packet and extract it if present
*
- * @msdu: Pointer to OS packet (cdf_nbuf_t)
+ * @msdu: Pointer to OS packet (qdf_nbuf_t)
*/
#define OCB_HEADER_VERSION 1
-bool parse_ocb_tx_header(cdf_nbuf_t msdu,
+bool parse_ocb_tx_header(qdf_nbuf_t msdu,
struct ocb_tx_ctrl_hdr_t *tx_ctrl)
{
struct ether_header *eth_hdr_p;
struct ocb_tx_ctrl_hdr_t *tx_ctrl_hdr;
/* Check if TX control header is present */
- eth_hdr_p = (struct ether_header *) cdf_nbuf_data(msdu);
+ eth_hdr_p = (struct ether_header *) qdf_nbuf_data(msdu);
if (eth_hdr_p->ether_type != QDF_SWAP_U16(ETHERTYPE_OCB_TX))
/* TX control header is not present. Nothing to do.. */
return true;
/* Remove the ethernet header */
- cdf_nbuf_pull_head(msdu, sizeof(struct ether_header));
+ qdf_nbuf_pull_head(msdu, sizeof(struct ether_header));
/* Parse the TX control header */
- tx_ctrl_hdr = (struct ocb_tx_ctrl_hdr_t *) cdf_nbuf_data(msdu);
+ tx_ctrl_hdr = (struct ocb_tx_ctrl_hdr_t *) qdf_nbuf_data(msdu);
if (tx_ctrl_hdr->version == OCB_HEADER_VERSION) {
if (tx_ctrl)
@@ -1157,13 +1158,13 @@
}
/* Remove the TX control header */
- cdf_nbuf_pull_head(msdu, tx_ctrl_hdr->length);
+ qdf_nbuf_pull_head(msdu, tx_ctrl_hdr->length);
return true;
}
-cdf_nbuf_t
+qdf_nbuf_t
ol_tx_non_std(ol_txrx_vdev_handle vdev,
- enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list)
+ enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list)
{
return ol_tx_non_std_ll(vdev, tx_spec, msdu_list);
}
@@ -1230,7 +1231,7 @@
int
ol_txrx_mgmt_send(ol_txrx_vdev_handle vdev,
- cdf_nbuf_t tx_mgmt_frm,
+ qdf_nbuf_t tx_mgmt_frm,
uint8_t type, uint8_t use_6mbps, uint16_t chanfreq)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
@@ -1287,7 +1288,7 @@
tx_msdu_info.peer = NULL;
- cdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_map_single(pdev->osdev, tx_mgmt_frm, QDF_DMA_TO_DEVICE);
/* For LL tx_comp_req is not used so initialized to 0 */
tx_msdu_info.htt.action.tx_comp_req = 0;
tx_desc = ol_tx_desc_ll(pdev, vdev, tx_mgmt_frm, &tx_msdu_info);
@@ -1310,7 +1311,7 @@
htt_tx_desc_frags_table_set(
pdev->htt_pdev,
tx_desc->htt_tx_desc,
- cdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1),
+ qdf_nbuf_get_frag_paddr(tx_mgmt_frm, 1),
0, 0);
#if defined(HELIUMPLUS_PADDR64) && defined(HELIUMPLUS_DEBUG)
dump_frag_desc(
@@ -1319,7 +1320,7 @@
#endif /* defined(HELIUMPLUS_PADDR64) */
}
if (!tx_desc) {
- cdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm,
+ qdf_nbuf_unmap_single(pdev->osdev, tx_mgmt_frm,
QDF_DMA_TO_DEVICE);
return -EINVAL; /* can't accept the tx mgmt frame */
}
@@ -1328,7 +1329,9 @@
tx_desc->pkt_type = type + OL_TXRX_MGMT_TYPE_BASE;
htt_tx_desc_set_chanfreq(tx_desc->htt_tx_desc, chanfreq);
- NBUF_CB_TX_PACKET_TRACK(tx_desc->netbuf) = NBUF_TX_PKT_MGMT_TRACK; ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm,
+ QDF_NBUF_CB_TX_PACKET_TRACK(tx_desc->netbuf) =
+ QDF_NBUF_TX_PKT_MGMT_TRACK;
+ ol_tx_send_nonstd(pdev, tx_desc, tx_mgmt_frm,
htt_pkt_type_mgmt);
return 0; /* accepted the tx mgmt frame */
@@ -1339,8 +1342,8 @@
htt_h2t_sync_msg(pdev->htt_pdev, sync_cnt);
}
-cdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu, uint16_t peer_id)
+qdf_nbuf_t ol_tx_reinject(struct ol_txrx_vdev_t *vdev,
+ qdf_nbuf_t msdu, uint16_t peer_id)
{
struct ol_tx_desc_t *tx_desc;
struct ol_txrx_msdu_info_t msdu_info;
diff --git a/core/dp/txrx/ol_tx.h b/core/dp/txrx/ol_tx.h
index f0c0a7f..a76b829 100644
--- a/core/dp/txrx/ol_tx.h
+++ b/core/dp/txrx/ol_tx.h
@@ -32,18 +32,18 @@
#ifndef _OL_TX__H_
#define _OL_TX__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_lock.h>
#include <ol_txrx_api.h> /* ol_txrx_vdev_handle */
#include <ol_txrx_types.h> /* ol_tx_desc_t, ol_txrx_msdu_info_t */
-cdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list);
+qdf_nbuf_t ol_tx_ll(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list);
#ifdef WLAN_FEATURE_FASTPATH
-cdf_nbuf_t ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list);
+qdf_nbuf_t ol_tx_ll_fast(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list);
#endif
-cdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list);
+qdf_nbuf_t ol_tx_ll_queue(ol_txrx_vdev_handle vdev, qdf_nbuf_t msdu_list);
#ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
#define OL_TX_LL ol_tx_ll_queue
@@ -65,14 +65,14 @@
return;
}
#endif
-cdf_nbuf_t
+qdf_nbuf_t
ol_tx_non_std_ll(ol_txrx_vdev_handle data_vdev,
- enum ol_tx_spec tx_spec, cdf_nbuf_t msdu_list);
+ enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list);
-cdf_nbuf_t
-ol_tx_reinject(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu, uint16_t peer_id);
+qdf_nbuf_t
+ol_tx_reinject(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu, uint16_t peer_id);
-void ol_txrx_mgmt_tx_complete(void *ctxt, cdf_nbuf_t netbuf, int err);
+void ol_txrx_mgmt_tx_complete(void *ctxt, qdf_nbuf_t netbuf, int err);
#if defined(FEATURE_TSO)
diff --git a/core/dp/txrx/ol_tx_desc.c b/core/dp/txrx/ol_tx_desc.c
index a0a1b18..852829e 100644
--- a/core/dp/txrx/ol_tx_desc.c
+++ b/core/dp/txrx/ol_tx_desc.c
@@ -26,7 +26,7 @@
*/
#include <qdf_net_types.h> /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_util.h> /* qdf_assert */
#include <qdf_lock.h> /* cdf_spinlock */
#ifdef QCA_COMPUTE_TX_DELAY
@@ -307,12 +307,12 @@
dump_frag_desc(char *msg, struct ol_tx_desc_t *tx_desc);
void
-dump_pkt(cdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len)
+dump_pkt(qdf_nbuf_t nbuf, qdf_dma_addr_t nbuf_paddr, int len)
{
qdf_print("%s: Pkt: VA 0x%p PA 0x%llx len %d\n", __func__,
- cdf_nbuf_data(nbuf), nbuf_paddr, len);
+ qdf_nbuf_data(nbuf), nbuf_paddr, len);
print_hex_dump(KERN_DEBUG, "Pkt: ", DUMP_PREFIX_ADDRESS, 16, 4,
- cdf_nbuf_data(nbuf), len, true);
+ qdf_nbuf_data(nbuf), len, true);
}
const uint32_t htt_to_ce_pkt_type[] = {
@@ -326,7 +326,7 @@
struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t netbuf,
+ qdf_nbuf_t netbuf,
struct ol_txrx_msdu_info_t *msdu_info)
{
struct ol_tx_desc_t *tx_desc;
@@ -334,8 +334,8 @@
uint32_t num_frags;
msdu_info->htt.info.vdev_id = vdev->vdev_id;
- msdu_info->htt.action.cksum_offload = cdf_nbuf_get_tx_cksum(netbuf);
- switch (cdf_nbuf_get_exemption_type(netbuf)) {
+ msdu_info->htt.action.cksum_offload = qdf_nbuf_get_tx_cksum(netbuf);
+ switch (qdf_nbuf_get_exemption_type(netbuf)) {
case QDF_NBUF_EXEMPT_NO_EXEMPTION:
case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
/* We want to encrypt this frame */
@@ -379,10 +379,10 @@
* Skip the prefix fragment (HTT tx descriptor) that was added
* during the call to htt_tx_desc_init above.
*/
- num_frags = cdf_nbuf_get_num_frags(netbuf);
+ num_frags = qdf_nbuf_get_num_frags(netbuf);
/* num_frags are expected to be 2 max */
- num_frags = (num_frags > NBUF_CB_TX_MAX_EXTRA_FRAGS)
- ? NBUF_CB_TX_MAX_EXTRA_FRAGS
+ num_frags = (num_frags > QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS)
+ ? QDF_NBUF_CB_TX_MAX_EXTRA_FRAGS
: num_frags;
#if defined(HELIUMPLUS_PADDR64)
/*
@@ -408,10 +408,10 @@
qdf_dma_addr_t frag_paddr;
#ifdef HELIUMPLUS_DEBUG
void *frag_vaddr;
- frag_vaddr = cdf_nbuf_get_frag_vaddr(netbuf, i);
+ frag_vaddr = qdf_nbuf_get_frag_vaddr(netbuf, i);
#endif
- frag_len = cdf_nbuf_get_frag_len(netbuf, i);
- frag_paddr = cdf_nbuf_get_frag_paddr(netbuf, i);
+ frag_len = qdf_nbuf_get_frag_len(netbuf, i);
+ frag_paddr = qdf_nbuf_get_frag_paddr(netbuf, i);
#if defined(HELIUMPLUS_PADDR64)
htt_tx_desc_frag(pdev->htt_pdev, tx_desc->htt_frag_desc, i - 1,
frag_paddr, frag_len);
@@ -438,25 +438,25 @@
ol_tx_desc_list *tx_descs, int had_error)
{
struct ol_tx_desc_t *tx_desc, *tmp;
- cdf_nbuf_t msdus = NULL;
+ qdf_nbuf_t msdus = NULL;
TAILQ_FOREACH_SAFE(tx_desc, tx_descs, tx_desc_list_elem, tmp) {
- cdf_nbuf_t msdu = tx_desc->netbuf;
+ qdf_nbuf_t msdu = tx_desc->netbuf;
qdf_atomic_init(&tx_desc->ref_cnt); /* clear the ref cnt */
#ifdef QCA_SUPPORT_SW_TXRX_ENCAP
/* restore original hdr offset */
OL_TX_RESTORE_HDR(tx_desc, msdu);
#endif
- cdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, msdu, QDF_DMA_TO_DEVICE);
/* free the tx desc */
ol_tx_desc_free(pdev, tx_desc);
/* link the netbuf into a list to free as a batch */
- cdf_nbuf_set_next(msdu, msdus);
+ qdf_nbuf_set_next(msdu, msdus);
msdus = msdu;
}
/* free the netbufs as a batch */
- cdf_nbuf_tx_free(msdus, had_error);
+ qdf_nbuf_tx_free(msdus, had_error);
}
void ol_tx_desc_frame_free_nonstd(struct ol_txrx_pdev_t *pdev,
@@ -472,11 +472,11 @@
OL_TX_RESTORE_HDR(tx_desc, (tx_desc->netbuf));
#endif
trace_str = (had_error) ? "OT:C:F:" : "OT:C:S:";
- cdf_nbuf_trace_update(tx_desc->netbuf, trace_str);
+ qdf_nbuf_trace_update(tx_desc->netbuf, trace_str);
if (tx_desc->pkt_type == ol_tx_frm_no_free) {
/* free the tx desc but don't unmap or free the frame */
if (pdev->tx_data_callback.func) {
- cdf_nbuf_set_next(tx_desc->netbuf, NULL);
+ qdf_nbuf_set_next(tx_desc->netbuf, NULL);
pdev->tx_data_callback.func(pdev->tx_data_callback.ctxt,
tx_desc->netbuf, had_error);
ol_tx_desc_free(pdev, tx_desc);
@@ -484,7 +484,7 @@
}
/* let the code below unmap and free the frame */
}
- cdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE);
+ qdf_nbuf_unmap(pdev->osdev, tx_desc->netbuf, QDF_DMA_TO_DEVICE);
/* check the frame type to see what kind of special steps are needed */
if ((tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE) &&
(tx_desc->pkt_type != 0xff)) {
@@ -524,11 +524,11 @@
ota_ack_cb(ctxt, tx_desc->netbuf, had_error);
}
/* free the netbuf */
- cdf_nbuf_free(tx_desc->netbuf);
+ qdf_nbuf_free(tx_desc->netbuf);
} else {
/* single regular frame */
- cdf_nbuf_set_next(tx_desc->netbuf, NULL);
- cdf_nbuf_tx_free(tx_desc->netbuf, had_error);
+ qdf_nbuf_set_next(tx_desc->netbuf, NULL);
+ qdf_nbuf_tx_free(tx_desc->netbuf, had_error);
}
/* free the tx desc */
ol_tx_desc_free(pdev, tx_desc);
diff --git a/core/dp/txrx/ol_tx_desc.h b/core/dp/txrx/ol_tx_desc.h
index fa154f8..4563251 100644
--- a/core/dp/txrx/ol_tx_desc.h
+++ b/core/dp/txrx/ol_tx_desc.h
@@ -33,7 +33,7 @@
#define _OL_TX_DESC__H_
#include <cds_queue.h> /* TAILQ_HEAD */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_types.h> /* ol_tx_desc_t */
#include <ol_txrx_internal.h> /*TXRX_ASSERT2 */
@@ -63,7 +63,7 @@
*/
struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t netbuf,
+ qdf_nbuf_t netbuf,
struct ol_txrx_msdu_info_t *msdu_info);
/**
diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c
index 99f3584..5c25a40 100644
--- a/core/dp/txrx/ol_tx_queue.c
+++ b/core/dp/txrx/ol_tx_queue.c
@@ -25,7 +25,7 @@
* to the Linux Foundation.
*/
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <qdf_atomic.h> /* qdf_atomic_read, etc. */
#include <ol_cfg.h> /* ol_cfg_addba_retry */
#include <htt.h> /* HTT_TX_EXT_TID_MGMT */
@@ -91,14 +91,14 @@
qdf_timer_stop(&vdev->ll_pause.timer);
vdev->ll_pause.is_q_timer_on = false;
while (vdev->ll_pause.txq.head) {
- cdf_nbuf_t next =
- cdf_nbuf_next(vdev->ll_pause.txq.head);
- cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL);
- cdf_nbuf_unmap(vdev->pdev->osdev,
+ qdf_nbuf_t next =
+ qdf_nbuf_next(vdev->ll_pause.txq.head);
+ qdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL);
+ qdf_nbuf_unmap(vdev->pdev->osdev,
vdev->ll_pause.txq.head,
QDF_DMA_TO_DEVICE);
- cdf_nbuf_tx_free(vdev->ll_pause.txq.head,
- NBUF_PKT_ERROR);
+ qdf_nbuf_tx_free(vdev->ll_pause.txq.head,
+ QDF_NBUF_PKT_ERROR);
vdev->ll_pause.txq.head = next;
}
vdev->ll_pause.txq.tail = NULL;
diff --git a/core/dp/txrx/ol_tx_queue.h b/core/dp/txrx/ol_tx_queue.h
index 5da4b9f..ce847b7 100644
--- a/core/dp/txrx/ol_tx_queue.h
+++ b/core/dp/txrx/ol_tx_queue.h
@@ -32,7 +32,7 @@
#ifndef _OL_TX_QUEUE__H_
#define _OL_TX_QUEUE__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_types.h> /* ol_txrx_vdev_t, etc. */
#include <qdf_types.h> /* bool */
diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c
index ae2d77a..785938b 100644
--- a/core/dp/txrx/ol_tx_send.c
+++ b/core/dp/txrx/ol_tx_send.c
@@ -28,7 +28,7 @@
#include <qdf_atomic.h> /* qdf_atomic_inc, etc. */
#include <qdf_lock.h> /* cdf_os_spinlock */
#include <qdf_time.h> /* qdf_system_ticks, etc. */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <qdf_net_types.h> /* QDF_NBUF_TX_EXT_TID_INVALID */
#include <cds_queue.h> /* TAILQ */
@@ -133,15 +133,15 @@
static inline uint16_t
ol_tx_send_base(struct ol_txrx_pdev_t *pdev,
- struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu)
+ struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu)
{
int msdu_credit_consumed;
- TX_CREDIT_DEBUG_PRINT("TX %d bytes\n", cdf_nbuf_len(msdu));
+ TX_CREDIT_DEBUG_PRINT("TX %d bytes\n", qdf_nbuf_len(msdu));
TX_CREDIT_DEBUG_PRINT(" <HTT> Decrease credit %d - 1 = %d, len:%d.\n",
qdf_atomic_read(&pdev->target_tx_credit),
qdf_atomic_read(&pdev->target_tx_credit) - 1,
- cdf_nbuf_len(msdu));
+ qdf_nbuf_len(msdu));
msdu_credit_consumed = htt_tx_msdu_credit(msdu);
OL_TX_TARGET_CREDIT_DECR_INT(pdev, msdu_credit_consumed);
@@ -174,7 +174,7 @@
void
ol_tx_send(struct ol_txrx_pdev_t *pdev,
- struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu)
+ struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu)
{
int msdu_credit_consumed;
uint16_t id;
@@ -182,10 +182,10 @@
msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu);
id = ol_tx_desc_id(pdev, tx_desc);
- NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_TXRX);
DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_TXRX_PACKET_PTR_RECORD,
- (uint8_t *)(cdf_nbuf_data(msdu)),
- sizeof(cdf_nbuf_data(msdu))));
+ (uint8_t *)(qdf_nbuf_data(msdu)),
+ sizeof(qdf_nbuf_data(msdu))));
failed = htt_tx_send_std(pdev->htt_pdev, msdu, id);
if (qdf_unlikely(failed)) {
OL_TX_TARGET_CREDIT_INCR_INT(pdev, msdu_credit_consumed);
@@ -195,18 +195,18 @@
void
ol_tx_send_batch(struct ol_txrx_pdev_t *pdev,
- cdf_nbuf_t head_msdu, int num_msdus)
+ qdf_nbuf_t head_msdu, int num_msdus)
{
- cdf_nbuf_t rejected;
+ qdf_nbuf_t rejected;
OL_TX_CREDIT_RECLAIM(pdev);
rejected = htt_tx_send_batch(pdev->htt_pdev, head_msdu, num_msdus);
while (qdf_unlikely(rejected)) {
struct ol_tx_desc_t *tx_desc;
uint16_t *msdu_id_storage;
- cdf_nbuf_t next;
+ qdf_nbuf_t next;
- next = cdf_nbuf_next(rejected);
+ next = qdf_nbuf_next(rejected);
msdu_id_storage = ol_tx_msdu_id_storage(rejected);
tx_desc = ol_tx_desc_find(pdev, *msdu_id_storage);
@@ -220,7 +220,7 @@
void
ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, enum htt_pkt_type pkt_type)
+ qdf_nbuf_t msdu, enum htt_pkt_type pkt_type)
{
int msdu_credit_consumed;
uint16_t id;
@@ -228,7 +228,7 @@
msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu);
id = ol_tx_desc_id(pdev, tx_desc);
- NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(msdu, QDF_NBUF_TX_PKT_TXRX);
failed = htt_tx_send_nonstd(pdev->htt_pdev, msdu, id, pkt_type);
if (failed) {
TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
@@ -240,7 +240,7 @@
static inline void
ol_tx_download_done_base(struct ol_txrx_pdev_t *pdev,
- A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id)
+ A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id)
{
struct ol_tx_desc_t *tx_desc;
@@ -283,7 +283,7 @@
void
ol_tx_download_done_ll(void *pdev,
- A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id)
+ A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id)
{
ol_tx_download_done_base((struct ol_txrx_pdev_t *)pdev, status, msdu,
msdu_id);
@@ -292,7 +292,7 @@
void
ol_tx_download_done_hl_retain(void *txrx_pdev,
A_STATUS status,
- cdf_nbuf_t msdu, uint16_t msdu_id)
+ qdf_nbuf_t msdu, uint16_t msdu_id)
{
struct ol_txrx_pdev_t *pdev = txrx_pdev;
ol_tx_download_done_base(pdev, status, msdu, msdu_id);
@@ -300,7 +300,7 @@
void
ol_tx_download_done_hl_free(void *txrx_pdev,
- A_STATUS status, cdf_nbuf_t msdu, uint16_t msdu_id)
+ A_STATUS status, qdf_nbuf_t msdu, uint16_t msdu_id)
{
struct ol_txrx_pdev_t *pdev = txrx_pdev;
struct ol_tx_desc_t *tx_desc;
@@ -363,8 +363,8 @@
qdf_atomic_init(&(_tx_desc)->ref_cnt); \
/* restore orginal hdr offset */ \
OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \
- cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
- cdf_nbuf_free((_netbuf)); \
+ qdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
+ qdf_nbuf_free((_netbuf)); \
((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \
(_lcl_freelist); \
if (qdf_unlikely(!lcl_freelist)) { \
@@ -379,8 +379,8 @@
do { \
/* restore orginal hdr offset */ \
OL_TX_RESTORE_HDR((_tx_desc), (_netbuf)); \
- cdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
- cdf_nbuf_free((_netbuf)); \
+ qdf_nbuf_unmap((_pdev)->osdev, (_netbuf), QDF_DMA_TO_DEVICE); \
+ qdf_nbuf_free((_netbuf)); \
((union ol_tx_desc_list_elem_t *)(_tx_desc))->next = \
(_lcl_freelist); \
if (qdf_unlikely(!lcl_freelist)) { \
@@ -488,7 +488,7 @@
char *trace_str;
uint32_t byte_cnt = 0;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
union ol_tx_desc_list_elem_t *lcl_freelist = NULL;
union ol_tx_desc_list_elem_t *tx_desc_last = NULL;
@@ -505,9 +505,9 @@
netbuf = tx_desc->netbuf;
qdf_runtime_pm_put();
- cdf_nbuf_trace_update(netbuf, trace_str);
+ qdf_nbuf_trace_update(netbuf, trace_str);
/* Per SDU update of byte count */
- byte_cnt += cdf_nbuf_len(netbuf);
+ byte_cnt += qdf_nbuf_len(netbuf);
if (OL_TX_DESC_NO_REFS(tx_desc)) {
ol_tx_statistics(
pdev->ctrl_pdev,
@@ -518,7 +518,7 @@
ol_tx_msdu_complete(pdev, tx_desc, tx_descs, netbuf,
lcl_freelist, tx_desc_last, status);
}
- NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_FREE);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(netbuf, QDF_NBUF_TX_PKT_FREE);
#ifdef QCA_SUPPORT_TXDESC_SANITY_CHECKS
tx_desc->pkt_type = 0xff;
#ifdef QCA_COMPUTE_TX_DELAY
@@ -561,15 +561,15 @@
enum htt_tx_status status, uint16_t tx_desc_id)
{
struct ol_tx_desc_t *tx_desc;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
tx_desc = ol_tx_desc_find(pdev, tx_desc_id);
tx_desc->status = status;
netbuf = tx_desc->netbuf;
- NBUF_UPDATE_TX_PKT_COUNT(netbuf, NBUF_TX_PKT_FREE);
+ QDF_NBUF_UPDATE_TX_PKT_COUNT(netbuf, QDF_NBUF_TX_PKT_FREE);
/* Do one shot statistics */
- TXRX_STATS_UPDATE_TX_STATS(pdev, status, 1, cdf_nbuf_len(netbuf));
+ TXRX_STATS_UPDATE_TX_STATS(pdev, status, 1, qdf_nbuf_len(netbuf));
if (OL_TX_DESC_NO_REFS(tx_desc)) {
ol_tx_desc_frame_free_nonstd(pdev, tx_desc,
@@ -599,7 +599,7 @@
struct ol_tx_desc_t *tx_desc;
union ol_tx_desc_list_elem_t *lcl_freelist = NULL;
union ol_tx_desc_list_elem_t *tx_desc_last = NULL;
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
ol_tx_desc_list tx_descs;
TAILQ_INIT(&tx_descs);
@@ -760,10 +760,10 @@
#ifdef QCA_COMPUTE_TX_DELAY_PER_TID
static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev,
- cdf_nbuf_t tx_nbuf)
+ qdf_nbuf_t tx_nbuf)
{
uint8_t *hdr_ptr;
- void *datap = cdf_nbuf_data(tx_nbuf);
+ void *datap = qdf_nbuf_data(tx_nbuf);
if (pdev->frame_format == wlan_frm_fmt_raw) {
/* adjust hdr_ptr to RA */
@@ -787,7 +787,7 @@
static uint8_t
ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev,
- cdf_nbuf_t msdu, struct ol_tx_desc_t *tx_desc)
+ qdf_nbuf_t msdu, struct ol_tx_desc_t *tx_desc)
{
uint16_t ethertype;
uint8_t *dest_addr, *l3_hdr;
@@ -810,14 +810,14 @@
if (pdev->frame_format == wlan_frm_fmt_802_3) {
struct ethernet_hdr_t *enet_hdr;
- enet_hdr = (struct ethernet_hdr_t *)cdf_nbuf_data(msdu);
+ enet_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu);
l2_hdr_size = sizeof(struct ethernet_hdr_t);
ethertype =
(enet_hdr->ethertype[0] << 8) | enet_hdr->ethertype[1];
if (!IS_ETHERTYPE(ethertype)) {
struct llc_snap_hdr_t *llc_hdr;
llc_hdr = (struct llc_snap_hdr_t *)
- (cdf_nbuf_data(msdu) + l2_hdr_size);
+ (qdf_nbuf_data(msdu) + l2_hdr_size);
l2_hdr_size += sizeof(struct llc_snap_hdr_t);
ethertype =
(llc_hdr->ethertype[0] << 8) | llc_hdr->
@@ -826,13 +826,13 @@
} else {
struct llc_snap_hdr_t *llc_hdr;
l2_hdr_size = sizeof(struct ieee80211_frame);
- llc_hdr = (struct llc_snap_hdr_t *)(cdf_nbuf_data(msdu)
+ llc_hdr = (struct llc_snap_hdr_t *)(qdf_nbuf_data(msdu)
+ l2_hdr_size);
l2_hdr_size += sizeof(struct llc_snap_hdr_t);
ethertype =
(llc_hdr->ethertype[0] << 8) | llc_hdr->ethertype[1];
}
- l3_hdr = cdf_nbuf_data(msdu) + l2_hdr_size;
+ l3_hdr = qdf_nbuf_data(msdu) + l2_hdr_size;
if (ETHERTYPE_IPV4 == ethertype) {
return (((struct ipv4_hdr_t *)l3_hdr)->tos >> 5) & 0x7;
} else if (ETHERTYPE_IPV6 == ethertype) {
@@ -850,8 +850,8 @@
struct ol_tx_desc_t *tx_desc = ol_tx_desc_find(pdev, msdu_id);
uint8_t tid;
- cdf_nbuf_t msdu = tx_desc->netbuf;
- tid = cdf_nbuf_get_tid(msdu);
+ qdf_nbuf_t msdu = tx_desc->netbuf;
+ tid = qdf_nbuf_get_tid(msdu);
if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc);
if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
diff --git a/core/dp/txrx/ol_tx_send.h b/core/dp/txrx/ol_tx_send.h
index db48812..2260da9 100644
--- a/core/dp/txrx/ol_tx_send.h
+++ b/core/dp/txrx/ol_tx_send.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -32,7 +32,7 @@
#ifndef _OL_TX_SEND__H_
#define _OL_TX_SEND__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_types.h> /* ol_tx_send_t */
/**
@@ -52,7 +52,7 @@
*/
void
ol_tx_send(struct ol_txrx_pdev_t *pdev,
- struct ol_tx_desc_t *tx_desc, cdf_nbuf_t msdu);
+ struct ol_tx_desc_t *tx_desc, qdf_nbuf_t msdu);
/**
* @brief Send a tx batch download to the target.
@@ -67,7 +67,7 @@
int
ol_tx_send_batch(struct ol_txrx_pdev_t *pdev,
- cdf_nbuf_t msdu_list, int num_msdus);
+ qdf_nbuf_t msdu_list, int num_msdus);
/**
* @brief Send a tx frame with a non-std header or payload type to the target.
@@ -82,5 +82,5 @@
void
ol_tx_send_nonstd(struct ol_txrx_pdev_t *pdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, enum htt_pkt_type pkt_type);
+ qdf_nbuf_t msdu, enum htt_pkt_type pkt_type);
#endif /* _OL_TX_SEND__H_ */
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 208548f..7a0629b 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -30,7 +30,7 @@
#include <osdep.h> /* uint32_t, etc. */
#include <qdf_mem.h> /* qdf_mem_malloc,free */
#include <qdf_types.h> /* qdf_device_t, qdf_print */
-#include <qdf_lock.h> /* cdf_spinlock */
+#include <qdf_lock.h> /* qdf_spinlock */
#include <qdf_atomic.h> /* qdf_atomic_read */
/* Required for WLAN_FEATURE_FASTPATH */
@@ -1190,11 +1190,11 @@
qdf_timer_free(&vdev->ll_pause.timer);
vdev->ll_pause.is_q_timer_on = false;
while (vdev->ll_pause.txq.head) {
- cdf_nbuf_t next = cdf_nbuf_next(vdev->ll_pause.txq.head);
- cdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL);
- cdf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head,
+ qdf_nbuf_t next = qdf_nbuf_next(vdev->ll_pause.txq.head);
+ qdf_nbuf_set_next(vdev->ll_pause.txq.head, NULL);
+ qdf_nbuf_unmap(pdev->osdev, vdev->ll_pause.txq.head,
QDF_DMA_TO_DEVICE);
- cdf_nbuf_tx_free(vdev->ll_pause.txq.head, NBUF_PKT_ERROR);
+ qdf_nbuf_tx_free(vdev->ll_pause.txq.head, QDF_NBUF_PKT_ERROR);
vdev->ll_pause.txq.head = next;
}
qdf_spin_unlock_bh(&vdev->ll_pause.mutex);
@@ -1287,12 +1287,12 @@
list_del(&cache_buf->list);
qdf_spin_unlock_bh(&peer->bufq_lock);
if (drop) {
- cdf_nbuf_free(cache_buf->buf);
+ qdf_nbuf_free(cache_buf->buf);
} else {
/* Flush the cached frames to HDD */
ret = data_rx(cds_ctx, cache_buf->buf, peer->local_id);
if (ret != QDF_STATUS_SUCCESS)
- cdf_nbuf_free(cache_buf->buf);
+ qdf_nbuf_free(cache_buf->buf);
}
qdf_mem_free(cache_buf);
qdf_spin_lock_bh(&peer->bufq_lock);
@@ -2939,7 +2939,7 @@
ol_tx_dump_flow_pool_info();
break;
case WLAN_TXRX_DESC_STATS:
- cdf_nbuf_tx_desc_count_display();
+ qdf_nbuf_tx_desc_count_display();
break;
default:
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
@@ -2967,7 +2967,7 @@
ol_tx_clear_flow_pool_stats();
break;
case WLAN_TXRX_DESC_STATS:
- cdf_nbuf_tx_desc_count_clear();
+ qdf_nbuf_tx_desc_count_clear();
break;
default:
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
@@ -2984,10 +2984,10 @@
* Return: None
*/
static void ol_rx_data_cb(struct ol_txrx_peer_t *peer,
- cdf_nbuf_t buf_list)
+ qdf_nbuf_t buf_list)
{
void *cds_ctx = cds_get_global_context();
- cdf_nbuf_t buf, next_buf;
+ qdf_nbuf_t buf, next_buf;
QDF_STATUS ret;
ol_rx_callback_fp data_rx = NULL;
@@ -3012,12 +3012,12 @@
buf = buf_list;
while (buf) {
- next_buf = cdf_nbuf_queue_next(buf);
- cdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */
+ next_buf = qdf_nbuf_queue_next(buf);
+ qdf_nbuf_set_next(buf, NULL); /* Add NULL terminator */
ret = data_rx(cds_ctx, buf, peer->local_id);
if (ret != QDF_STATUS_SUCCESS) {
TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Frame Rx to HDD failed");
- cdf_nbuf_free(buf);
+ qdf_nbuf_free(buf);
}
buf = next_buf;
}
@@ -3027,8 +3027,8 @@
TXRX_PRINT(TXRX_PRINT_LEVEL_WARN, "%s:Dropping frames", __func__);
buf = buf_list;
while (buf) {
- next_buf = cdf_nbuf_queue_next(buf);
- cdf_nbuf_free(buf);
+ next_buf = qdf_nbuf_queue_next(buf);
+ qdf_nbuf_free(buf);
buf = next_buf;
}
}
@@ -3041,12 +3041,12 @@
* Return: None
*/
void ol_rx_data_process(struct ol_txrx_peer_t *peer,
- cdf_nbuf_t rx_buf_list)
+ qdf_nbuf_t rx_buf_list)
{
/* Firmware data path active response will use shim RX thread
* T2H MSG running on SIRQ context,
* IPA kernel module API should not be called on SIRQ CTXT */
- cdf_nbuf_t buf, next_buf;
+ qdf_nbuf_t buf, next_buf;
ol_rx_callback_fp data_rx = NULL;
ol_txrx_pdev_handle pdev = cds_get_context(QDF_MODULE_ID_TXRX);
@@ -3069,15 +3069,15 @@
struct ol_rx_cached_buf *cache_buf;
buf = rx_buf_list;
while (buf) {
- next_buf = cdf_nbuf_queue_next(buf);
+ next_buf = qdf_nbuf_queue_next(buf);
cache_buf = qdf_mem_malloc(sizeof(*cache_buf));
if (!cache_buf) {
TXRX_PRINT(TXRX_PRINT_LEVEL_ERR,
"Failed to allocate buf to cache the rx frames");
- cdf_nbuf_free(buf);
+ qdf_nbuf_free(buf);
} else {
/* Add NULL terminator */
- cdf_nbuf_set_next(buf, NULL);
+ qdf_nbuf_set_next(buf, NULL);
cache_buf->buf = buf;
qdf_spin_lock_bh(&peer->bufq_lock);
list_add_tail(&cache_buf->list,
@@ -3126,8 +3126,8 @@
TXRX_PRINT(TXRX_PRINT_LEVEL_ERR, "Dropping rx packets");
buf = rx_buf_list;
while (buf) {
- next_buf = cdf_nbuf_queue_next(buf);
- cdf_nbuf_free(buf);
+ next_buf = qdf_nbuf_queue_next(buf);
+ qdf_nbuf_free(buf);
buf = next_buf;
}
}
@@ -3137,7 +3137,7 @@
* @rxcb: rx callback
* @sta_desc: sta descriptor
*
- * Return: CDF Status
+ * Return: QDF Status
*/
QDF_STATUS ol_txrx_register_peer(ol_rx_callback_fp rxcb,
struct ol_txrx_desc_type *sta_desc)
@@ -3187,7 +3187,7 @@
* ol_txrx_clear_peer() - clear peer
* @sta_id: sta id
*
- * Return: CDF Status
+ * Return: QDF Status
*/
QDF_STATUS ol_txrx_clear_peer(uint8_t sta_id)
{
@@ -3320,7 +3320,7 @@
* ol_txrx_register_pause_cb() - register pause callback
* @pause_cb: pause callback
*
- * Return: CDF status
+ * Return: QDF status
*/
QDF_STATUS ol_txrx_register_pause_cb(ol_tx_pause_callback_fp pause_cb)
{
diff --git a/core/dp/txrx/ol_txrx.h b/core/dp/txrx/ol_txrx.h
index 760850f..2247238 100644
--- a/core/dp/txrx/ol_txrx.h
+++ b/core/dp/txrx/ol_txrx.h
@@ -28,7 +28,7 @@
#ifndef _OL_TXRX__H_
#define _OL_TXRX__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <ol_txrx_types.h> /* ol_txrx_vdev_t, etc. */
#include <ol_ctrl_api.h> /* ol_pdev_handle */
#include "cds_sched.h"
diff --git a/core/dp/txrx/ol_txrx_encap.c b/core/dp/txrx/ol_txrx_encap.c
index 8deddeb..03b1ddd 100644
--- a/core/dp/txrx/ol_txrx_encap.c
+++ b/core/dp/txrx/ol_txrx_encap.c
@@ -35,7 +35,7 @@
*/
#ifdef QCA_SUPPORT_SW_TXRX_ENCAP
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <cds_ieee80211_common.h> /* ieee80211_frame */
#include <net.h> /* struct llc, struct ether_header, etc. */
#include <ol_txrx_internal.h> /* TXRX_ASSERT1 */
@@ -44,14 +44,14 @@
#define OL_TX_COPY_NATIVE_WIFI_HEADER(wh, msdu, hdsize, localbuf) \
do { \
- wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu); \
+ wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu); \
if ((wh->i_fc[1] & \
IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) { \
hdsize = sizeof(struct ieee80211_frame_addr4); \
} else { \
hdsize = sizeof(struct ieee80211_frame); \
} \
- if (cdf_nbuf_len(msdu) < hdsize) { \
+ if (qdf_nbuf_len(msdu) < hdsize) { \
return A_ERROR; \
} \
qdf_mem_copy(localbuf, wh, hdsize); \
@@ -59,18 +59,18 @@
} while (0)
static inline A_STATUS
-ol_tx_copy_native_wifi_header(cdf_nbuf_t msdu,
+ol_tx_copy_native_wifi_header(qdf_nbuf_t msdu,
uint8_t *hdsize, uint8_t *localbuf)
{
struct ieee80211_frame *wh =
- (struct ieee80211_frame *)cdf_nbuf_data(msdu);
+ (struct ieee80211_frame *)qdf_nbuf_data(msdu);
if ((wh->i_fc[1] &
IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) {
*hdsize = sizeof(struct ieee80211_frame_addr4);
} else {
*hdsize = sizeof(struct ieee80211_frame);
}
- if (cdf_nbuf_len(msdu) < *hdsize)
+ if (qdf_nbuf_len(msdu) < *hdsize)
return A_ERROR;
qdf_mem_copy(localbuf, wh, *hdsize);
@@ -80,7 +80,7 @@
static inline A_STATUS
ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
struct ol_txrx_msdu_info_t *tx_msdu_info)
{
uint8_t localbuf[sizeof(struct ieee80211_qosframe_htc_addr4)];
@@ -127,7 +127,7 @@
htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc,
new_hdsize), localbuf,
new_hdsize);
- cdf_nbuf_pull_head(msdu, hdsize);
+ qdf_nbuf_pull_head(msdu, hdsize);
tx_msdu_info->htt.info.l3_hdr_offset = new_hdsize;
tx_desc->orig_l2_hdr_bytes = hdsize;
}
@@ -148,7 +148,7 @@
htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc,
hdsize);
qdf_mem_copy((void *)wh, localbuf, hdsize);
- cdf_nbuf_pull_head(msdu, hdsize);
+ qdf_nbuf_pull_head(msdu, hdsize);
tx_msdu_info->htt.info.l3_hdr_offset = hdsize;
tx_desc->orig_l2_hdr_bytes = hdsize;
}
@@ -160,7 +160,7 @@
static inline A_STATUS
ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *tx_msdu_info)
+ qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *tx_msdu_info)
{
uint8_t localbuf[sizeof(struct ieee80211_qosframe_htc_addr4)
+ sizeof(struct llc_snap_hdr_t)];
@@ -183,7 +183,7 @@
*/
peer = tx_msdu_info->peer;
- eth_hdr = (struct ethernet_hdr_t *)cdf_nbuf_data(msdu);
+ eth_hdr = (struct ethernet_hdr_t *)qdf_nbuf_data(msdu);
hdsize = sizeof(struct ethernet_hdr_t);
wh = (struct ieee80211_frame *)localbuf;
wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA;
@@ -277,7 +277,7 @@
htt_tx_desc_mpdu_header(tx_desc->htt_tx_desc,
new_l2_hdsize), localbuf,
new_hdsize);
- cdf_nbuf_pull_head(msdu, hdsize);
+ qdf_nbuf_pull_head(msdu, hdsize);
tx_msdu_info->htt.info.l3_hdr_offset = new_l2_hdsize;
tx_desc->orig_l2_hdr_bytes = hdsize;
return A_OK;
@@ -286,7 +286,7 @@
A_STATUS
ol_tx_encap(struct ol_txrx_vdev_t *vdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
+ qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
@@ -303,7 +303,7 @@
static inline void
ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
struct ol_rx_decap_info_t *info,
struct ethernet_hdr_t *ethr_hdr)
{
@@ -322,7 +322,7 @@
else
hdsize = sizeof(struct ieee80211_frame);
- wh = (struct ieee80211_frame_addr4 *)cdf_nbuf_push_head(msdu, hdsize);
+ wh = (struct ieee80211_frame_addr4 *)qdf_nbuf_push_head(msdu, hdsize);
TXRX_ASSERT2(wh != NULL);
TXRX_ASSERT2(hdsize <= info->hdr_len);
qdf_mem_copy((uint8_t *) wh, info->hdr, hdsize);
@@ -365,7 +365,7 @@
static inline void
ol_rx_decap_to_8023(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu,
+ qdf_nbuf_t msdu,
struct ol_rx_decap_info_t *info,
struct ethernet_hdr_t *ethr_hdr)
{
@@ -381,7 +381,7 @@
* if ethr_hdr is null, rx frame is 802.11 format(HW ft disabled)
* if ethr_hdr is not null, rx frame is "subfrm of amsdu".
*/
- buf = (uint8_t *) cdf_nbuf_data(msdu);
+ buf = (uint8_t *) qdf_nbuf_data(msdu);
llc_hdr = (struct llc_snap_hdr_t *)buf;
ether_type = (llc_hdr->ethertype[0] << 8) | llc_hdr->ethertype[1];
/* do llc remove if needed */
@@ -401,9 +401,9 @@
}
}
if (l2_hdr_space > ETHERNET_HDR_LEN)
- buf = cdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN);
+ buf = qdf_nbuf_pull_head(msdu, l2_hdr_space - ETHERNET_HDR_LEN);
else if (l2_hdr_space < ETHERNET_HDR_LEN)
- buf = cdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space);
+ buf = qdf_nbuf_push_head(msdu, ETHERNET_HDR_LEN - l2_hdr_space);
/* normal msdu(non-subfrm of A-MSDU) if ethr_hdr is null */
if (ethr_hdr == NULL) {
@@ -444,10 +444,10 @@
ethr_hdr->ethertype[1] = (ether_type) & 0xff;
} else {
uint32_t pktlen =
- cdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype);
+ qdf_nbuf_len(msdu) - sizeof(ethr_hdr->ethertype);
TXRX_ASSERT2(pktlen <= ETHERNET_MTU);
ether_type = (uint16_t) pktlen;
- ether_type = cdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t);
+ ether_type = qdf_nbuf_len(msdu) - sizeof(struct ethernet_hdr_t);
ethr_hdr->ethertype[0] = (ether_type >> 8) & 0xff;
ethr_hdr->ethertype[1] = (ether_type) & 0xff;
}
@@ -456,18 +456,18 @@
static inline A_STATUS
ol_rx_decap_subfrm_amsdu(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
+ qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
uint8_t *subfrm_hdr;
uint8_t localbuf[ETHERNET_HDR_LEN];
struct ethernet_hdr_t *ether_hdr = (struct ethernet_hdr_t *)localbuf;
- subfrm_hdr = (uint8_t *) cdf_nbuf_data(msdu);
+ subfrm_hdr = (uint8_t *) qdf_nbuf_data(msdu);
if (pdev->frame_format == wlan_frm_fmt_native_wifi) {
/* decap to native wifi */
qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN);
- cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN);
+ qdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN);
ol_rx_decap_to_native_wifi(vdev, msdu, info, ether_hdr);
} else if (pdev->frame_format == wlan_frm_fmt_802_3) {
if (pdev->sw_rx_llc_proc_enable) {
@@ -475,7 +475,7 @@
* 802.11 table P-3
*/
qdf_mem_copy(ether_hdr, subfrm_hdr, ETHERNET_HDR_LEN);
- cdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN);
+ qdf_nbuf_pull_head(msdu, ETHERNET_HDR_LEN);
ol_rx_decap_to_8023(vdev, msdu, info, ether_hdr);
} else {
/* subfrm of A-MSDU is already in 802.3 format.
@@ -492,11 +492,11 @@
static inline A_STATUS
ol_rx_decap_msdu(struct ol_txrx_vdev_t *vdev,
- cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
+ qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
{
struct ol_txrx_pdev_t *pdev = vdev->pdev;
struct ieee80211_frame *wh;
- wh = (struct ieee80211_frame *)cdf_nbuf_data(msdu);
+ wh = (struct ieee80211_frame *)qdf_nbuf_data(msdu);
if (pdev->frame_format == wlan_frm_fmt_native_wifi) {
/* Decap to native wifi because according to MSFT(
@@ -509,7 +509,7 @@
TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr));
qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */
wh, info->hdr_len);
- cdf_nbuf_pull_head(msdu, info->hdr_len);
+ qdf_nbuf_pull_head(msdu, info->hdr_len);
ol_rx_decap_to_native_wifi(vdev, msdu, info, NULL);
/* 802.11 hdr^ eth_hdr^ */
}
@@ -519,7 +519,7 @@
TXRX_ASSERT2(info->hdr_len <= sizeof(info->hdr));
qdf_mem_copy(info->hdr, /* use info->hdr as temp buf. */
wh, info->hdr_len);
- cdf_nbuf_pull_head(msdu, info->hdr_len);
+ qdf_nbuf_pull_head(msdu, info->hdr_len);
/* remove llc snap hdr if it's necessary according to
* 802.11 table P-3
*/
@@ -541,7 +541,7 @@
A_STATUS
ol_rx_decap(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
+ qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
{
A_STATUS status;
uint8_t *mpdu_hdr;
@@ -559,14 +559,14 @@
* subsequent subfrm 802.11 header recovery
* in certain chip(such as Riva).
*/
- mpdu_hdr = cdf_nbuf_data(msdu);
+ mpdu_hdr = qdf_nbuf_data(msdu);
info->hdr_len =
ol_txrx_ieee80211_hdrsize(mpdu_hdr);
TXRX_ASSERT2(info->hdr_len <=
sizeof(info->hdr));
qdf_mem_copy(info->hdr, mpdu_hdr,
info->hdr_len);
- cdf_nbuf_pull_head(msdu, info->hdr_len);
+ qdf_nbuf_pull_head(msdu, info->hdr_len);
}
}
}
diff --git a/core/dp/txrx/ol_txrx_encap.h b/core/dp/txrx/ol_txrx_encap.h
index 5795b3b..2da28be 100644
--- a/core/dp/txrx/ol_txrx_encap.h
+++ b/core/dp/txrx/ol_txrx_encap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012, 2014-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -34,7 +34,7 @@
#ifdef QCA_SUPPORT_SW_TXRX_ENCAP
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* qdf_nbuf_t */
#include <cds_ieee80211_common.h> /* ieee80211_qosframe_htc_addr4 */
#include <ol_txrx_types.h> /* ol_tx_desc_t, ol_txrx_msdu_info_t */
@@ -48,7 +48,7 @@
* with or without QOS control field based on peer's QOS capabilites.
* @param vdev - handle to vdev object
* @param tx_desc - tx desc struct,some fields will be updated.
- * @param msdu - cdf_nbuf_t
+ * @param msdu - qdf_nbuf_t
* @param msdu_info - informations from tx classification.
* @return
* A_OK: encap operation sucessful
@@ -57,7 +57,7 @@
A_STATUS
ol_tx_encap(struct ol_txrx_vdev_t *vdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info);
+ qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info);
struct ol_rx_decap_info_t {
uint8_t hdr[sizeof(struct ieee80211_qosframe_htc_addr4)];
@@ -75,7 +75,7 @@
* if Target haven't done that.
* @param vdev - handle to vdev object
* @param peer - the peer object.
- * @param msdu - cdf_nbuf_t
+ * @param msdu - qdf_nbuf_t
* @param info - ol_rx_decap_info_t: context info for decap
* @return
* A_OK: decap operation sucessful
@@ -84,12 +84,12 @@
A_STATUS
ol_rx_decap(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info);
+ qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info);
static inline A_STATUS
OL_TX_ENCAP(struct ol_txrx_vdev_t *vdev,
struct ol_tx_desc_t *tx_desc,
- cdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
+ qdf_nbuf_t msdu, struct ol_txrx_msdu_info_t *msdu_info)
{
if (vdev->pdev->sw_tx_encap)
return ol_tx_encap(vdev, tx_desc, msdu, msdu_info);
@@ -99,7 +99,7 @@
static inline A_STATUS
OL_RX_DECAP(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- cdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
+ qdf_nbuf_t msdu, struct ol_rx_decap_info_t *info)
{
if (vdev->pdev->sw_rx_decap)
return ol_rx_decap(vdev, peer, msdu, info);
@@ -109,7 +109,7 @@
#define OL_TX_RESTORE_HDR(__tx_desc, __msdu) \
do { \
if (__tx_desc->orig_l2_hdr_bytes != 0) \
- cdf_nbuf_push_head(__msdu, \
+ qdf_nbuf_push_head(__msdu, \
__tx_desc->orig_l2_hdr_bytes); \
} while (0)
#else
diff --git a/core/dp/txrx/ol_txrx_flow_control.c b/core/dp/txrx/ol_txrx_flow_control.c
index 157c0d4..442115b 100644
--- a/core/dp/txrx/ol_txrx_flow_control.c
+++ b/core/dp/txrx/ol_txrx_flow_control.c
@@ -26,7 +26,7 @@
*/
/* OS abstraction libraries */
-#include <cdf_nbuf.h> /* cdf_nbuf_t, etc. */
+#include <qdf_nbuf.h> /* qdf_nbuf_t, etc. */
#include <cdf_atomic.h> /* qdf_atomic_read, etc. */
#include <qdf_util.h> /* qdf_unlikely */
diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h
index 51d6a94..52c2546 100644
--- a/core/dp/txrx/ol_txrx_internal.h
+++ b/core/dp/txrx/ol_txrx_internal.h
@@ -29,7 +29,7 @@
#define _OL_TXRX_INTERNAL__H_
#include <qdf_util.h> /* qdf_assert */
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* cdf_nbuf_t */
#include <qdf_mem.h> /* qdf_mem_set */
#include <cds_ieee80211_common.h> /* ieee80211_frame */
#include <ol_htt_rx_api.h> /* htt_rx_msdu_desc_completes_mpdu, etc. */
@@ -160,7 +160,7 @@
if (!(head)) { \
(head) = (elem); \
} else { \
- cdf_nbuf_set_next((tail), (elem)); \
+ qdf_nbuf_set_next((tail), (elem)); \
} \
(tail) = (elem); \
} while (0)
@@ -168,10 +168,10 @@
static inline void
ol_rx_mpdu_list_next(struct ol_txrx_pdev_t *pdev,
void *mpdu_list,
- cdf_nbuf_t *mpdu_tail, cdf_nbuf_t *next_mpdu)
+ qdf_nbuf_t *mpdu_tail, qdf_nbuf_t *next_mpdu)
{
htt_pdev_handle htt_pdev = pdev->htt_pdev;
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
/*
* For now, we use a simply flat list of MSDUs.
@@ -181,12 +181,12 @@
msdu = mpdu_list;
while (!htt_rx_msdu_desc_completes_mpdu
(htt_pdev, htt_rx_msdu_desc_retrieve(htt_pdev, msdu))) {
- msdu = cdf_nbuf_next(msdu);
+ msdu = qdf_nbuf_next(msdu);
TXRX_ASSERT2(msdu);
}
/* msdu now points to the last MSDU within the first MPDU */
*mpdu_tail = msdu;
- *next_mpdu = cdf_nbuf_next(msdu);
+ *next_mpdu = qdf_nbuf_next(msdu);
}
/*--- txrx stats macros ---*/
@@ -203,7 +203,7 @@
#define TXRX_STATS_MSDU_INCR(pdev, field, netbuf) \
do { \
TXRX_STATS_INCR((pdev), pub.field.pkts); \
- TXRX_STATS_ADD((pdev), pub.field.bytes, cdf_nbuf_len(netbuf)); \
+ TXRX_STATS_ADD((pdev), pub.field.bytes, qdf_nbuf_len(netbuf)); \
} while (0)
/* conditional defs based on verbosity level */
@@ -211,10 +211,10 @@
#define TXRX_STATS_MSDU_LIST_INCR(pdev, field, netbuf_list) \
do { \
- cdf_nbuf_t tmp_list = netbuf_list; \
+ qdf_nbuf_t tmp_list = netbuf_list; \
while (tmp_list) { \
TXRX_STATS_MSDU_INCR(pdev, field, tmp_list); \
- tmp_list = cdf_nbuf_next(tmp_list); \
+ tmp_list = qdf_nbuf_next(tmp_list); \
} \
} while (0)
@@ -373,7 +373,7 @@
static inline void
ol_txrx_frms_dump(const char *name,
struct ol_txrx_pdev_t *pdev,
- cdf_nbuf_t frm,
+ qdf_nbuf_t frm,
enum ol_txrx_frm_dump_options display_options, int max_len)
{
#define TXRX_FRM_DUMP_MAX_LEN 128
@@ -385,7 +385,7 @@
name);
}
while (frm) {
- p = cdf_nbuf_data(frm);
+ p = qdf_nbuf_data(frm);
if (display_options & ol_txrx_frm_dump_tcp_seq) {
int tcp_offset;
int l2_hdr_size;
@@ -475,8 +475,8 @@
if (display_options & ol_txrx_frm_dump_contents) {
int i, frag_num, len_lim;
len_lim = max_len;
- if (len_lim > cdf_nbuf_len(frm))
- len_lim = cdf_nbuf_len(frm);
+ if (len_lim > qdf_nbuf_len(frm))
+ len_lim = qdf_nbuf_len(frm);
if (len_lim > TXRX_FRM_DUMP_MAX_LEN)
len_lim = TXRX_FRM_DUMP_MAX_LEN;
@@ -489,11 +489,11 @@
while (i < len_lim) {
int frag_bytes;
frag_bytes =
- cdf_nbuf_get_frag_len(frm, frag_num);
+ qdf_nbuf_get_frag_len(frm, frag_num);
if (frag_bytes > len_lim - i)
frag_bytes = len_lim - i;
if (frag_bytes > 0) {
- p = cdf_nbuf_get_frag_vaddr(frm,
+ p = qdf_nbuf_get_frag_vaddr(frm,
frag_num);
qdf_mem_copy(&local_buf[i], p,
frag_bytes);
@@ -504,7 +504,7 @@
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
"frame %p data (%p), hex dump of bytes 0-%d of %d:\n",
- frm, p, len_lim - 1, (int)cdf_nbuf_len(frm));
+ frm, p, len_lim - 1, (int)qdf_nbuf_len(frm));
p = local_buf;
while (len_lim > 16) {
QDF_TRACE(QDF_MODULE_ID_TXRX,
@@ -532,7 +532,7 @@
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
"\n");
}
- frm = cdf_nbuf_next(frm);
+ frm = qdf_nbuf_next(frm);
}
}
#else
@@ -571,7 +571,7 @@
if (ol_cfg_frame_type(pdev->ctrl_pdev) == \
wlan_frm_fmt_native_wifi) { \
/* For windows, it is always native wifi header .*/ \
- wh = (struct ieee80211_frame *)cdf_nbuf_data(rx_msdu); \
+ wh = (struct ieee80211_frame *)qdf_nbuf_data(rx_msdu); \
} \
ol_rx_err_inv_peer_statistics(pdev->ctrl_pdev, \
wh, OL_RX_ERR_UNKNOWN_PEER); \
@@ -613,7 +613,7 @@
do { \
qdf_spin_lock_bh(&peer->vdev->pdev->peer_stat_mutex); \
peer->stats.tx_or_rx.frms.type += 1; \
- peer->stats.tx_or_rx.bytes.type += cdf_nbuf_len(msdu); \
+ peer->stats.tx_or_rx.bytes.type += qdf_nbuf_len(msdu); \
qdf_spin_unlock_bh(&peer->vdev->pdev->peer_stat_mutex); \
} while (0)
#define OL_TXRX_PEER_STATS_UPDATE(peer, tx_or_rx, msdu) \
@@ -622,10 +622,10 @@
struct ol_txrx_pdev_t *pdev = vdev->pdev; \
uint8_t *dest_addr; \
if (pdev->frame_format == wlan_frm_fmt_802_3) { \
- dest_addr = cdf_nbuf_data(msdu); \
+ dest_addr = qdf_nbuf_data(msdu); \
} else { /* 802.11 format */ \
struct ieee80211_frame *frm; \
- frm = (struct ieee80211_frame *) cdf_nbuf_data(msdu); \
+ frm = (struct ieee80211_frame *) qdf_nbuf_data(msdu); \
if (vdev->opmode == wlan_op_mode_ap) { \
dest_addr = (uint8_t *) &(frm->i_addr1[0]); \
} else { \
diff --git a/core/dp/txrx/ol_txrx_types.h b/core/dp/txrx/ol_txrx_types.h
index 90ad86b..7d6ffc4 100644
--- a/core/dp/txrx/ol_txrx_types.h
+++ b/core/dp/txrx/ol_txrx_types.h
@@ -32,7 +32,7 @@
#ifndef _OL_TXRX_TYPES__H_
#define _OL_TXRX_TYPES__H_
-#include <cdf_nbuf.h> /* cdf_nbuf_t */
+#include <qdf_nbuf.h> /* cdf_nbuf_t */
#include <qdf_mem.h>
#include <cds_queue.h> /* TAILQ */
#include <a_types.h> /* A_UINT8 */
@@ -127,7 +127,7 @@
};
struct ol_tx_desc_t {
- cdf_nbuf_t netbuf;
+ qdf_nbuf_t netbuf;
void *htt_tx_desc;
uint16_t id;
qdf_dma_addr_t htt_tx_desc_paddr;
@@ -536,7 +536,7 @@
/* rx proc function */
void (*rx_opt_proc)(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list);
+ unsigned tid, qdf_nbuf_t msdu_list);
/* tx data delivery notification callback function */
struct {
@@ -827,8 +827,8 @@
struct {
struct {
- cdf_nbuf_t head;
- cdf_nbuf_t tail;
+ qdf_nbuf_t head;
+ qdf_nbuf_t tail;
int depth;
} txq;
uint32_t paused_reason;
@@ -877,8 +877,8 @@
};
struct ol_rx_reorder_array_elem_t {
- cdf_nbuf_t head;
- cdf_nbuf_t tail;
+ qdf_nbuf_t head;
+ qdf_nbuf_t tail;
};
struct ol_rx_reorder_t {
@@ -967,7 +967,7 @@
*/
void (*rx_opt_proc)(struct ol_txrx_vdev_t *vdev,
struct ol_txrx_peer_t *peer,
- unsigned tid, cdf_nbuf_t msdu_list);
+ unsigned tid, qdf_nbuf_t msdu_list);
#ifdef QCA_ENABLE_OL_TXRX_PEER_STATS
ol_txrx_peer_stats_t stats;
diff --git a/core/dp/txrx/txrx.h b/core/dp/txrx/txrx.h
index 7d2c03c..fa24eaf 100644
--- a/core/dp/txrx/txrx.h
+++ b/core/dp/txrx/txrx.h
@@ -29,10 +29,9 @@
#define TXRX_H
#include "cds_api.h"
-#include "cdf_nbuf.h"
+#include "qdf_nbuf.h"
#include "csr_api.h"
#include "sap_api.h"
-#include "cdf_nbuf.h"
#include "ol_txrx_osif_api.h"
/* wait on peer deletion timeout value in milliseconds */
@@ -117,11 +116,11 @@
* @typedef ol_txrx_tx_fp
* @brief top-level transmit function
*/
-typedef cdf_nbuf_t
-(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, cdf_nbuf_t msdu_list);
+typedef qdf_nbuf_t
+(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, qdf_nbuf_t msdu_list);
typedef void
-(*ol_txrx_mgmt_tx_cb)(void *ctxt, cdf_nbuf_t tx_mgmt_frm, int had_error);
+(*ol_txrx_mgmt_tx_cb)(void *ctxt, qdf_nbuf_t tx_mgmt_frm, int had_error);
/* If RSSI realm is changed, send notification to Clients, SME, HDD */
typedef QDF_STATUS (*wlan_txrx_rssi_cross_thresh)(void *adapter, u8 rssi,
@@ -141,7 +140,7 @@
/* Rx callback registered with txrx */
-typedef int (*wlan_txrx_cb_type)(void *g_cdsctx, cdf_nbuf_t buf, u8 sta_id,
+typedef int (*wlan_txrx_cb_type)(void *g_cdsctx, qdf_nbuf_t buf, u8 sta_id,
struct txrx_rx_metainfo *rx_meta_info);
static inline int wlan_txrx_get_rssi(void *g_cdsctx, u8 sta_id, int8_t *rssi)
diff --git a/core/dp/txrx/wdi_event.h b/core/dp/txrx/wdi_event.h
index d1019ee..70eb795 100644
--- a/core/dp/txrx/wdi_event.h
+++ b/core/dp/txrx/wdi_event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@@ -29,7 +29,7 @@
#define _WDI_EVENT_H_
#include "athdefs.h"
-#include "cdf_nbuf.h"
+#include "qdf_nbuf.h"
#define WDI_EVENT_BASE 0x100 /* Event starting number */
enum WDI_EVENT {
@@ -45,7 +45,7 @@
};
struct wdi_event_rx_peer_invalid_msg {
- cdf_nbuf_t msdu;
+ qdf_nbuf_t msdu;
struct ieee80211_frame *wh;
uint8_t vdev_id;
};