qcacld-3.0: Remove obsolete macros from CDS

Remove obsolete macros from CDS.

Change-Id: Ic17ae603f698568ba8ccb6b4e3f332a475e67a7b
CRs-Fixed: 2395980

core/cds/inc/cds_ieee80211_common.h

@@ -105,51 +105,14 @@ struct ieee80211_htc {
 	uint8_t i_htc[4];
 };
 
-#define IEEE80211_FC0_VERSION_MASK          0x03
-#define IEEE80211_FC0_VERSION_SHIFT         0
 #define IEEE80211_FC0_VERSION_0             0x00
 #define IEEE80211_FC0_TYPE_MASK             0x0c
-#define IEEE80211_FC0_TYPE_SHIFT            2
 #define IEEE80211_FC0_TYPE_MGT              0x00
 #define IEEE80211_FC0_TYPE_CTL              0x04
 #define IEEE80211_FC0_TYPE_DATA             0x08
 
 #define IEEE80211_FC0_SUBTYPE_MASK          0xf0
 #define IEEE80211_FC0_SUBTYPE_SHIFT         4
-/* for TYPE_MGT */
-#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ     0x00
-#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP    0x10
-#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ   0x20
-#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP  0x30
-#define IEEE80211_FC0_SUBTYPE_PROBE_REQ     0x40
-#define IEEE80211_FC0_SUBTYPE_PROBE_RESP    0x50
-#define IEEE80211_FC0_SUBTYPE_BEACON        0x80
-#define IEEE80211_FC0_SUBTYPE_ATIM          0x90
-#define IEEE80211_FC0_SUBTYPE_DISASSOC      0xa0
-#define IEEE80211_FC0_SUBTYPE_AUTH          0xb0
-#define IEEE80211_FC0_SUBTYPE_DEAUTH        0xc0
-#define IEEE80211_FC0_SUBTYPE_ACTION        0xd0
-#define IEEE80211_FCO_SUBTYPE_ACTION_NO_ACK 0xe0
-/* for TYPE_CTL */
-#define IEEE80211_FCO_SUBTYPE_Control_Wrapper   0x70    /* For TxBF RC */
-#define IEEE80211_FC0_SUBTYPE_BAR           0x80
-#define IEEE80211_FC0_SUBTYPE_PS_POLL       0xa0
-#define IEEE80211_FC0_SUBTYPE_RTS           0xb0
-#define IEEE80211_FC0_SUBTYPE_CTS           0xc0
-#define IEEE80211_FC0_SUBTYPE_ACK           0xd0
-#define IEEE80211_FC0_SUBTYPE_CF_END        0xe0
-#define IEEE80211_FC0_SUBTYPE_CF_END_ACK    0xf0
-/* for TYPE_DATA (bit combination) */
-#define IEEE80211_FC0_SUBTYPE_DATA          0x00
-#define IEEE80211_FC0_SUBTYPE_CF_ACK        0x10
-#define IEEE80211_FC0_SUBTYPE_CF_POLL       0x20
-#define IEEE80211_FC0_SUBTYPE_CF_ACPL       0x30
-#define IEEE80211_FC0_SUBTYPE_NODATA        0x40
-#define IEEE80211_FC0_SUBTYPE_CFACK         0x50
-#define IEEE80211_FC0_SUBTYPE_CFPOLL        0x60
-#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
-#define IEEE80211_FC0_SUBTYPE_QOS           0x80
-#define IEEE80211_FC0_SUBTYPE_QOS_NULL      0xc0
 
 #define IEEE80211_FC1_DIR_MASK              0x03
 #define IEEE80211_FC1_DIR_NODS              0x00        /* STA->STA */
@@ -175,8 +138,6 @@ struct ieee80211_htc {
 
 #define IEEE80211_IS_DATA(_frame)      (((_frame)->i_fc[0] & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA)
 
-#define IEEE8023_MAX_LEN 0x600  /* 1536 - larger is Ethernet II */
-
 /* does frame have QoS sequence control data */
 #define IEEE80211_QOS_HAS_SEQ(wh) \
 	(((wh)->i_fc[0] & \
@@ -275,11 +236,6 @@ enum {
 #define IEEE80211_WEP_EXTIVLEN      4   /* extended IV length */
 #define IEEE80211_WEP_MICLEN        8   /* trailing MIC */
 
-#define IEEE80211_CCMP_HEADERLEN    8
-#define IEEE80211_CCMP_MICLEN       8
-#define WLAN_IEEE80211_GCMP_HEADERLEN    8
-#define WLAN_IEEE80211_GCMP_MICLEN      16
-
 /*
  * 802.11w defines a MMIE chunk to be attached at the end of
  * any outgoing broadcast or multicast robust management frame.

core/dp/txrx/ol_txrx_encap.c

@@ -228,7 +228,7 @@ ol_tx_encap_from_8023(struct ol_txrx_vdev_t *vdev,
 		llc_hdr = (struct llc_snap_hdr_t *)(localbuf + new_hdsize);
 		ether_type =
 			(eth_hdr->ethertype[0] << 8) | (eth_hdr->ethertype[1]);
-		if (ether_type >= IEEE8023_MAX_LEN) {
+		if (ether_type >= ETH_P_802_3_MIN) {
 			qdf_mem_copy(llc_hdr,
 				     ethernet_II_llc_snap_header_prefix,
 				     sizeof

core/sme/src/csr/csr_api_scan.c

@@ -2616,7 +2616,7 @@ static QDF_STATUS csr_fill_bss_from_scan_entry(struct mac_context *mac_ctx,
 	bss_desc->parentTSF =
 		scan_entry->rrm_parent_tsf;
 	bss_desc->fProbeRsp = (scan_entry->frm_subtype ==
-			  IEEE80211_FC0_SUBTYPE_PROBE_RESP);
+			  MGMT_SUBTYPE_PROBE_RESP);
 	bss_desc->seq_ctrl = hdr->seqControl;
 	bss_desc->tsf_delta = scan_entry->tsf_delta;
 

core/wma/src/wma_mgmt.c

@@ -4006,7 +4006,7 @@ static bool wma_is_pkt_drop_candidate(tp_wma_handle wma_handle,
 	uint8_t nan_addr[] = {0x50, 0x6F, 0x9A, 0x01, 0x00, 0x00};
 
 	/* Drop the beacons from NAN device */
-	if ((subtype == IEEE80211_FC0_SUBTYPE_BEACON) &&
+	if ((subtype == MGMT_SUBTYPE_BEACON) &&
 		(!qdf_mem_cmp(nan_addr, bssid, NAN_CLUSTER_ID_BYTES))) {
 			should_drop = true;
 			goto end;
@@ -4156,9 +4156,9 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 	mgt_subtype = (wh)->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK;
 
 	if (mgt_type == IEEE80211_FC0_TYPE_MGT &&
-	    (mgt_subtype == IEEE80211_FC0_SUBTYPE_DISASSOC ||
-	     mgt_subtype == IEEE80211_FC0_SUBTYPE_DEAUTH ||
-	     mgt_subtype == IEEE80211_FC0_SUBTYPE_ACTION)) {
+	    (mgt_subtype == MGMT_SUBTYPE_DISASSOC ||
+	     mgt_subtype == MGMT_SUBTYPE_DEAUTH ||
+	     mgt_subtype == MGMT_SUBTYPE_ACTION)) {
 		if (wma_find_vdev_by_bssid(
 			wma_handle, wh->i_addr3, &vdev_id)) {
 			iface = &(wma_handle->interfaces[vdev_id]);
@@ -4181,8 +4181,8 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 		(vdev_id == WMA_INVALID_VDEV_ID ? 0 : vdev_id);
 
 	if (mgt_type == IEEE80211_FC0_TYPE_MGT &&
-	    (mgt_subtype == IEEE80211_FC0_SUBTYPE_BEACON ||
-	     mgt_subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
+	    (mgt_subtype == MGMT_SUBTYPE_BEACON ||
+	     mgt_subtype == MGMT_SUBTYPE_PROBE_RESP)) {
 		if (mgmt_rx_params->buf_len <=
 			(sizeof(struct ieee80211_frame) +
 			offsetof(struct wlan_bcn_frame, ie))) {
@@ -4201,7 +4201,7 @@ int wma_form_rx_packet(qdf_nbuf_t buf,
 
 	packetdump_cb = wma_handle->wma_mgmt_rx_packetdump_cb;
 	if ((mgt_type == IEEE80211_FC0_TYPE_MGT &&
-			mgt_subtype != IEEE80211_FC0_SUBTYPE_BEACON) &&
+			mgt_subtype != MGMT_SUBTYPE_BEACON) &&
 			packetdump_cb)
 		packetdump_cb(rx_pkt->pkt_buf, QDF_STATUS_SUCCESS,
 			rx_pkt->pkt_meta.sessionId, RX_MGMT_PKT);