qcacld-3.0: Remove cds_ieee80211_defines.h

Remove cds_ieee80211_defines.h file.

Change-Id: I3b7a3f61f82ea15b7975fb5d143257c80382f20d
CRs-Fixed: 2395980

core/cds/inc/cds_ieee80211_defines.h

@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2011, 2014-2015, 2018-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
- * 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.
- */
-
-#ifndef CDS_IEEE80211_DEFINES_H_
-#define CDS_IEEE80211_DEFINES_H_
-
-#include "cds_ieee80211_common.h"
-
-/*
- * Public defines for Atheros Upper MAC Layer
- */
-
-#ifndef EXTERNAL_USE_ONLY
-
-#define IEEE80211_LSIG_LEN  3
-#define IEEE80211_HTSIG_LEN 6
-#define IEEE80211_SB_LEN    2
-
-typedef struct ieee80211_rx_status {
-	int rs_numchains;
-	int rs_flags;
-#define IEEE80211_RX_FCS_ERROR      0x01
-#define IEEE80211_RX_MIC_ERROR      0x02
-#define IEEE80211_RX_DECRYPT_ERROR  0x04
-/* holes in flags here between, ATH_RX_XXXX to IEEE80211_RX_XXX */
-#define IEEE80211_RX_KEYMISS        0x200
-	int rs_rssi;            /* RSSI (noise floor ajusted) */
-	int rs_abs_rssi;        /* absolute RSSI */
-	int rs_datarate;        /* data rate received */
-	int rs_rateieee;
-	int rs_ratephy;
-
-#define IEEE80211_MAX_ANTENNA       3   /* Keep the same as ATH_MAX_ANTENNA */
-	uint8_t rs_rssictl[IEEE80211_MAX_ANTENNA];      /* RSSI (noise floor ajusted) */
-	uint8_t rs_rssiextn[IEEE80211_MAX_ANTENNA];     /* RSSI (noise floor ajusted) */
-	uint8_t rs_isvalidrssi; /* rs_rssi is valid or not */
-
-	enum ieee80211_phymode rs_phymode;
-	int rs_freq;
-
-	union {
-		uint8_t data[8];
-		uint64_t tsf;
-	} rs_tstamp;
-
-	/*
-	 * Detail channel structure of recv frame.
-	 * It could be NULL if not available
-	 */
-	struct ieee80211_channel *rs_full_chan;
-
-	uint8_t rs_isaggr;
-	uint8_t rs_isapsd;
-	int16_t rs_noisefloor;
-	uint16_t rs_channel;
-#ifdef ATH_SUPPORT_TxBF
-	uint32_t rs_rpttstamp;  /* txbf report time stamp */
-#endif
-
-	/* The following counts are meant to assist in stats calculation.
-	   These variables are incremented only in specific situations, and
-	   should not be relied upon for any purpose other than the original
-	   stats related purpose they have been introduced for. */
-
-	uint16_t rs_cryptodecapcount;   /* Crypto bytes decapped/demic'ed. */
-	uint8_t rs_padspace;    /* No. of padding bytes present after header
-	                           in wbuf. */
-	uint8_t rs_qosdecapcount;       /* QoS/HTC bytes decapped. */
-
-	/* End of stats calculation related counts. */
-
-	uint8_t rs_lsig[IEEE80211_LSIG_LEN];
-	uint8_t rs_htsig[IEEE80211_HTSIG_LEN];
-	uint8_t rs_servicebytes[IEEE80211_SB_LEN];
-
-} ieee80211_recv_status;
-#endif /* EXTERNAL_USE_ONLY */
-
-#endif

core/dp/htt/htt_monitor_rx.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
@@ -29,7 +29,6 @@
 #include "regtable.h"
 
 #include <cds_ieee80211_common.h>   /* ieee80211_frame, ieee80211_qoscntl */
-#include <cds_ieee80211_defines.h>  /* ieee80211_rx_status */
 #include <cds_utils.h>
 #include <wlan_policy_mgr_api.h>
 #include "ol_txrx_types.h"

core/dp/htt/htt_rx.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
@@ -43,7 +43,6 @@
 #include "regtable.h"
 
 #include <cds_ieee80211_common.h>   /* ieee80211_frame, ieee80211_qoscntl */
-#include <cds_ieee80211_defines.h>  /* ieee80211_rx_status */
 #include <cds_utils.h>
 #include <wlan_policy_mgr_api.h>
 #include "ol_txrx_types.h"

core/dp/htt/htt_rx_hl.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
@@ -29,7 +29,6 @@
 #include "regtable.h"
 
 #include <cds_ieee80211_common.h>   /* ieee80211_frame, ieee80211_qoscntl */
-#include <cds_ieee80211_defines.h>  /* ieee80211_rx_status */
 #include <cds_utils.h>
 #include <wlan_policy_mgr_api.h>
 #include "ol_txrx_types.h"

core/dp/htt/htt_rx_ll.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
@@ -29,7 +29,6 @@
 #include "regtable.h"
 
 #include <cds_ieee80211_common.h>   /* ieee80211_frame, ieee80211_qoscntl */
-#include <cds_ieee80211_defines.h>  /* ieee80211_rx_status */
 #include <cds_utils.h>
 #include <wlan_policy_mgr_api.h>
 #include "ol_txrx_types.h"

core/dp/ol/inc/ol_htt_rx_api.h

@@ -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
@@ -29,7 +29,6 @@
 #ifndef _OL_HTT_RX_API__H_
 #define _OL_HTT_RX_API__H_
 
-/* #include <osapi_linux.h>     / * uint16_t, etc. * / */
 #include <osdep.h>              /* uint16_t, etc. */
 #include <qdf_nbuf.h>           /* qdf_nbuf_t */
 #include <qdf_types.h>          /* bool */
@@ -37,13 +36,100 @@
 #include <htt.h>                /* HTT_RX_IND_MPDU_STATUS */
 #include <ol_htt_api.h>         /* htt_pdev_handle */
 
-#include <cds_ieee80211_defines.h>  /* ieee80211_rx_status */
+#include <cds_ieee80211_common.h>
 #include <ol_vowext_dbg_defs.h>
 
 /*================ constants and types used in the rx API ===================*/
 
 #define HTT_RSSI_INVALID 0x7fff
 
+#ifndef EXTERNAL_USE_ONLY
+
+#define IEEE80211_LSIG_LEN  3
+#define IEEE80211_HTSIG_LEN 6
+#define IEEE80211_SB_LEN    2
+
+/**
+ * struct ieee80211_rx_status - RX status
+ * @rs_numchains: Number of chains
+ * @rs_flags: Flags
+ * @rs_rssi: RSSI (noise floor adjusted)
+ * @rs_abs_rssi: Absolute RSSI
+ * @rs_datarate: Data rate received
+ * @rs_rateieee: ieee rate
+ * @rs_ratephy: Phy rate
+ * @rs_rssictl: RSSI (noise floor adjusted)
+ * @rs_rssiextn: RSSI (noise floor adjusted)
+ * @rs_isvalidrssi: rs_rssi is valid or not
+ * @rs_phymode: Phy mode
+ * @rs_freq: Received frequency
+ * @rs_tstamp: Received timestamp
+ * @rs_full_chan: Detail channel structure of recv frame.
+ *                It could be NULL if not available
+ * @rs_isaggr: Is Aggreggated?
+ * @rs_isapsd: Is APSD?
+ * @rs_noisefloor: Noise floor
+ * @rs_channel: Channel
+ * @rs_rpttstamp: txbf report time stamp
+ * @rs_cryptodecapcount: Crypto bytes decapped/demic'ed
+ * @rs_padspace: No. of padding bytes present after header
+ *               in wbuf
+ * @rs_qosdecapcount: QoS/HTC bytes decapped
+ * @rs_lsig: lsig
+ * @rs_htsig: HT sig
+ * @rs_servicebytes: Received service bytes
+ */
+struct ieee80211_rx_status {
+	int rs_numchains;
+	int rs_flags;
+	int rs_rssi;
+	int rs_abs_rssi;
+	int rs_datarate;
+	int rs_rateieee;
+	int rs_ratephy;
+
+	uint8_t rs_rssictl[IEEE80211_MAX_ANTENNA];
+	uint8_t rs_rssiextn[IEEE80211_MAX_ANTENNA];
+	uint8_t rs_isvalidrssi;
+
+	enum ieee80211_phymode rs_phymode;
+	int rs_freq;
+
+	union {
+		uint8_t data[8];
+		uint64_t tsf;
+	} rs_tstamp;
+
+	struct ieee80211_channel *rs_full_chan;
+
+	uint8_t rs_isaggr;
+	uint8_t rs_isapsd;
+	int16_t rs_noisefloor;
+	uint16_t rs_channel;
+#ifdef ATH_SUPPORT_TxBF
+	uint32_t rs_rpttstamp;
+#endif
+
+	/*
+	 * The following counts are meant to assist in stats calculation.
+	 *  These variables are incremented only in specific situations, and
+	 *  should not be relied upon for any purpose other than the original
+	 *  stats related purpose they have been introduced for.
+	 */
+
+	uint16_t rs_cryptodecapcount;
+	uint8_t rs_padspace;
+	uint8_t rs_qosdecapcount;
+
+	/* End of stats calculation related counts. */
+
+	uint8_t rs_lsig[IEEE80211_LSIG_LEN];
+	uint8_t rs_htsig[IEEE80211_HTSIG_LEN];
+	uint8_t rs_servicebytes[IEEE80211_SB_LEN];
+
+};
+#endif /* EXTERNAL_USE_ONLY */
+
 /**
  * struct ocb_rx_stats_hdr_t - RX stats header
  * @version:		The version must be 1.

core/mac/src/pe/lim/lim_process_fils.c

@@ -23,7 +23,6 @@
 #include <lim_prop_exts_utils.h>
 #include <lim_assoc_utils.h>
 #include <lim_session.h>
-#include <cds_ieee80211_defines.h>
 #include <qdf_crypto.h>
 #include "qdf_util.h"