From 8f91d85e31969a605d3ef8196cb22b732385fac9 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Tue, 24 Oct 2017 13:40:12 -0700
Subject: [PATCH] qcacld-3.0: Delete obsolete struct hdd_cfg80211_state

Change "qcacld-3.0: Remove legacy P2P codes in HDD" (Change-Id:
Idaaacac4fdaf1b964432c33c10b1c86f8a591c2d) removed almost all of the
legacy P2P code. However it left behind struct hdd_cfg80211_state (and
associated enums p2p_action_frame_state and action_frm_type) which are
no longer used, so remove those as well.

Change-Id: I3713fa2c940fd5b481ddc32dbd4fcc9ea138799d
CRs-Fixed: 2131863
---
 core/hdd/inc/wlan_hdd_main.h | 32 --------------------------------
 core/hdd/src/wlan_hdd_main.c |  4 ----
 2 files changed, 36 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index d4e3e76edcb6..c599ddcb17e7 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -610,35 +610,6 @@ struct hdd_scan_req {
 	uint32_t scan_req_flags;
 };
 
-enum p2p_action_frame_state {
-	HDD_IDLE,
-	HDD_PD_REQ_ACK_PENDING,
-	HDD_GO_NEG_REQ_ACK_PENDING,
-	HDD_INVALID_STATE,
-};
-
-enum action_frm_type {
-	WLAN_HDD_GO_NEG_REQ,
-	WLAN_HDD_GO_NEG_RESP,
-	WLAN_HDD_GO_NEG_CNF,
-	WLAN_HDD_INVITATION_REQ,
-	WLAN_HDD_INVITATION_RESP,
-	WLAN_HDD_DEV_DIS_REQ,
-	WLAN_HDD_DEV_DIS_RESP,
-	WLAN_HDD_PROV_DIS_REQ,
-	WLAN_HDD_PROV_DIS_RESP,
-};
-
-struct hdd_cfg80211_state {
-	uint16_t current_freq;
-	enum p2p_action_frame_state actionFrmState;
-	/* is_go_neg_ack_received flag is set to 1 when
-	 * the pending ack for GO negotiation req is
-	 * received.
-	 */
-	bool is_go_neg_ack_received;
-};
-
 /**
  * struct hdd_mon_set_ch_info - Holds monitor mode channel switch params
  * @channel: Channel number.
@@ -1154,8 +1125,6 @@ struct hdd_adapter {
 #endif /* WLAN_FEATURE_TSF_PLUS */
 #endif
 
-	struct hdd_cfg80211_state cfg80211State;
-
 #ifdef WLAN_FEATURE_PACKET_FILTERING
 	struct hdd_multicast_addr_list mc_addr_list;
 #endif
@@ -1260,7 +1229,6 @@ struct hdd_adapter {
 #define WLAN_HDD_GET_HAL_CTX(adapter)  ((adapter)->hdd_ctx->hHal)
 #define WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter) \
 				(&(adapter)->sessionCtx.ap.HostapdState)
-#define WLAN_HDD_GET_CFG_STATE_PTR(adapter)  (&(adapter)->cfg80211State)
 #define WLAN_HDD_GET_SAP_CTX_PTR(adapter) ((adapter)->sessionCtx.ap.sapContext)
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 1504059f4e19..0bb137887013 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3944,8 +3944,6 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 	struct hdd_adapter *adapter = NULL;
 	hdd_adapter_list_node_t *pHddAdapterNode = NULL;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	struct hdd_cfg80211_state *cfgState;
-
 
 	if (hdd_ctx->current_intf_count >= hdd_ctx->max_intf_count) {
 		/*
@@ -4112,8 +4110,6 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 
 	INIT_WORK(&adapter->scan_block_work, wlan_hdd_cfg80211_scan_block_cb);
 
-	cfgState = WLAN_HDD_GET_CFG_STATE_PTR(adapter);
-
 	if (QDF_STATUS_SUCCESS == status) {
 		/* Add it to the hdd's session list. */
 		pHddAdapterNode =