qcacld-3.0: Modify IEEE80211_FC0_*_QOS to QDF_IEEE80211_FC0_SUBTYPE_QOS

Modify IEEE80211_FC0_SUBTYPE_QOS to QDF_IEEE80211_FC0_SUBTYPE_QOS.

Change-Id: Ide7ce0b8ff66af1706c2781dbe2aecb316613366
CRs-Fixed: 2408230

core/cds/inc/cds_ieee80211_common.h

@@ -180,8 +180,8 @@ struct ieee80211_htc {
 /* does frame have QoS sequence control data */
 #define IEEE80211_QOS_HAS_SEQ(wh) \
 	(((wh)->i_fc[0] & \
-	  (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
-	 (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
+	  (IEEE80211_FC0_TYPE_MASK | QDF_IEEE80211_FC0_SUBTYPE_QOS)) == \
+	 (IEEE80211_FC0_TYPE_DATA | QDF_IEEE80211_FC0_SUBTYPE_QOS))
 
 #define IEEE80211_HTCAP_MAXRXAMPDU_FACTOR   13
 

core/dp/htt/htt_monitor_rx.c

@@ -914,7 +914,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
 		wifi_hdr_len += 6;
 
 	is_amsdu = 0;
-	if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) {
+	if (wh->i_fc[0] & QDF_IEEE80211_FC0_SUBTYPE_QOS) {
 		qos = (struct ieee80211_qoscntl *)
 		      (hdr_desc + wifi_hdr_len);
 		wifi_hdr_len += 2;

core/dp/txrx/ol_rx_defrag.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -67,8 +67,8 @@
 
 #define DEFRAG_IEEE80211_QOS_HAS_SEQ(wh) \
 	(((wh)->i_fc[0] & \
-	  (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
-	 (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
+	  (IEEE80211_FC0_TYPE_MASK | QDF_IEEE80211_FC0_SUBTYPE_QOS)) == \
+	 (IEEE80211_FC0_TYPE_DATA | QDF_IEEE80211_FC0_SUBTYPE_QOS))
 
 #define DEFRAG_IEEE80211_QOS_GET_TID(_x) \
 	((_x)->i_qos[0] & IEEE80211_QOS_TID)
@@ -966,11 +966,11 @@ void ol_rx_defrag_michdr(const struct ieee80211_frame *wh0, uint8_t hdr[])
 		break;
 	}
 	/*
-	 * Bit 7 is IEEE80211_FC0_SUBTYPE_QOS for data frame, but
+	 * Bit 7 is QDF_IEEE80211_FC0_SUBTYPE_QOS for data frame, but
 	 * it could also be set for deauth, disassoc, action, etc. for
 	 * a mgt type frame. It comes into picture for MFP.
 	 */
-	if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) {
+	if (wh->i_fc[0] & QDF_IEEE80211_FC0_SUBTYPE_QOS) {
 		const struct ieee80211_qosframe *qwh =
 			(const struct ieee80211_qosframe *)wh;
 		hdr[12] = qwh->i_qos[0] & IEEE80211_QOS_TID;
@@ -1269,7 +1269,7 @@ ol_rx_defrag_qos_decap(ol_txrx_pdev_handle pdev,
 		 * adding this explicit check is okay.
 		 */
 		if (wh)
-			wh->i_fc[0] &= ~IEEE80211_FC0_SUBTYPE_QOS;
+			wh->i_fc[0] &= ~QDF_IEEE80211_FC0_SUBTYPE_QOS;
 
 		ol_rx_defrag_push_rx_desc(nbuf, rx_desc_old_position,
 					  ind_old_position, rx_desc_len);

core/dp/txrx/ol_tx_classify.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -161,7 +161,7 @@ ol_tx_set_ether_type(
 			/* dot11 encapsulated frame */
 			struct ieee80211_qosframe *whqos =
 					(struct ieee80211_qosframe *)datap;
-			if (whqos->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) {
+			if (whqos->i_fc[0] & QDF_IEEE80211_FC0_SUBTYPE_QOS) {
 				tx_msdu_info->htt.info.l3_hdr_offset =
 					sizeof(struct ieee80211_qosframe);
 			} else {
@@ -263,7 +263,7 @@ ol_tx_tid_by_raw_type(
 		/* dot11 encapsulated frame */
 		struct ieee80211_qosframe *whqos =
 					(struct ieee80211_qosframe *)datap;
-		if (whqos->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS)
+		if (whqos->i_fc[0] & QDF_IEEE80211_FC0_SUBTYPE_QOS)
 			tid = whqos->i_qos[0] & IEEE80211_QOS_TID;
 		else
 			tid = HTT_NON_QOS_TID;

core/dp/txrx/ol_txrx_encap.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017, 2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -87,7 +87,7 @@ ol_tx_encap_from_native_wifi(struct ol_txrx_vdev_t *vdev,
 #endif
 
 		qos_cntl->i_qos[1] = 0;
-		wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS;
+		wh->i_fc[0] |= QDF_IEEE80211_FC0_SUBTYPE_QOS;
 		/* count for qos field */
 		new_hdsize =
 			hdsize + sizeof(struct ieee80211_qosframe) -
@@ -207,7 +207,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev,
 		qos_cntl = (struct ieee80211_qoscntl *)(localbuf + new_hdsize);
 		qos_cntl->i_qos[0] =
 			tx_msdu_info->htt.info.ext_tid & IEEE80211_QOS_TID;
-		wh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS;
+		wh->i_fc[0] |= QDF_IEEE80211_FC0_SUBTYPE_QOS;
 #ifdef NEVERDEFINED
 		if (wmmParam[ac].wmep_noackPolicy)
 			qos_cntl->i_qos[0] |= 1 << IEEE80211_QOS_ACKPOLICY_S;
@@ -334,7 +334,7 @@ ol_rx_decap_to_native_wifi(struct ol_txrx_vdev_t *vdev,
 	if (IEEE80211_QOS_HAS_SEQ(wh)) {
 		if (wh->i_fc[1] & IEEE80211_FC1_ORDER)
 			wh->i_fc[1] &= ~IEEE80211_FC1_ORDER;
-		wh->i_fc[0] &= ~IEEE80211_FC0_SUBTYPE_QOS;
+		wh->i_fc[0] &= ~QDF_IEEE80211_FC0_SUBTYPE_QOS;
 	}
 }