Преглед на файлове

qcacmn: Modify IEEE80211_FC0_SUBTYPE_QOS to QDF_IEEE80211_FC0_SUBTYPE_QOS

Modify IEEE80211_FC0_SUBTYPE_QOS to QDF_IEEE80211_FC0_SUBTYPE_QOS.

Change-Id: I93eb546c04798e82c7be4660d1fe127ce13dc754
CRs-Fixed: 2408226
Srinivas Girigowda преди 6 години
родител
ревизия
9cf1aa027b
променени са 4 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 2 2
      dp/wifi3.0/dp_rx_defrag.c
  2. 2 2
      dp/wifi3.0/dp_rx_defrag.h
  3. 1 1
      dp/wifi3.0/dp_rx_mon_dest.c
  4. 1 1
      dp/wifi3.0/dp_tx.c

+ 2 - 2
dp/wifi3.0/dp_rx_defrag.c

@@ -591,11 +591,11 @@ static void dp_rx_defrag_michdr(const struct ieee80211_frame *wh0,
 	}
 
 	/*
-	 * 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) {
 		if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) ==
 				IEEE80211_FC1_DIR_DSTODS) {
 			const struct ieee80211_qosframe_addr4 *qwh =

+ 2 - 2
dp/wifi3.0/dp_rx_defrag.h

@@ -36,8 +36,8 @@
 
 #define DP_RX_DEFRAG_IEEE80211_QOS_HAS_SEQ(wh) \
 	(((wh) & \
-	(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 UNI_DESC_OWNER_SW 0x1
 #define UNI_DESC_BUF_TYPE_RX_MSDU_LINK 0x6

+ 1 - 1
dp/wifi3.0/dp_rx_mon_dest.c

@@ -653,7 +653,7 @@ qdf_nbuf_t dp_rx_mon_restitch_mpdu_from_msdus(struct dp_soc *soc,
 		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;

+ 1 - 1
dp/wifi3.0/dp_tx.c

@@ -885,7 +885,7 @@ static qdf_nbuf_t dp_tx_prepare_raw(struct dp_vdev *vdev, qdf_nbuf_t nbuf,
 
 	/* SWAR for HW: Enable WEP bit in the AMSDU frames for RAW mode */
 	if (vdev->raw_mode_war &&
-	    (qos_wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS))
+	    (qos_wh->i_fc[0] & QDF_IEEE80211_FC0_SUBTYPE_QOS))
 		qos_wh->i_fc[1] |= IEEE80211_FC1_WEP;
 
 	for (curr_nbuf = nbuf, i = 0; curr_nbuf;