Kaynağa Gözat

qcacld-3.0: Add QDF net types

Replace CDF net types with QDF net types API's.

Change-Id: I0599a2f0cfe7c9a9b7fe589f7619f88fd5a72518
CRs-Fixed: 981188
Anurag Chouhan 9 yıl önce
ebeveyn
işleme
c73697b4da

+ 5 - 5
core/cdf/inc/cdf_nbuf.h

@@ -34,7 +34,7 @@
 #define _CDF_NBUF_H
 #include <cdf_util.h>
 #include <qdf_types.h>
-#include <cdf_net_types.h>
+#include <qdf_net_types.h>
 #include <qdf_lock.h>
 #include <i_cdf_nbuf.h>
 #include <asm/cacheflush.h>
@@ -827,15 +827,15 @@ cdf_nbuf_append_ext_list(cdf_nbuf_t head_buf, cdf_nbuf_t ext_list,
  * cdf_nbuf_get_tx_cksum() - gets the tx checksum offload demand
  * @buf: Network buffer
  *
- * Return: cdf_nbuf_tx_cksum_t checksum offload demand for the frame
+ * Return: qdf_nbuf_tx_cksum_t checksum offload demand for the frame
  */
-static inline cdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf)
+static inline qdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf)
 {
 	return __cdf_nbuf_get_tx_cksum(buf);
 }
 
 /**
- * cdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to
+ * qdf_nbuf_set_rx_cksum() - drivers that support hw checksumming use this to
  *			     indicate checksum info to the stack.
  * @buf: Network buffer
  * @cksum: Checksum
@@ -843,7 +843,7 @@ static inline cdf_nbuf_tx_cksum_t cdf_nbuf_get_tx_cksum(cdf_nbuf_t buf)
  * Return: none
  */
 static inline void
-cdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, cdf_nbuf_rx_cksum_t *cksum)
+qdf_nbuf_set_rx_cksum(cdf_nbuf_t buf, qdf_nbuf_rx_cksum_t *cksum)
 {
 	__cdf_nbuf_set_rx_cksum(buf, cksum);
 }

+ 0 - 117
core/cdf/inc/cdf_net_types.h

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2014 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
- * DOC: cdf_net_types
- * This file defines types used in the networking stack abstraction.
- */
-
-#ifndef _CDF_NET_TYPES_H
-#define _CDF_NET_TYPES_H
-
-#include <qdf_types.h>          /* uint8_t, etc. */
-
-#define ADF_NET_MAC_ADDR_MAX_LEN 6
-#define ADF_NET_IF_NAME_SIZE    64
-#define ADF_NET_ETH_LEN         ADF_NET_MAC_ADDR_MAX_LEN
-#define ADF_NET_MAX_MCAST_ADDR  64
-
-/* Extended Traffic ID  passed to target if the TID is unknown */
-#define ADF_NBUF_TX_EXT_TID_INVALID     0x1f
-
-/**
- * cdf_nbuf_exemption_type - CDF net buf exemption types for encryption
- * @CDF_NBUF_EXEMPT_NO_EXEMPTION: No exemption
- * @CDF_NBUF_EXEMPT_ALWAYS: Exempt always
- * @CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE: Exempt on key mapping
- */
-enum cdf_nbuf_exemption_type {
-	CDF_NBUF_EXEMPT_NO_EXEMPTION = 0,
-	CDF_NBUF_EXEMPT_ALWAYS,
-	CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE
-};
-
-/**
- * typedef cdf_nbuf_tx_cksum_t - transmit checksum offload types
- * @CDF_NBUF_TX_CKSUM_NONE: No checksum offload
- * @CDF_NBUF_TX_CKSUM_IP: IP header checksum offload
- * @CDF_NBUF_TX_CKSUM_TCP_UDP: TCP/UDP checksum offload
- * @CDF_NBUF_TX_CKSUM_TCP_UDP_IP: TCP/UDP and IP header checksum offload
- */
-
-typedef enum {
-	CDF_NBUF_TX_CKSUM_NONE,
-	CDF_NBUF_TX_CKSUM_IP,
-	CDF_NBUF_TX_CKSUM_TCP_UDP,
-	CDF_NBUF_TX_CKSUM_TCP_UDP_IP,
-
-} cdf_nbuf_tx_cksum_t;
-
-/**
- * typedef cdf_nbuf_l4_rx_cksum_type_t - receive checksum API types
- * @CDF_NBUF_RX_CKSUM_TCP: Rx checksum TCP
- * @CDF_NBUF_RX_CKSUM_UDP: Rx checksum UDP
- * @CDF_NBUF_RX_CKSUM_TCPIPV6: Rx checksum TCP IPV6
- * @CDF_NBUF_RX_CKSUM_UDPIPV6: Rx checksum UDP IPV6
- * @CDF_NBUF_RX_CKSUM_TCP_NOPSEUDOHEADER: Rx checksum TCP no pseudo header
- * @CDF_NBUF_RX_CKSUM_UDP_NOPSEUDOHEADER: Rx checksum UDP no pseudo header
- * @CDF_NBUF_RX_CKSUM_TCPSUM16: Rx checksum TCP SUM16
- */
-typedef enum {
-	CDF_NBUF_RX_CKSUM_TCP = 0x0001,
-	CDF_NBUF_RX_CKSUM_UDP = 0x0002,
-	CDF_NBUF_RX_CKSUM_TCPIPV6 = 0x0010,
-	CDF_NBUF_RX_CKSUM_UDPIPV6 = 0x0020,
-	CDF_NBUF_RX_CKSUM_TCP_NOPSEUDOHEADER = 0x0100,
-	CDF_NBUF_RX_CKSUM_UDP_NOPSEUDOHEADER = 0x0200,
-	CDF_NBUF_RX_CKSUM_TCPSUM16 = 0x1000,
-} cdf_nbuf_l4_rx_cksum_type_t;
-
-/**
- * typedef cdf_nbuf_l4_rx_cksum_result_t - receive checksum status types
- * @CDF_NBUF_RX_CKSUM_NONE: Device failed to checksum
- * @CDF_NBUF_RX_CKSUM_TCP_UDP_HW: TCP/UDP cksum successful and value returned
- * @CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY: TCP/UDP cksum successful, no value
- */
-typedef enum {
-	CDF_NBUF_RX_CKSUM_NONE = 0x0000,
-	CDF_NBUF_RX_CKSUM_TCP_UDP_HW = 0x0010,
-	CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY = 0x0020,
-} cdf_nbuf_l4_rx_cksum_result_t;
-
-/**
- * typedef cdf_nbuf_rx_cksum_t - receive checksum type
- * @l4_type: L4 type
- * @l4_result: L4 result
- */
-typedef struct {
-	cdf_nbuf_l4_rx_cksum_type_t l4_type;
-	cdf_nbuf_l4_rx_cksum_result_t l4_result;
-	uint32_t val;
-} cdf_nbuf_rx_cksum_t;
-
-#endif /*_CDF_NET_TYPES_H*/

+ 10 - 10
core/cdf/src/cdf_nbuf.c

@@ -331,16 +331,16 @@ __cdf_nbuf_unmap_single(qdf_device_t osdev, cdf_nbuf_t buf, qdf_dma_dir_t dir)
  * Return: QDF_STATUS
  */
 QDF_STATUS
-__cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum)
+__cdf_nbuf_set_rx_cksum(struct sk_buff *skb, qdf_nbuf_rx_cksum_t *cksum)
 {
 	switch (cksum->l4_result) {
-	case CDF_NBUF_RX_CKSUM_NONE:
+	case QDF_NBUF_RX_CKSUM_NONE:
 		skb->ip_summed = CHECKSUM_NONE;
 		break;
-	case CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY:
+	case QDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY:
 		skb->ip_summed = CHECKSUM_UNNECESSARY;
 		break;
-	case CDF_NBUF_RX_CKSUM_TCP_UDP_HW:
+	case QDF_NBUF_RX_CKSUM_TCP_UDP_HW:
 		skb->ip_summed = CHECKSUM_PARTIAL;
 		skb->csum = cksum->val;
 		break;
@@ -358,19 +358,19 @@ __cdf_nbuf_set_rx_cksum(struct sk_buff *skb, cdf_nbuf_rx_cksum_t *cksum)
  *
  * Return: TX checksum value
  */
-cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb)
+qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb)
 {
 	switch (skb->ip_summed) {
 	case CHECKSUM_NONE:
-		return CDF_NBUF_TX_CKSUM_NONE;
+		return QDF_NBUF_TX_CKSUM_NONE;
 	case CHECKSUM_PARTIAL:
 		/* XXX ADF and Linux checksum don't map with 1-to-1. This is
 		 * not 100% correct */
-		return CDF_NBUF_TX_CKSUM_TCP_UDP;
+		return QDF_NBUF_TX_CKSUM_TCP_UDP;
 	case CHECKSUM_COMPLETE:
-		return CDF_NBUF_TX_CKSUM_TCP_UDP_IP;
+		return QDF_NBUF_TX_CKSUM_TCP_UDP_IP;
 	default:
-		return CDF_NBUF_TX_CKSUM_NONE;
+		return QDF_NBUF_TX_CKSUM_NONE;
 	}
 }
 
@@ -404,7 +404,7 @@ void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid)
  */
 uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb)
 {
-	return CDF_NBUF_EXEMPT_NO_EXEMPTION;
+	return QDF_NBUF_EXEMPT_NO_EXEMPTION;
 }
 
 /**

+ 2 - 2
core/cdf/src/i_cdf_nbuf.h

@@ -519,9 +519,9 @@ static inline void __cdf_nbuf_trim_tail(struct sk_buff *skb, size_t size)
 /*
  * prototypes. Implemented in cdf_nbuf.c
  */
-cdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb);
+qdf_nbuf_tx_cksum_t __cdf_nbuf_get_tx_cksum(struct sk_buff *skb);
 QDF_STATUS __cdf_nbuf_set_rx_cksum(struct sk_buff *skb,
-				   cdf_nbuf_rx_cksum_t *cksum);
+				   qdf_nbuf_rx_cksum_t *cksum);
 uint8_t __cdf_nbuf_get_tid(struct sk_buff *skb);
 void __cdf_nbuf_set_tid(struct sk_buff *skb, uint8_t tid);
 uint8_t __cdf_nbuf_get_exemption_type(struct sk_buff *skb);

+ 15 - 15
core/dp/htt/htt_rx.c

@@ -668,43 +668,43 @@ htt_set_checksum_result_ll(htt_pdev_handle pdev, cdf_nbuf_t msdu,
 	/*
 	 * HW supports TCP & UDP checksum offload for ipv4 and ipv6
 	 */
-	static const cdf_nbuf_l4_rx_cksum_type_t
+	static const qdf_nbuf_l4_rx_cksum_type_t
 		cksum_table[][MAX_PROTO_VAL][MAX_IP_VER] = {
 		{
 			/* non-fragmented IP packet */
 			/* non TCP/UDP packet */
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
 			/* TCP packet */
-			{CDF_NBUF_RX_CKSUM_TCP, CDF_NBUF_RX_CKSUM_TCPIPV6},
+			{QDF_NBUF_RX_CKSUM_TCP, QDF_NBUF_RX_CKSUM_TCPIPV6},
 			/* UDP packet */
-			{CDF_NBUF_RX_CKSUM_UDP, CDF_NBUF_RX_CKSUM_UDPIPV6},
+			{QDF_NBUF_RX_CKSUM_UDP, QDF_NBUF_RX_CKSUM_UDPIPV6},
 			/* invalid packet type */
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
 		},
 		{
 			/* fragmented IP packet */
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
-			{CDF_NBUF_RX_CKSUM_NONE, CDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
+			{QDF_NBUF_RX_CKSUM_NONE, QDF_NBUF_RX_CKSUM_NONE},
 		}
 	};
 
-	cdf_nbuf_rx_cksum_t cksum = {
+	qdf_nbuf_rx_cksum_t cksum = {
 		cksum_table[rx_msdu->ip_frag][proto][rx_msdu->ipv6_proto],
-		CDF_NBUF_RX_CKSUM_NONE,
+		QDF_NBUF_RX_CKSUM_NONE,
 		0
 	};
 
 	if (cksum.l4_type !=
-	    (cdf_nbuf_l4_rx_cksum_type_t) CDF_NBUF_RX_CKSUM_NONE) {
+	    (qdf_nbuf_l4_rx_cksum_type_t) QDF_NBUF_RX_CKSUM_NONE) {
 		cksum.l4_result =
 			((*(uint32_t *) &rx_desc->attention) &
 			 RX_ATTENTION_0_TCP_UDP_CHKSUM_FAIL_MASK) ?
-			CDF_NBUF_RX_CKSUM_NONE :
-			CDF_NBUF_RX_CKSUM_TCP_UDP_UNNECESSARY;
+			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
 }

+ 2 - 2
core/dp/ol/inc/ol_htt_tx_api.h

@@ -43,7 +43,7 @@
 #include <ol_cfg.h>             /* wlan_frm_fmt */
 
 #include <htt.h>                /* needed by inline functions */
-#include <cdf_net_types.h>
+#include <qdf_net_types.h>
 #include <ol_htt_api.h>         /* htt_pdev_handle */
 #include <htt_types.h>
 #include <cdf_trace.h>
@@ -281,7 +281,7 @@ struct htt_msdu_info_t {
 		 * 0x2 - L4 checksum only
 		 * 0x3 - L3 header checksum + L4 checksum
 		 */
-		cdf_nbuf_tx_cksum_t cksum_offload;
+		qdf_nbuf_tx_cksum_t cksum_offload;
 	} action;
 };
 

+ 1 - 1
core/dp/txrx/ol_rx_fwd.c

@@ -185,7 +185,7 @@ ol_rx_fwd_check(struct ol_txrx_vdev_t *vdev,
 				cdf_nbuf_set_tid(msdu, tid);
 			} else {
 				cdf_nbuf_set_tid(msdu,
-						 ADF_NBUF_TX_EXT_TID_INVALID);
+						 QDF_NBUF_TX_EXT_TID_INVALID);
 			}
 			/*
 			 * This MSDU needs to be forwarded to the tx path.

+ 6 - 6
core/dp/txrx/ol_tx.c

@@ -577,12 +577,12 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 			msdu_info.htt.action.cksum_offload =
 				cdf_nbuf_get_tx_cksum(msdu);
 			switch (cdf_nbuf_get_exemption_type(msdu)) {
-			case CDF_NBUF_EXEMPT_NO_EXEMPTION:
-			case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
+			case QDF_NBUF_EXEMPT_NO_EXEMPTION:
+			case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
 				/* We want to encrypt this frame */
 				msdu_info.htt.action.do_encrypt = 1;
 				break;
-			case CDF_NBUF_EXEMPT_ALWAYS:
+			case QDF_NBUF_EXEMPT_ALWAYS:
 				/* We don't want to encrypt this frame */
 				msdu_info.htt.action.do_encrypt = 0;
 				break;
@@ -671,12 +671,12 @@ ol_tx_ll_fast(ol_txrx_vdev_handle vdev, cdf_nbuf_t msdu_list)
 		msdu_info.htt.action.cksum_offload =
 			cdf_nbuf_get_tx_cksum(msdu);
 		switch (cdf_nbuf_get_exemption_type(msdu)) {
-		case CDF_NBUF_EXEMPT_NO_EXEMPTION:
-		case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
+		case QDF_NBUF_EXEMPT_NO_EXEMPTION:
+		case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
 			/* We want to encrypt this frame */
 			msdu_info.htt.action.do_encrypt = 1;
 			break;
-		case CDF_NBUF_EXEMPT_ALWAYS:
+		case QDF_NBUF_EXEMPT_ALWAYS:
 			/* We don't want to encrypt this frame */
 			msdu_info.htt.action.do_encrypt = 0;
 			break;

+ 4 - 4
core/dp/txrx/ol_tx_desc.c

@@ -25,7 +25,7 @@
  * to the Linux Foundation.
  */
 
-#include <cdf_net_types.h>      /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
+#include <qdf_net_types.h>      /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t, etc. */
 #include <cdf_util.h>           /* cdf_assert */
 #include <qdf_lock.h>           /* cdf_spinlock */
@@ -336,12 +336,12 @@ struct ol_tx_desc_t *ol_tx_desc_ll(struct ol_txrx_pdev_t *pdev,
 	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)) {
-	case CDF_NBUF_EXEMPT_NO_EXEMPTION:
-	case CDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
+	case QDF_NBUF_EXEMPT_NO_EXEMPTION:
+	case QDF_NBUF_EXEMPT_ON_KEY_MAPPING_KEY_UNAVAILABLE:
 		/* We want to encrypt this frame */
 		msdu_info->htt.action.do_encrypt = 1;
 		break;
-	case CDF_NBUF_EXEMPT_ALWAYS:
+	case QDF_NBUF_EXEMPT_ALWAYS:
 		/* We don't want to encrypt this frame */
 		msdu_info->htt.action.do_encrypt = 0;
 		break;

+ 5 - 5
core/dp/txrx/ol_tx_send.c

@@ -29,7 +29,7 @@
 #include <qdf_lock.h>           /* cdf_os_spinlock */
 #include <qdf_time.h>           /* qdf_system_ticks, etc. */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t */
-#include <cdf_net_types.h>      /* ADF_NBUF_TX_EXT_TID_INVALID */
+#include <qdf_net_types.h>      /* QDF_NBUF_TX_EXT_TID_INVALID */
 
 #include <cds_queue.h>          /* TAILQ */
 #ifdef QCA_COMPUTE_TX_DELAY
@@ -796,7 +796,7 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev,
 
 	dest_addr = ol_tx_dest_addr_find(pdev, msdu);
 	if (NULL == dest_addr)
-		return ADF_NBUF_TX_EXT_TID_INVALID;
+		return QDF_NBUF_TX_EXT_TID_INVALID;
 
 	is_mcast = IEEE80211_IS_MULTICAST(dest_addr);
 	is_mgmt = tx_desc->pkt_type >= OL_TXRX_MGMT_TYPE_BASE;
@@ -839,7 +839,7 @@ ol_tx_delay_tid_from_l3_hdr(struct ol_txrx_pdev_t *pdev,
 		return (ipv6_traffic_class((struct ipv6_hdr_t *)l3_hdr) >> 5) &
 		       0x7;
 	} else {
-		return ADF_NBUF_TX_EXT_TID_INVALID;
+		return QDF_NBUF_TX_EXT_TID_INVALID;
 	}
 }
 #endif
@@ -852,9 +852,9 @@ static int ol_tx_delay_category(struct ol_txrx_pdev_t *pdev, uint16_t msdu_id)
 
 	cdf_nbuf_t msdu = tx_desc->netbuf;
 	tid = cdf_nbuf_get_tid(msdu);
-	if (tid == ADF_NBUF_TX_EXT_TID_INVALID) {
+	if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
 		tid = ol_tx_delay_tid_from_l3_hdr(pdev, msdu, tx_desc);
-		if (tid == ADF_NBUF_TX_EXT_TID_INVALID) {
+		if (tid == QDF_NBUF_TX_EXT_TID_INVALID) {
 			/* TID could not be determined
 			   (this is not an IP frame?) */
 			return -EINVAL;

+ 1 - 1
core/sap/dfs/inc/dfs.h

@@ -48,7 +48,7 @@
  */
 /*DFS New Include Start*/
 
-#include <cdf_net_types.h>      /* CDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
+#include <qdf_net_types.h>      /* QDF_NBUF_EXEMPT_NO_EXEMPTION, etc. */
 #include <cdf_nbuf.h>           /* cdf_nbuf_t, etc. */
 #include <cdf_util.h>           /* cdf_assert */
 #include <qdf_lock.h>           /* cdf_spinlock */