qcacld-3.0: Use enum QDF_OPMODE

Change "qcacmn: Rename enum tQDF_ADAPTER_MODE" (qca-wifi-host-cmn
Change-Id I20f1b6d1a0ab4b8fe6a85cefdff96a49e2f4652c) renamed enum
tQDF_ADAPTER_MODE to QDF_OPMODE. Update all references to use the
new name.

Change-Id: Ic6f663dac11a100f168b2626c7c0fbcaccbfca4f
CRs-Fixed: 2141065

components/pmo/core/inc/wlan_pmo_main.h

@@ -48,10 +48,10 @@
 #define PMO_VDEV_IN_STA_MODE(mode) \
 	((mode) == QDF_STA_MODE || (mode) == QDF_P2P_CLIENT_MODE ? 1 : 0)
 
-static inline enum tQDF_ADAPTER_MODE pmo_get_vdev_opmode(
+static inline enum QDF_OPMODE pmo_get_vdev_opmode(
 			struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE opmode;
+	enum QDF_OPMODE opmode;
 
 	opmode = wlan_vdev_mlme_get_opmode(vdev);
 
@@ -106,7 +106,7 @@ QDF_STATUS pmo_get_vdev_bss_peer_mac_addr(struct wlan_objmgr_vdev *vdev,
  *
  * Return: True if vdev needs to beacon.
  */
-bool pmo_is_vdev_in_beaconning_mode(enum tQDF_ADAPTER_MODE vdev_opmode);
+bool pmo_is_vdev_in_beaconning_mode(enum QDF_OPMODE vdev_opmode);
 
 /**
  * pmo_core_is_ap_mode_supports_arp_ns() - To check ap mode supports arp/ns
@@ -118,7 +118,7 @@ bool pmo_is_vdev_in_beaconning_mode(enum tQDF_ADAPTER_MODE vdev_opmode);
  */
 
 bool pmo_core_is_ap_mode_supports_arp_ns(struct wlan_objmgr_psoc *psoc,
-	enum tQDF_ADAPTER_MODE vdev_opmode);
+	enum QDF_OPMODE vdev_opmode);
 
 /**
  * pmo_core_is_vdev_connected() -  to check whether peer is associated or not
@@ -169,10 +169,10 @@ QDF_STATUS pmo_core_update_psoc_config(struct wlan_objmgr_psoc *psoc,
  *
  * Return QDF_MAX_NO_OF_MODE - in case of error else return vdev opmode
  */
-static inline enum tQDF_ADAPTER_MODE pmo_core_get_vdev_op_mode(
+static inline enum QDF_OPMODE pmo_core_get_vdev_op_mode(
 					struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE op_mode = QDF_MAX_NO_OF_MODE;
+	enum QDF_OPMODE op_mode = QDF_MAX_NO_OF_MODE;
 
 	if (!vdev)
 		return op_mode;

components/pmo/core/inc/wlan_pmo_suspend_resume.h

@@ -357,7 +357,7 @@ uint16_t pmo_core_vdev_get_pause_bitmap(struct pmo_psoc_priv_obj *psoc_ctx,
 static inline
 bool pmo_is_vdev_in_ap_mode(struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	mode = pmo_get_vdev_opmode(vdev);
 
@@ -378,7 +378,7 @@ bool pmo_is_vdev_in_ap_mode(struct wlan_objmgr_vdev *vdev)
 static inline
 bool pmo_is_vdev_in_ibss_mode(struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE mode;
+	enum QDF_OPMODE mode;
 
 	mode = pmo_get_vdev_opmode(vdev);
 

components/pmo/core/src/wlan_pmo_gtk.c

@@ -170,7 +170,7 @@ QDF_STATUS pmo_core_cache_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 		struct pmo_gtk_req *gtk_req)
 {
 	QDF_STATUS status;
-	enum tQDF_ADAPTER_MODE opmode;
+	enum QDF_OPMODE opmode;
 	uint8_t vdev_id;
 
 	PMO_ENTER();
@@ -211,7 +211,7 @@ out:
 
 QDF_STATUS pmo_core_flush_gtk_offload_req(struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE opmode;
+	enum QDF_OPMODE opmode;
 	uint8_t vdev_id;
 	QDF_STATUS status;
 

components/pmo/core/src/wlan_pmo_main.c

@@ -63,7 +63,7 @@ struct wlan_pmo_ctx *pmo_get_context(void)
 	return gp_pmo_ctx;
 }
 
-bool pmo_is_vdev_in_beaconning_mode(enum tQDF_ADAPTER_MODE vdev_opmode)
+bool pmo_is_vdev_in_beaconning_mode(enum QDF_OPMODE vdev_opmode)
 {
 	switch (vdev_opmode) {
 	case QDF_SAP_MODE:
@@ -100,7 +100,7 @@ QDF_STATUS pmo_get_vdev_bss_peer_mac_addr(struct wlan_objmgr_vdev *vdev,
 }
 
 bool pmo_core_is_ap_mode_supports_arp_ns(struct wlan_objmgr_psoc *psoc,
-	enum tQDF_ADAPTER_MODE vdev_opmode)
+	enum QDF_OPMODE vdev_opmode)
 {
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
@@ -140,7 +140,7 @@ bool pmo_core_is_vdev_connected(struct wlan_objmgr_vdev *vdev)
 
 bool pmo_core_is_vdev_supports_offload(struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE opmode;
+	enum QDF_OPMODE opmode;
 	bool val;
 
 	opmode = pmo_get_vdev_opmode(vdev);

components/pmo/core/src/wlan_pmo_static_config.c

@@ -35,7 +35,7 @@ void pmo_register_wow_wakeup_events(struct wlan_objmgr_vdev *vdev)
 {
 	uint32_t event_bitmap[PMO_WOW_MAX_EVENT_BM_LEN] = {0};
 	uint8_t vdev_id;
-	enum tQDF_ADAPTER_MODE  vdev_opmode;
+	enum QDF_OPMODE  vdev_opmode;
 	const char *iface_type;
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	pmo_is_device_in_low_pwr_mode is_low_pwr_mode;
@@ -320,7 +320,7 @@ static QDF_STATUS pmo_configure_wow_sta(struct wlan_objmgr_vdev *vdev)
 
 void pmo_register_wow_default_patterns(struct wlan_objmgr_vdev *vdev)
 {
-	enum tQDF_ADAPTER_MODE  vdev_opmode = QDF_MAX_NO_OF_MODE;
+	enum QDF_OPMODE  vdev_opmode = QDF_MAX_NO_OF_MODE;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	uint8_t vdev_id;
 	struct pmo_psoc_priv_obj *psoc_ctx;

components/pmo/core/src/wlan_pmo_suspend_resume.c

@@ -110,7 +110,7 @@ static void pmo_core_set_vdev_suspend_dtim(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS ret;
 	uint8_t vdev_id;
 	enum pmo_power_save_qpower_mode qpower_config;
-	enum tQDF_ADAPTER_MODE opmode = pmo_core_get_vdev_op_mode(vdev);
+	enum QDF_OPMODE opmode = pmo_core_get_vdev_op_mode(vdev);
 
 	qpower_config = pmo_core_psoc_get_qpower_config(psoc);
 	vdev_id = pmo_vdev_get_id(vdev);
@@ -367,7 +367,7 @@ static void pmo_core_set_vdev_resume_dtim(struct wlan_objmgr_psoc *psoc,
 	enum pmo_power_save_qpower_mode qpower_config;
 	QDF_STATUS ret;
 	uint8_t vdev_id;
-	enum tQDF_ADAPTER_MODE opmode = pmo_core_get_vdev_op_mode(vdev);
+	enum QDF_OPMODE opmode = pmo_core_get_vdev_op_mode(vdev);
 	uint32_t cfg_data_val = 0;
 
 	qpower_config = pmo_core_psoc_get_qpower_config(psoc);

components/pmo/core/src/wlan_pmo_wow.c

@@ -212,7 +212,7 @@ bool pmo_is_beaconing_vdev_up(struct wlan_objmgr_psoc *psoc)
 {
 	int vdev_id;
 	struct wlan_objmgr_vdev *vdev;
-	enum tQDF_ADAPTER_MODE vdev_opmode;
+	enum QDF_OPMODE vdev_opmode;
 	bool is_beaconing;
 	QDF_STATUS status;
 

components/pmo/dispatcher/inc/wlan_pmo_ucfg_api.h

@@ -41,7 +41,7 @@
  * Return: true in case support else false
  */
 bool ucfg_pmo_is_ap_mode_supports_arp_ns(struct wlan_objmgr_psoc *psoc,
-	enum tQDF_ADAPTER_MODE vdev_opmode);
+	enum QDF_OPMODE vdev_opmode);
 
 /**
  * ucfg_pmo_is_vdev_connected() -  to check whether peer is associated or not

components/pmo/dispatcher/src/wlan_pmo_ucfg_api.c

@@ -44,7 +44,7 @@ QDF_STATUS ucfg_pmo_update_psoc_config(struct wlan_objmgr_psoc *psoc,
 }
 
 bool ucfg_pmo_is_ap_mode_supports_arp_ns(struct wlan_objmgr_psoc *psoc,
-	enum tQDF_ADAPTER_MODE vdev_opmode)
+	enum QDF_OPMODE vdev_opmode)
 {
 	return pmo_core_is_ap_mode_supports_arp_ns(psoc, vdev_opmode);
 }

core/cds/inc/cds_api.h

@@ -100,7 +100,7 @@ enum cds_fw_state {
  */
 struct cds_sme_cbacks {
 	QDF_STATUS (*sme_get_valid_channels)(void*, uint8_t *, uint32_t *);
-	void (*sme_get_nss_for_vdev)(void*, enum tQDF_ADAPTER_MODE,
+	void (*sme_get_nss_for_vdev)(void*, enum QDF_OPMODE,
 				     uint8_t *, uint8_t *);
 };
 
@@ -441,7 +441,7 @@ QDF_STATUS cds_free_context(QDF_MODULE_ID moduleID, void *pModuleContext);
 
 QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context);
 
-QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type,
+QDF_STATUS cds_get_vdev_types(enum QDF_OPMODE mode, uint32_t *type,
 			      uint32_t *subType);
 
 void cds_flush_work(void *work);

core/cds/src/cds_api.c

@@ -1674,7 +1674,7 @@ void cds_wma_complete_cback(void)
  *
  * Return: WMI vdev type
  */
-QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type,
+QDF_STATUS cds_get_vdev_types(enum QDF_OPMODE mode, uint32_t *type,
 			      uint32_t *sub_type)
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;

core/hdd/inc/wlan_hdd_main.h

@@ -997,7 +997,7 @@ struct hdd_adapter {
 	/** Handle to the network device */
 	struct net_device *dev;
 
-	enum tQDF_ADAPTER_MODE device_mode;
+	enum QDF_OPMODE device_mode;
 
 	/** IPv4 notifier callback for handling ARP offload on change in IP */
 	struct work_struct ipv4_notifier_work;
@@ -1850,7 +1850,7 @@ int hdd_vdev_ready(struct hdd_adapter *adapter);
 
 QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter);
 struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
-			enum tQDF_ADAPTER_MODE mode);
+			enum QDF_OPMODE mode);
 void hdd_deinit_adapter(struct hdd_context *hdd_ctx,
 			struct hdd_adapter *adapter,
 			bool rtnl_held);
@@ -1862,7 +1862,7 @@ uint8_t *wlan_hdd_get_intf_addr(struct hdd_context *hdd_ctx);
 void wlan_hdd_release_intf_addr(struct hdd_context *hdd_ctx,
 				uint8_t *releaseAddr);
 uint8_t hdd_get_operating_channel(struct hdd_context *hdd_ctx,
-			enum tQDF_ADAPTER_MODE mode);
+			enum QDF_OPMODE mode);
 
 void hdd_set_conparam(uint32_t con_param);
 enum tQDF_GLOBAL_CON_MODE hdd_get_conparam(void);
@@ -2587,7 +2587,7 @@ static inline void hdd_send_peer_status_ind_to_app(
 					uint8_t peer_timing_meas_cap,
 					uint8_t sessionId,
 					tSirSmeChanInfo *chan_info,
-					enum tQDF_ADAPTER_MODE dev_mode)
+					enum QDF_OPMODE dev_mode)
 {
 	struct wifi_pos_ch_info ch_info;
 
@@ -2620,7 +2620,7 @@ static inline void hdd_send_peer_status_ind_to_app(
 					uint8_t peer_timing_meas_cap,
 					uint8_t sessionId,
 					tSirSmeChanInfo *chan_info,
-					enum tQDF_ADAPTER_MODE dev_mode)
+					enum QDF_OPMODE dev_mode)
 {
 	hdd_send_peer_status_ind_to_oem_app(peer_mac, peer_status,
 			peer_timing_meas_cap, sessionId, chan_info, dev_mode);

core/hdd/inc/wlan_hdd_oemdata.h

@@ -181,7 +181,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 					 uint8_t peerTimingMeasCap,
 					 uint8_t sessionId,
 					 struct sSirSmeChanInfo *chan_info,
-					 enum tQDF_ADAPTER_MODE dev_mode);
+					 enum QDF_OPMODE dev_mode);
 
 int iw_get_oem_data_cap(struct net_device *dev, struct iw_request_info *info,
 			union iwreq_data *wrqu, char *extra);

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4117,7 +4117,7 @@ wlan_hdd_set_no_dfs_flag_config_policy[QCA_WLAN_VENDOR_ATTR_SET_NO_DFS_FLAG_MAX
  *  Return:         bool
  */
 static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
-				enum tQDF_ADAPTER_MODE device_mode)
+				enum QDF_OPMODE device_mode)
 {
 	struct hdd_adapter *adapter;
 	hdd_adapter_list_node_t *adapter_node = NULL, *next = NULL;
@@ -5958,7 +5958,7 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
 						   u8 restrict_offchan)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	enum tQDF_ADAPTER_MODE dev_mode = adapter->device_mode;
+	enum QDF_OPMODE dev_mode = adapter->device_mode;
 	int ret_val = 0;
 
 	if (!(dev_mode == QDF_SAP_MODE || dev_mode == QDF_P2P_GO_MODE)) {

core/hdd/src/wlan_hdd_main.c

@@ -2015,7 +2015,7 @@ int hdd_start_adapter(struct hdd_adapter *adapter)
 {
 
 	int ret;
-	enum tQDF_ADAPTER_MODE device_mode = adapter->device_mode;
+	enum QDF_OPMODE device_mode = adapter->device_mode;
 
 	ENTER_DEV(adapter->dev);
 	hdd_debug("Start_adapter for mode : %d", adapter->device_mode);
@@ -5478,7 +5478,7 @@ struct hdd_adapter *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
  * Return: pointer to adapter or null
  */
 struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
-			enum tQDF_ADAPTER_MODE mode)
+			enum QDF_OPMODE mode)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	struct hdd_adapter *adapter;
@@ -5516,7 +5516,7 @@ struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
  *	   not connected.
  */
 uint8_t hdd_get_operating_channel(struct hdd_context *hdd_ctx,
-			enum tQDF_ADAPTER_MODE mode)
+			enum QDF_OPMODE mode)
 {
 	hdd_adapter_list_node_t *adapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
@@ -10747,7 +10747,7 @@ wlan_hdd_check_custom_con_channel_rules(struct hdd_adapter *sta_adapter,
 	struct hdd_ap_ctx *hdd_ap_ctx;
 	uint8_t channel_id;
 	QDF_STATUS status;
-	enum tQDF_ADAPTER_MODE device_mode = ap_adapter->device_mode;
+	enum QDF_OPMODE device_mode = ap_adapter->device_mode;
 	*concurrent_chnl_same = true;
 
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
@@ -11519,7 +11519,7 @@ static bool is_con_mode_valid(enum tQDF_GLOBAL_CON_MODE mode)
  *
  * Return: adapter mode
  */
-static enum tQDF_ADAPTER_MODE hdd_get_adpter_mode(
+static enum QDF_OPMODE hdd_get_adpter_mode(
 					enum tQDF_GLOBAL_CON_MODE mode)
 {
 
@@ -11658,7 +11658,7 @@ static int __con_mode_handler(const char *kmessage, struct kernel_param *kp,
 	int ret;
 	struct hdd_adapter *adapter;
 	enum tQDF_GLOBAL_CON_MODE curr_mode;
-	enum tQDF_ADAPTER_MODE adapter_mode;
+	enum QDF_OPMODE adapter_mode;
 
 	hdd_info("con_mode handler: %s", kmessage);
 

core/hdd/src/wlan_hdd_object_manager.c

@@ -259,7 +259,7 @@ int hdd_objmgr_release_and_destroy_vdev(struct hdd_adapter *adapter)
 }
 
 int hdd_objmgr_add_peer_object(struct wlan_objmgr_vdev *vdev,
-			       enum tQDF_ADAPTER_MODE adapter_mode,
+			       enum QDF_OPMODE adapter_mode,
 			       uint8_t *mac_addr,
 			       bool is_p2p_type)
 {

core/hdd/src/wlan_hdd_object_manager.h

@@ -169,7 +169,7 @@ int hdd_objmgr_release_and_destroy_vdev(struct hdd_adapter *adapter);
  * Return: 0 for success, negative error code for failure
  */
 int hdd_objmgr_add_peer_object(struct wlan_objmgr_vdev *vdev,
-			       enum tQDF_ADAPTER_MODE adapter_mode,
+			       enum QDF_OPMODE adapter_mode,
 			       uint8_t *mac_addr,
 			       bool is_p2p_type);
 

core/hdd/src/wlan_hdd_oemdata.c

@@ -690,7 +690,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 					 uint8_t peerTimingMeasCap,
 					 uint8_t sessionId,
 					 tSirSmeChanInfo *chan_info,
-					 enum tQDF_ADAPTER_MODE dev_mode)
+					 enum QDF_OPMODE dev_mode)
 {
 	struct sk_buff *skb;
 	struct nlmsghdr *nlh;

core/hdd/src/wlan_hdd_p2p.c

@@ -1145,7 +1145,7 @@ done:
  */
 static uint32_t set_first_connection_operating_channel(
 		struct hdd_context *hdd_ctx, uint32_t set_value,
-		enum tQDF_ADAPTER_MODE dev_mode)
+		enum QDF_OPMODE dev_mode)
 {
 	uint8_t operating_channel;
 

core/mac/inc/sir_api.h

@@ -709,7 +709,7 @@ typedef struct sSirSmeStartBssReq {
 	uint32_t dtimPeriod;
 	uint8_t wps_state;
 	uint8_t isCoalesingInIBSSAllowed;       /* Coalesing on/off knob */
-	enum tQDF_ADAPTER_MODE bssPersona;
+	enum QDF_OPMODE bssPersona;
 
 	uint8_t txLdpcIniFeatureEnabled;
 
@@ -1186,7 +1186,7 @@ typedef struct sSirSmeJoinReq {
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	uint8_t cc_switch_mode;
 #endif
-	enum tQDF_ADAPTER_MODE staPersona;       /* Persona */
+	enum QDF_OPMODE staPersona;       /* Persona */
 	bool wps_registration;
 	ePhyChanBondState cbMode;       /* Pass CB mode value in Join. */
 
@@ -4029,7 +4029,7 @@ typedef struct {
 typedef struct sSirRateUpdateInd {
 	uint8_t nss;            /* 0: 1x1, 1: 2x2 */
 	struct qdf_mac_addr bssid;
-	enum tQDF_ADAPTER_MODE dev_mode;
+	enum QDF_OPMODE dev_mode;
 	int32_t bcastDataRate;  /* bcast rate unit Mbpsx10, -1:not used */
 	/*
 	 * 0 implies RA, positive value implies fixed rate, -1 implies ignore

core/mac/src/pe/include/lim_session.h

@@ -290,7 +290,7 @@ typedef struct sPESession       /* Added to Support BT-AMP */
 	uint32_t lim11hEnable;
 
 	int8_t maxTxPower;   /* MIN (Regulatory and local power constraint) */
-	enum tQDF_ADAPTER_MODE pePersona;
+	enum QDF_OPMODE pePersona;
 	int8_t txMgmtPower;
 	bool is11Rconnection;
 

core/sap/inc/sap_api.h

@@ -588,7 +588,7 @@ typedef struct sap_Config {
 	uint32_t ap_table_max_size;
 	uint32_t ap_table_expiration_time;
 	uint32_t ht_op_mode_fixed;
-	enum tQDF_ADAPTER_MODE persona; /* Tells us which persona, GO or AP */
+	enum QDF_OPMODE persona; /* Tells us which persona, GO or AP */
 	uint8_t disableDFSChSwitch;
 	bool enOverLapCh;
 #ifdef WLAN_FEATURE_11W
@@ -730,7 +730,7 @@ typedef struct sSapDfsInfo {
 typedef struct tagSapCtxList {
 	uint8_t sessionID;
 	void *pSapContext;
-	enum tQDF_ADAPTER_MODE sapPersona;
+	enum QDF_OPMODE sapPersona;
 } tSapCtxList, tpSapCtxList;
 
 typedef struct tagSapStruct {
@@ -833,7 +833,7 @@ QDF_STATUS wlansap_close(struct sap_context *sap_ctx);
  *         QDF_STATUS_SUCCESS: Success
  */
 QDF_STATUS wlansap_start(struct sap_context *sap_ctx,
-			 enum tQDF_ADAPTER_MODE mode,
+			 enum QDF_OPMODE mode,
 			 uint8_t *addr, uint32_t session_id);
 
 /**

core/sap/src/sap_fsm.c

@@ -3524,7 +3524,7 @@ static QDF_STATUS sap_fsm_state_started(struct sap_context *sap_ctx,
 			}
 		}
 	} else if (eSAP_CHANNEL_SWITCH_ANNOUNCEMENT_START == msg) {
-		enum tQDF_ADAPTER_MODE persona;
+		enum QDF_OPMODE persona;
 
 		if (!sap_ctx) {
 			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,

core/sap/src/sap_module.c

@@ -282,7 +282,7 @@ struct sap_context *wlansap_open(void)
 } /* wlansap_open */
 
 QDF_STATUS wlansap_start(struct sap_context *sap_ctx,
-			 enum tQDF_ADAPTER_MODE mode,
+			 enum QDF_OPMODE mode,
 			 uint8_t *addr, uint32_t session_id)
 {
 	QDF_STATUS qdf_ret_status;

core/sme/inc/csr_api.h

@@ -409,7 +409,7 @@ typedef struct tagCsrScanResultFilter {
 	uint8_t scan_filter_for_roam;
 	struct sCsrChannel_ pcl_channels;
 	struct qdf_mac_addr bssid_hint;
-	enum tQDF_ADAPTER_MODE csrPersona;
+	enum QDF_OPMODE csrPersona;
 	bool realm_check;
 	uint8_t fils_realm[2];
 } tCsrScanResultFilter;
@@ -990,7 +990,7 @@ typedef struct csr_roam_profile {
 	uint16_t cfg_protection;
 	uint8_t wps_state;
 	tCsrMobilityDomainInfo MDID;
-	enum tQDF_ADAPTER_MODE csrPersona;
+	enum QDF_OPMODE csrPersona;
 	uint8_t disableDFSChSwitch;
 	/* addIe params */
 	tSirAddIeParams addIeParams;

core/sme/inc/csr_internal.h

@@ -322,7 +322,7 @@ struct csr_roamstart_bssparams {
 	uint8_t ApUapsdEnable;
 	uint8_t ssidHidden;
 	uint8_t wps_state;
-	enum tQDF_ADAPTER_MODE bssPersona;
+	enum QDF_OPMODE bssPersona;
 	uint16_t nRSNIELength;  /* If 0, pRSNIE is ignored. */
 	uint8_t *pRSNIE;        /* If not null, it has IE byte stream for RSN */
 	/* Flag used to indicate update beaconInterval */
@@ -410,7 +410,7 @@ struct wmstatus_changecmd {
 struct addstafor_sessioncmd {
 	/* Session self mac addr */
 	tSirMacAddr selfMacAddr;
-	enum tQDF_ADAPTER_MODE currDeviceMode;
+	enum QDF_OPMODE currDeviceMode;
 	uint32_t type;
 	uint32_t subType;
 	uint8_t sessionId;
@@ -1517,7 +1517,7 @@ void purge_sme_session_active_scan_cmd_list(struct sAniSirGlobal *mac_ctx,
 		uint32_t session_id);
 bool csr_wait_for_connection_update(tpAniSirGlobal mac,
 		bool do_release_reacquire_lock);
-enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac,
+enum QDF_OPMODE csr_get_session_persona(tpAniSirGlobal pmac,
 					uint32_t session_id);
 void csr_roam_substate_change(
 			tpAniSirGlobal pMac, enum csr_roam_substate

core/sme/inc/csr_support.h

@@ -365,7 +365,7 @@ QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId,
 /* BeaconInterval validation for MCC support */
 QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal pMac, uint8_t channelId,
 		uint16_t *beaconInterval, uint32_t cursessionId,
-		enum tQDF_ADAPTER_MODE currBssPersona);
+		enum QDF_OPMODE currBssPersona);
 bool csr_is_profile11r(tCsrRoamProfile *pProfile);
 bool csr_is_auth_type11r(eCsrAuthType AuthType, uint8_t mdiePresent);
 #ifdef FEATURE_WLAN_ESE

core/sme/inc/sme_api.h

@@ -252,7 +252,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback,
 		uint8_t session_id, uint32_t type,
 		uint32_t subType);
 void sme_set_curr_device_mode(tHalHandle hHal,
-		enum tQDF_ADAPTER_MODE currDeviceMode);
+		enum QDF_OPMODE currDeviceMode);
 QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId,
 		csr_roamSessionCloseCallback callback,
 		void *pContext);
@@ -535,7 +535,7 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid,
 QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t db);
 QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 		struct qdf_mac_addr bssid,
-		enum tQDF_ADAPTER_MODE dev_mode, int power);
+		enum QDF_OPMODE dev_mode, int power);
 QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr);
 QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId,
 		uint8_t ssidHidden);
@@ -1250,7 +1250,7 @@ QDF_STATUS sme_process_mac_pwr_dbg_cmd(tHalHandle hal, uint32_t session_id,
 				       struct sir_mac_pwr_dbg_cmd*
 				       dbg_args);
 
-void sme_get_vdev_type_nss(enum tQDF_ADAPTER_MODE dev_mode,
+void sme_get_vdev_type_nss(enum QDF_OPMODE dev_mode,
 			   uint8_t *nss_2g, uint8_t *nss_5g);
 QDF_STATUS sme_roam_set_default_key_index(tHalHandle hal, uint8_t session_id,
 					  uint8_t default_idx);

core/sme/inc/sme_internal.h

@@ -176,7 +176,7 @@ typedef struct tagSmeStruct {
 	/* following pointer contains array of pointers for tSmeCmd* */
 	void **pSmeCmdBufAddr;
 	tDblLinkList smeCmdFreeList;    /* preallocated roam cmd list */
-	enum tQDF_ADAPTER_MODE currDeviceMode;
+	enum QDF_OPMODE currDeviceMode;
 	tSmePeerInfoHddCbkInfo peerInfoParams;
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR
 	host_event_wlan_status_payload_type eventPayload;

core/sme/src/common/sme_api.c

@@ -6422,7 +6422,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr)
  */
 QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 			   struct qdf_mac_addr pBSSId,
-			   enum tQDF_ADAPTER_MODE dev_mode, int dBm)
+			   enum QDF_OPMODE dev_mode, int dBm)
 {
 	struct scheduler_msg msg = {0};
 	tpMaxTxPowerParams pTxParams = NULL;
@@ -8795,7 +8795,7 @@ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value)
  * currDeviceMode - Current operating device mode.
  */
 void sme_set_curr_device_mode(tHalHandle hHal,
-				enum tQDF_ADAPTER_MODE currDeviceMode)
+				enum QDF_OPMODE currDeviceMode)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
@@ -14677,7 +14677,7 @@ QDF_STATUS sme_process_mac_pwr_dbg_cmd(tHalHandle hal, uint32_t session_id,
  *
  * Return: None
  */
-void sme_get_vdev_type_nss(enum tQDF_ADAPTER_MODE dev_mode,
+void sme_get_vdev_type_nss(enum QDF_OPMODE dev_mode,
 			   uint8_t *nss_2g, uint8_t *nss_5g)
 {
 	tpAniSirGlobal mac_ctx = sme_get_mac_context();

core/sme/src/csr/csr_api_roam.c

@@ -281,7 +281,7 @@ tListElem *csr_roam_find_in_pe_stats_req_list(
 static QDF_STATUS csr_roam_dereg_statistics_req(tpAniSirGlobal pMac);
 static uint32_t csr_find_ibss_session(tpAniSirGlobal pMac);
 static uint32_t csr_find_session_by_type(tpAniSirGlobal,
-					enum tQDF_ADAPTER_MODE);
+					enum QDF_OPMODE);
 static bool csr_is_conn_allow_2g_band(tpAniSirGlobal pMac,
 						uint32_t chnl);
 static bool csr_is_conn_allow_5g_band(tpAniSirGlobal pMac,
@@ -16190,7 +16190,7 @@ QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg)
  * Return: None
  */
 void csr_get_vdev_type_nss(tpAniSirGlobal mac_ctx,
-		enum tQDF_ADAPTER_MODE dev_mode,
+		enum QDF_OPMODE dev_mode,
 		uint8_t *nss_2g, uint8_t *nss_5g)
 {
 	switch (dev_mode) {
@@ -20089,7 +20089,7 @@ static void csr_init_operating_classes(tHalHandle hHal)
  * Return: session id for give session type.
  **/
 static uint32_t
-csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum tQDF_ADAPTER_MODE type)
+csr_find_session_by_type(tpAniSirGlobal mac_ctx, enum QDF_OPMODE type)
 {
 	uint32_t i, session_id = CSR_SESSION_ID_INVALID;
 	struct csr_roam_session *session_ptr;

core/sme/src/csr/csr_inside_api.h

@@ -673,7 +673,7 @@ bool csr_is_profile_wapi(tCsrRoamProfile *pProfile);
 #endif /* FEATURE_WLAN_WAPI */
 
 void csr_get_vdev_type_nss(tpAniSirGlobal mac_ctx,
-		enum tQDF_ADAPTER_MODE dev_mode,
+		enum QDF_OPMODE dev_mode,
 		uint8_t *nss_2g, uint8_t *nss_5g);
 
 #ifdef FEATURE_WLAN_DIAG_SUPPORT_CSR

core/sme/src/csr/csr_util.c

@@ -927,7 +927,7 @@ uint8_t csr_get_concurrent_operation_channel(tpAniSirGlobal mac_ctx)
 {
 	struct csr_roam_session *session = NULL;
 	uint8_t i = 0;
-	enum tQDF_ADAPTER_MODE persona;
+	enum QDF_OPMODE persona;
 
 	for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) {
 		if (!CSR_IS_SESSION_VALID(mac_ctx, i))
@@ -1371,7 +1371,7 @@ bool csr_is_p2p_session_connected(tpAniSirGlobal pMac)
 {
 	uint32_t i;
 	struct csr_roam_session *pSession = NULL;
-	enum tQDF_ADAPTER_MODE persona;
+	enum QDF_OPMODE persona;
 
 	for (i = 0; i < CSR_ROAM_SESSION_MAX; i++) {
 		if (!CSR_IS_SESSION_VALID(pMac, i))
@@ -2789,7 +2789,7 @@ QDF_STATUS csr_validate_mcc_beacon_interval(tpAniSirGlobal mac_ctx,
 					uint8_t chnl_id,
 					uint16_t *bcn_interval,
 					uint32_t cur_session_id,
-					enum tQDF_ADAPTER_MODE cur_bss_persona)
+					enum QDF_OPMODE cur_bss_persona)
 {
 	uint32_t session_id = 0;
 	QDF_STATUS status;
@@ -6694,9 +6694,9 @@ bool csr_wait_for_connection_update(tpAniSirGlobal mac,
  *
  * This function is to return the persona of a session
  *
- * Reture: enum tQDF_ADAPTER_MODE persona
+ * Reture: enum QDF_OPMODE persona
  */
-enum tQDF_ADAPTER_MODE csr_get_session_persona(tpAniSirGlobal pmac,
+enum QDF_OPMODE csr_get_session_persona(tpAniSirGlobal pmac,
 					uint32_t session_id)
 {
 	struct csr_roam_session *session = NULL;

core/wma/inc/wma_if.h

@@ -1149,7 +1149,7 @@ typedef struct sMaxTxPowerParams {
 	 * power == tx power used for management frames.
 	 */
 	int8_t power;
-	enum tQDF_ADAPTER_MODE dev_mode;
+	enum QDF_OPMODE dev_mode;
 } tMaxTxPowerParams, *tpMaxTxPowerParams;
 
 /**
@@ -1180,7 +1180,7 @@ typedef struct sMaxTxPowerPerBandParams {
  */
 struct add_sta_self_params {
 	tSirMacAddr self_mac_addr;
-	enum tQDF_ADAPTER_MODE curr_device_mode;
+	enum QDF_OPMODE curr_device_mode;
 	uint32_t type;
 	uint32_t sub_type;
 	uint8_t session_id;