From 9cf1aa027bff110813732ee241cd86b3102609d9 Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Fri, 1 Mar 2019 15:01:52 -0800 Subject: [PATCH] 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 --- dp/wifi3.0/dp_rx_defrag.c | 4 ++-- dp/wifi3.0/dp_rx_defrag.h | 4 ++-- dp/wifi3.0/dp_rx_mon_dest.c | 2 +- dp/wifi3.0/dp_tx.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index ca0d592f1028..8d0e8cc8fdc3 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/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 = diff --git a/dp/wifi3.0/dp_rx_defrag.h b/dp/wifi3.0/dp_rx_defrag.h index 404446ec9599..f074c94392bf 100644 --- a/dp/wifi3.0/dp_rx_defrag.h +++ b/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 diff --git a/dp/wifi3.0/dp_rx_mon_dest.c b/dp/wifi3.0/dp_rx_mon_dest.c index 07742380cf3b..ce5e7d766555 100644 --- a/dp/wifi3.0/dp_rx_mon_dest.c +++ b/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; diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 15518b6c912c..593bdb8760d9 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/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;