qcacld-3.0: Modify hdd_cm_is_vdev_associated() API

To get the associated state of each underlying vdev in
adapter, this API needs to be called with link info
argument to get the corresponding vdev.

Modify the function prototype to take link info as
argument instead of adapter.

Change-Id: If7d0d3930581df644905ffccaa355a2e32de46e0
CRs-Fixed: 3451564

core/hdd/src/wlan_hdd_apf.c

@@ -227,7 +227,7 @@ static int hdd_set_reset_apf_offload(struct hdd_context *hdd_ctx,
 	int prog_len;
 	int ret = 0;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Not in Connected state!");
 		return -ENOTSUPP;
 	}

core/hdd/src/wlan_hdd_assoc.c

@@ -498,7 +498,7 @@ enum band_info hdd_conn_get_connected_band(struct hdd_adapter *adapter)
 	uint32_t sta_freq = 0;
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (hdd_cm_is_vdev_associated(adapter))
+	if (hdd_cm_is_vdev_associated(adapter->deflink))
 		sta_freq = sta_ctx->conn_info.chan_freq;
 
 	if (wlan_reg_is_24ghz_ch_freq(sta_freq))
@@ -525,7 +525,7 @@ hdd_conn_get_connected_cipher_algo(struct hdd_adapter *adapter,
 {
 	bool connected = false;
 
-	connected = hdd_cm_is_vdev_associated(adapter);
+	connected = hdd_cm_is_vdev_associated(adapter->deflink);
 
 	if (pConnectedCipherAlgo)
 		*pConnectedCipherAlgo = sta_ctx->conn_info.uc_encrypt_type;
@@ -1653,7 +1653,7 @@ hdd_roam_mic_error_indication_handler(struct hdd_adapter *adapter,
 {
 	tSirMicFailureInfo *mic_failure_info;
 
-	if (!hdd_cm_is_vdev_associated(adapter))
+	if (!hdd_cm_is_vdev_associated(adapter->deflink))
 		return;
 
 	mic_failure_info = roam_info->u.pMICFailureInfo;

core/hdd/src/wlan_hdd_bcn_recv.c

@@ -282,7 +282,7 @@ static int hdd_handle_beacon_reporting_stop_op(struct hdd_context *hdd_ctx,
 		return errno;
 	}
 
-	if (hdd_cm_is_vdev_associated(adapter))
+	if (hdd_cm_is_vdev_associated(adapter->deflink))
 		/* Add beacon filter */
 		if (hdd_add_beacon_filter(adapter)) {
 			hdd_err("Beacon filter addition failed");
@@ -337,7 +337,7 @@ static int __wlan_hdd_cfg80211_bcn_rcv_op(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("STA not in connected state");
 		return -EINVAL;
 	}

core/hdd/src/wlan_hdd_bss_transition.c

@@ -147,7 +147,7 @@ __wlan_hdd_cfg80211_fetch_bss_transition_status(struct wiphy *wiphy,
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
 	if (adapter->device_mode != QDF_STA_MODE ||
-	    !hdd_cm_is_vdev_associated(adapter)) {
+	    !hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Command is either not invoked for STA mode (device mode: %d) or STA is not associated (Connection state: %d)",
 			adapter->device_mode, hdd_sta_ctx->conn_info.conn_state);
 		return -EINVAL;

core/hdd/src/wlan_hdd_cfg80211.c

@@ -7161,7 +7161,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 			 *  check if the channel has REGULATORY_CHAN_RADAR
 			 *  channel flag to identify if the channel is DFS
 			 */
-			if (hdd_cm_is_vdev_associated(adapter) &&
+			if (hdd_cm_is_vdev_associated(adapter->deflink) &&
 			    wlan_reg_is_dfs_for_freq(
 				    hdd_ctx->pdev,
 				    sta_ctx->conn_info.chan_freq)) {
@@ -13564,7 +13564,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 	uint16_t eth_type = htons(ETH_P_IP);
 	mac_handle_t mac_handle;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Not in Connected state!");
 		return -ENOTSUPP;
 	}
@@ -14450,7 +14450,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-		if (!hdd_cm_is_vdev_associated(adapter) ||
+		if (!hdd_cm_is_vdev_associated(adapter->deflink) ||
 		    qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes,
 			peer_mac, QDF_MAC_ADDR_SIZE)) {
 			hdd_err("Not Associated to mac "QDF_MAC_ADDR_FMT,
@@ -16657,7 +16657,7 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy,
 
 	ret = qdf_status_to_os_return(qdf_status);
 
-	if (hdd_cm_is_vdev_associated(adapter) &&
+	if (hdd_cm_is_vdev_associated(adapter->deflink) &&
 	    roaming_enabled &&
 	    QDF_IS_STATUS_SUCCESS(qdf_status) && !is_fast_roam_enabled) {
 		INIT_COMPLETION(adapter->lfr_fw_status.disable_lfr_event);
@@ -16939,7 +16939,7 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not Associated");
 		return 0;
 	}
@@ -24247,7 +24247,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 		   adapter->deflink->vdev_id, 0);
 
 	/* Added for debug on reception of Re-assoc Req. */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Called with Ie of length = %zu when not associated",
 		       ftie->ie_len);
 		hdd_err("Should be Re-assoc Req IEs");
@@ -26357,7 +26357,7 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 	    (adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
 		struct hdd_station_ctx *sta_ctx;
 
-		if (!hdd_cm_is_vdev_associated(adapter))
+		if (!hdd_cm_is_vdev_associated(adapter->deflink))
 			return -EINVAL;
 
 		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
@@ -26397,8 +26397,7 @@ static int __wlan_hdd_cfg80211_get_channel(struct wiphy *wiphy,
 	if (adapter->device_mode == QDF_STA_MODE) {
 		vdev_id = wlan_vdev_get_id(vdev);
 		link_info = hdd_get_link_info_by_vdev(hdd_ctx, vdev_id);
-		if (!link_info ||
-		    !hdd_cm_is_vdev_associated(link_info->adapter)) {
+		if (!link_info || !hdd_cm_is_vdev_associated(link_info)) {
 			wlan_key_put_link_vdev(vdev, WLAN_OSIF_ID);
 			return -EBUSY;
 		}

core/hdd/src/wlan_hdd_cm_api.h

@@ -328,11 +328,11 @@ void hdd_cm_save_connect_status(struct hdd_adapter *adapter,
 
 /**
  * hdd_cm_is_vdev_associated() - Checks if vdev is associated or not
- * @adapter: pointer to the adapter structure
+ * @link_info: pointer to the link info structure
  *
  * Returns: True if vdev is associated else false
  */
-bool hdd_cm_is_vdev_associated(struct hdd_adapter *adapter);
+bool hdd_cm_is_vdev_associated(struct wlan_hdd_link_info *link_info);
 
 /**
  * hdd_cm_is_vdev_connected() - Checks if vdev is connected or not

core/hdd/src/wlan_hdd_cm_connect.c

@@ -57,19 +57,19 @@
 #include "wlan_psoc_mlme_ucfg_api.h"
 #include "wlan_action_oui_ucfg_api.h"
 
-bool hdd_cm_is_vdev_associated(struct hdd_adapter *adapter)
+bool hdd_cm_is_vdev_associated(struct wlan_hdd_link_info *link_info)
 {
 	struct wlan_objmgr_vdev *vdev;
 	bool is_vdev_active;
 	enum QDF_OPMODE opmode;
 	struct hdd_station_ctx *sta_ctx;
 
-	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (adapter->device_mode == QDF_NDI_MODE)
+	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(link_info);
+	if (link_info->adapter->device_mode == QDF_NDI_MODE)
 		return (sta_ctx->conn_info.conn_state ==
 			eConnectionState_NdiConnected);
 
-	vdev = hdd_objmgr_get_vdev_by_user(adapter->deflink, WLAN_OSIF_CM_ID);
+	vdev = hdd_objmgr_get_vdev_by_user(link_info, WLAN_OSIF_CM_ID);
 	if (!vdev)
 		return false;
 

core/hdd/src/wlan_hdd_dcs.c

@@ -95,7 +95,7 @@ static QDF_STATUS hdd_dcs_switch_chan_cb(struct wlan_objmgr_vdev *vdev,
 
 	switch (adapter->device_mode) {
 	case QDF_STA_MODE:
-		if (!hdd_cm_is_vdev_associated(adapter))
+		if (!hdd_cm_is_vdev_associated(adapter->deflink))
 			return QDF_STATUS_E_INVAL;
 
 		bssid = &adapter->deflink->session.station.conn_info.bssid;

core/hdd/src/wlan_hdd_debugfs.c

@@ -348,7 +348,7 @@ static ssize_t __wcnss_patterngen_write(struct net_device *net_dev,
 	 */
 	hdd_debug("device mode %d", adapter->device_mode);
 	if ((QDF_STA_MODE == adapter->device_mode) &&
-	    (!hdd_cm_is_vdev_associated(adapter))) {
+	    (!hdd_cm_is_vdev_associated(adapter->deflink))) {
 		hdd_err("Not in Connected state!");
 		goto failure;
 	}

core/hdd/src/wlan_hdd_debugfs_offload.c

@@ -403,7 +403,7 @@ wlan_hdd_debugfs_update_filters_info(struct hdd_context *hdd_ctx,
 	}
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		ret_val = scnprintf(buf + len, buf_avail_len - len,
 				    "\nSTA is not connected\n");
 		if (ret_val <= 0)

core/hdd/src/wlan_hdd_hostapd.c

@@ -3409,7 +3409,7 @@ int hdd_softap_set_channel_change(struct net_device *dev, int target_chan_freq,
 	 */
 	if (sta_adapter && conc_rule1) {
 		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(sta_adapter->deflink);
-		if (hdd_cm_is_vdev_associated(sta_adapter)) {
+		if (hdd_cm_is_vdev_associated(sta_adapter->deflink)) {
 			hdd_err("Channel switch not allowed after STA connection with conc_custom_rule1 enabled");
 			return -EBUSY;
 		}

core/hdd/src/wlan_hdd_ioctl.c

@@ -746,7 +746,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	/* if not associated, no need to send action frame */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_warn("Not associated");
 		ret = -EINVAL;
 		goto exit;
@@ -2227,7 +2227,7 @@ static int wlan_hdd_get_link_status(struct hdd_adapter *adapter)
 	}
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		/* If not associated, then expected link status return
 		 * value is 0
 		 */
@@ -4420,7 +4420,7 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	/* if not associated, no need to proceed with reassoc */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_warn("Not associated!");
 		ret = -EINVAL;
 		goto exit;
@@ -4779,7 +4779,7 @@ static int drv_cmd_get_tsm_stats(struct hdd_adapter *adapter,
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
 
 	/* if not associated, return error */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Not associated!");
 		ret = -EINVAL;
 		goto exit;
@@ -4920,7 +4920,7 @@ static int drv_cmd_ccx_beacon_req(struct hdd_adapter *adapter,
 		goto exit;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not associated");
 
 		if (!req.numBcnReqIe)
@@ -5556,7 +5556,7 @@ static int hdd_set_rx_filter(struct hdd_adapter *adapter, bool action,
 	if (((adapter->device_mode == QDF_STA_MODE) ||
 		(adapter->device_mode == QDF_P2P_CLIENT_MODE)) &&
 		adapter->mc_addr_list.mc_cnt &&
-		hdd_cm_is_vdev_associated(adapter)) {
+		hdd_cm_is_vdev_associated(adapter->deflink)) {
 
 
 		filter = qdf_mem_malloc(sizeof(*filter));

core/hdd/src/wlan_hdd_main.c

@@ -725,7 +725,7 @@ uint32_t hdd_get_adapter_home_channel(struct hdd_adapter *adapter)
 			adapter->deflink->session.ap.operating_chan_freq;
 	} else if ((adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
-		   hdd_cm_is_vdev_associated(adapter)) {
+		   hdd_cm_is_vdev_associated(adapter->deflink)) {
 		home_chan_freq =
 			adapter->deflink->session.station.conn_info.chan_freq;
 	}
@@ -750,7 +750,7 @@ enum phy_ch_width hdd_get_adapter_width(struct hdd_adapter *adapter)
 		width = adapter->deflink->session.ap.sap_config.ch_params.ch_width;
 	} else if ((adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
-		   hdd_cm_is_vdev_associated(adapter)) {
+		   hdd_cm_is_vdev_associated(adapter->deflink)) {
 		width = adapter->deflink->session.station.conn_info.ch_width;
 	}
 	return width;
@@ -5068,7 +5068,7 @@ static int __hdd_open(struct net_device *dev)
 	}
 
 	set_bit(DEVICE_IFACE_OPENED, &adapter->event_flags);
-	if (hdd_cm_is_vdev_associated(adapter)) {
+	if (hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Enabling Tx Queues");
 		/* Enable TX queues only when we are connected */
 		wlan_hdd_netif_queue_control(adapter,
@@ -6732,7 +6732,7 @@ bool hdd_is_vdev_in_conn_state(struct hdd_adapter *adapter)
 	case QDF_STA_MODE:
 	case QDF_P2P_CLIENT_MODE:
 	case QDF_P2P_DEVICE_MODE:
-		return hdd_cm_is_vdev_associated(adapter);
+		return hdd_cm_is_vdev_associated(adapter->deflink);
 	case QDF_SAP_MODE:
 	case QDF_P2P_GO_MODE:
 		return (test_bit(SOFTAP_BSS_STARTED,
@@ -10950,7 +10950,7 @@ bool wlan_hdd_sta_get_dot11mode(hdd_cb_handle context, uint8_t vdev_id,
 	if (!link_info)
 		return false;
 
-	if (!hdd_cm_is_vdev_associated(link_info->adapter))
+	if (!hdd_cm_is_vdev_associated(link_info))
 		return false;
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(link_info);
@@ -11430,7 +11430,7 @@ __hdd_adapter_param_update_work(struct hdd_adapter *adapter)
 	 * the features that are to be updated.
 	 * So in case of interface disconnect skip feature update.
 	 */
-	if (!hdd_cm_is_vdev_associated(adapter))
+	if (!hdd_cm_is_vdev_associated(adapter->deflink))
 		return;
 
 	hdd_netdev_update_features(adapter);
@@ -16727,7 +16727,7 @@ wlan_hdd_disable_roaming(struct hdd_adapter *cur_adapter,
 		vdev_id = adapter->deflink->vdev_id;
 		if (cur_adapter->deflink->vdev_id != vdev_id &&
 		    adapter->device_mode == QDF_STA_MODE &&
-		    hdd_cm_is_vdev_associated(adapter)) {
+		    hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_debug("%d Disable roaming", vdev_id);
 			sme_stop_roaming(hdd_ctx->mac_handle, vdev_id,
 					 REASON_DRIVER_DISABLED,
@@ -16756,7 +16756,7 @@ wlan_hdd_enable_roaming(struct hdd_adapter *cur_adapter,
 		vdev_id = adapter->deflink->vdev_id;
 		if (cur_adapter->deflink->vdev_id != vdev_id &&
 		    adapter->device_mode == QDF_STA_MODE &&
-		    hdd_cm_is_vdev_associated(adapter)) {
+		    hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_debug("%d Enable roaming", vdev_id);
 			sme_start_roaming(hdd_ctx->mac_handle, vdev_id,
 					  REASON_DRIVER_ENABLED,
@@ -16887,6 +16887,8 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 	struct hdd_adapter *adapter, *next_adapter = NULL;
 	bool ap_connected = false, sta_connected = false;
 	mac_handle_t mac_handle;
+	struct wlan_hdd_link_info *link_info;
+	struct hdd_ap_ctx *ap_ctx;
 	wlan_net_dev_ref_dbgid dbgid = NET_DEV_HOLD_AUTO_SHUTDOWN_ENABLE;
 
 	mac_handle = hdd_ctx->mac_handle;
@@ -16910,8 +16912,9 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 	if (policy_mgr_concurrent_open_sessions_running(hdd_ctx->psoc)) {
 		hdd_for_each_adapter_dev_held_safe(hdd_ctx, adapter,
 						   next_adapter, dbgid) {
+			link_info = adapter->deflink;
 			if (adapter->device_mode == QDF_STA_MODE) {
-				if (hdd_cm_is_vdev_associated(adapter)) {
+				if (hdd_cm_is_vdev_associated(link_info)) {
 					sta_connected = true;
 					hdd_adapter_dev_put_debug(adapter,
 								  dbgid);
@@ -16924,8 +16927,8 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 			}
 
 			if (adapter->device_mode == QDF_SAP_MODE) {
-				if (WLAN_HDD_GET_AP_CTX_PTR(adapter->deflink)->
-				    ap_active == true) {
+				ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(link_info);
+				if (ap_ctx->ap_active == true) {
 					ap_connected = true;
 					hdd_adapter_dev_put_debug(adapter,
 								  dbgid);
@@ -17011,7 +17014,7 @@ bool hdd_is_any_adapter_connected(struct hdd_context *hdd_ctx)
 	hdd_for_each_adapter_dev_held_safe(hdd_ctx, adapter, next_adapter,
 					   dbgid) {
 		if (hdd_adapter_is_sta(adapter) &&
-		    hdd_cm_is_vdev_associated(adapter)) {
+		    hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_adapter_dev_put_debug(adapter, dbgid);
 			if (next_adapter)
 				hdd_adapter_dev_put_debug(next_adapter,
@@ -19781,7 +19784,7 @@ static QDF_STATUS hdd_is_connection_in_progress_iterator(
 		(QDF_P2P_DEVICE_MODE == adapter->device_mode)) {
 		hdd_sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-		if (hdd_cm_is_vdev_associated(adapter)
+		if (hdd_cm_is_vdev_associated(adapter->deflink)
 		    && sme_is_sta_key_exchange_in_progress(
 		    mac_handle, adapter->deflink->vdev_id)) {
 			sta_mac = (uint8_t *)&(adapter->mac_addr.bytes[0]);

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -142,7 +142,7 @@ static bool hdd_is_ndp_allowed(struct hdd_context *hdd_ctx)
 		case QDF_P2P_CLIENT_MODE:
 			sta_ctx =
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-			if (hdd_cm_is_vdev_associated(adapter) ||
+			if (hdd_cm_is_vdev_associated(adapter->deflink) ||
 			    hdd_cm_is_connecting(adapter)) {
 				hdd_adapter_dev_put_debug(adapter, dbgid);
 				if (next_adapter)
@@ -183,7 +183,7 @@ static bool hdd_is_ndp_allowed(struct hdd_context *hdd_ctx)
 		case QDF_P2P_CLIENT_MODE:
 			sta_ctx =
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-			if (hdd_cm_is_vdev_associated(adapter) ||
+			if (hdd_cm_is_vdev_associated(adapter->deflink) ||
 			    hdd_cm_is_connecting(adapter)) {
 				hdd_adapter_dev_put_debug(adapter, dbgid);
 				if (next_adapter)

core/hdd/src/wlan_hdd_nud_tracking.c

@@ -94,7 +94,7 @@ static void __hdd_nud_failure_work(struct hdd_adapter *adapter)
 	if (0 != status)
 		return;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not in Connected State");
 		return;
 	}

core/hdd/src/wlan_hdd_power.c

@@ -1603,7 +1603,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
 
-	if (!hdd_cm_is_vdev_associated(adapter))
+	if (!hdd_cm_is_vdev_associated(adapter->deflink))
 		return;
 
 	status = ucfg_pmo_enable_mc_addr_filtering_in_fwr(
@@ -1624,7 +1624,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
 
-	if (!hdd_cm_is_vdev_associated(adapter))
+	if (!hdd_cm_is_vdev_associated(adapter->deflink))
 		return;
 
 	status = ucfg_pmo_disable_mc_addr_filtering_in_fwr(
@@ -1650,7 +1650,7 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	QDF_STATUS status;
 
-	if (!hdd_cm_is_vdev_associated(adapter))
+	if (!hdd_cm_is_vdev_associated(adapter->deflink))
 		goto flush_mc_list;
 
 	/* disable mc list first because the mc list is cached in PMO */
@@ -1679,7 +1679,7 @@ flush_mc_list:
 static void hdd_update_conn_state_mask(struct hdd_adapter *adapter,
 				       uint32_t *conn_state_mask)
 {
-	if (hdd_cm_is_vdev_associated(adapter))
+	if (hdd_cm_is_vdev_associated(adapter->deflink))
 		*conn_state_mask |= (1 << adapter->deflink->vdev_id);
 }
 
@@ -2918,7 +2918,7 @@ static int wlan_hdd_set_ps(struct wlan_objmgr_psoc *psoc,
 
 	status = wlan_hdd_set_powersave(adapter, allow_power_save, timeout);
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("vdev[%d] mode %d disconnected ignore dhcp protection",
 			  adapter->deflink->vdev_id, adapter->device_mode);
 		return status;
@@ -3138,7 +3138,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 		struct hdd_station_ctx *sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
 
-		if (hdd_cm_is_vdev_associated(adapter))
+		if (hdd_cm_is_vdev_associated(adapter->deflink))
 			qdf_copy_macaddr(&bssid, &sta_ctx->conn_info.bssid);
 	}
 
@@ -3400,7 +3400,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 			hdd_debug("Roaming is in progress, rej this req");
 			return -EINVAL;
 		}
-		if (!hdd_cm_is_vdev_associated(adapter)) {
+		if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_debug("Not associated");
 			return 0;
 		}

core/hdd/src/wlan_hdd_rssi_monitor.c

@@ -90,7 +90,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy,
 	if (ret)
 		return ret;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Not in Connected state!");
 		return -ENOTSUPP;
 	}

core/hdd/src/wlan_hdd_scan.c

@@ -493,7 +493,8 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 	enable_connected_scan = ucfg_scan_is_connected_scan_enabled(
 							hdd_ctx->psoc);
-	if (hdd_cm_is_vdev_associated(adapter) && !enable_connected_scan) {
+	if (!enable_connected_scan &&
+	    hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_info("enable_connected_scan is false, Aborting scan");
 		if (wlan_hdd_enqueue_blocked_scan_request(dev, request, source))
 			return -EAGAIN;
@@ -1316,7 +1317,8 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 
 	enable_connected_scan = ucfg_scan_is_connected_scan_enabled(
 							hdd_ctx->psoc);
-	if (hdd_cm_is_vdev_associated(adapter) && !enable_connected_scan) {
+	if (!enable_connected_scan &&
+	    hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_info("enable_connected_scan is false, Aborting scan");
 		return -EBUSY;
 	}

core/hdd/src/wlan_hdd_son.c

@@ -2372,7 +2372,7 @@ static QDF_STATUS hdd_son_get_node_info_sta(struct wlan_objmgr_vdev *vdev,
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return QDF_STATUS_E_FAILURE;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug_rl("STA adapter not connected");
 		/* Still return success and framework will see default stats */
 		return QDF_STATUS_SUCCESS;

core/hdd/src/wlan_hdd_station_info.c

@@ -421,7 +421,7 @@ static int32_t hdd_add_tx_bitrate(struct sk_buff *skb,
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
 
 	/* cfg80211_calculate_bitrate will return 0 for mcs >= 32 */
-	if (hdd_cm_is_vdev_associated(adapter))
+	if (hdd_cm_is_vdev_associated(adapter->deflink))
 		bitrate = cfg80211_calculate_bitrate(
 				&sta_ctx->cache_conn_info.max_tx_bitrate);
 	else
@@ -516,7 +516,7 @@ static int32_t hdd_add_sta_info(struct sk_buff *skb,
 		hdd_err("put fail");
 		goto fail;
 	}
-	if (hdd_cm_is_vdev_associated(adapter))
+	if (hdd_cm_is_vdev_associated(adapter->deflink))
 		hdd_get_max_tx_bitrate(hdd_ctx, adapter);
 
 	if (hdd_add_tx_bitrate(skb, adapter, NL80211_STA_INFO_TX_BITRATE)) {

core/hdd/src/wlan_hdd_stats.c

@@ -902,14 +902,14 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 				  adapter->deflink->vdev_id);
 			info->state = WIFI_ASSOCIATING;
 		}
-		if (hdd_cm_is_vdev_associated(adapter) &&
+		if (hdd_cm_is_vdev_associated(adapter->deflink) &&
 		    !sta_ctx->conn_info.is_authenticated) {
 			hdd_err("client " QDF_MAC_ADDR_FMT
 				" is in the middle of WPS/EAPOL exchange.",
 				QDF_MAC_ADDR_REF(adapter->mac_addr.bytes));
 			info->state = WIFI_AUTHENTICATING;
 		}
-		if (hdd_cm_is_vdev_associated(adapter)) {
+		if (hdd_cm_is_vdev_associated(adapter->deflink)) {
 			info->state = WIFI_ASSOCIATED;
 			qdf_copy_macaddr(&info->bssid,
 					 &sta_ctx->conn_info.bssid);
@@ -6531,7 +6531,7 @@ static int wlan_hdd_get_sta_stats(struct hdd_adapter *adapter,
 		   TRACE_CODE_HDD_CFG80211_GET_STA,
 		   adapter->deflink->vdev_id, 0);
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not associated");
 		/*To keep GUI happy */
 		return 0;
@@ -7120,7 +7120,7 @@ static bool hdd_is_rcpi_applicable(struct hdd_adapter *adapter,
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-		if (!hdd_cm_is_vdev_associated(adapter))
+		if (!hdd_cm_is_vdev_associated(adapter->deflink))
 			return false;
 
 		if (hdd_cm_is_vdev_roaming(adapter)) {
@@ -7372,7 +7372,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 		return QDF_STATUS_SUCCESS;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not associated!, rssi on disconnect %d",
 			  adapter->deflink->rssi_on_disconnect);
 		*rssi_value = adapter->deflink->rssi_on_disconnect;
@@ -7622,7 +7622,7 @@ int wlan_hdd_get_link_speed(struct hdd_adapter *adapter, uint32_t *link_speed)
 		return -ENOTSUPP;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		/* we are not connected so we don't have a classAstats */
 		*link_speed = 0;
 	} else {

core/hdd/src/wlan_hdd_subnet_detect.c

@@ -105,7 +105,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy,
 		return -ENOTSUPP;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Received GW param update in disconnected state!");
 		return -ENOTSUPP;
 	}

core/hdd/src/wlan_hdd_sysfs.c

@@ -423,7 +423,7 @@ static ssize_t __show_beacon_reception_stats(struct net_device *net_dev,
 		return -ENOTSUPP;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Adapter is not in connected state");
 		return -EINVAL;
 	}

core/hdd/src/wlan_hdd_sysfs_connect_info.c

@@ -315,7 +315,7 @@ static ssize_t wlan_hdd_connect_info(struct hdd_adapter *adapter, uint8_t *buf,
 	int ret_val;
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		ret_val = scnprintf(buf, buf_avail_len,
 				    "\nSTA is not connected\n");
 		if (ret_val >= 0)

core/hdd/src/wlan_hdd_tsf.c

@@ -133,15 +133,14 @@ enum hdd_tsf_get_state hdd_tsf_check_conn_state(struct hdd_adapter *adapter)
 	enum hdd_tsf_get_state ret = TSF_RETURN;
 
 	if (adapter->device_mode == QDF_STA_MODE ||
-			adapter->device_mode == QDF_P2P_CLIENT_MODE) {
-		if (!hdd_cm_is_vdev_associated(adapter)) {
+	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
+		if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_err("failed to cap tsf, not connect with ap");
 			ret = TSF_STA_NOT_CONNECTED_NO_TSF;
 		}
 	} else if ((adapter->device_mode == QDF_SAP_MODE ||
-				adapter->device_mode == QDF_P2P_GO_MODE) &&
-			!(test_bit(SOFTAP_BSS_STARTED,
-					&adapter->event_flags))) {
+		    adapter->device_mode == QDF_P2P_GO_MODE) &&
+		   !(test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))) {
 		hdd_err("Soft AP / P2p GO not beaconing");
 		ret = TSF_SAP_NOT_STARTED_NO_TSF;
 	}
@@ -1794,7 +1793,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 				 "TSF sync is not initialized\n");
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter) &&
+	if (!hdd_cm_is_vdev_associated(adapter->deflink) &&
 	    (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE))
 		return scnprintf(buf, PAGE_SIZE, "NOT connected\n");
@@ -1958,7 +1957,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 				 "TSF sync is not initialized\n");
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter) &&
+	if (!hdd_cm_is_vdev_associated(adapter->deflink) &&
 	    (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE))
 		return scnprintf(buf, PAGE_SIZE, "NOT connected\n");

core/hdd/src/wlan_hdd_twt.c

@@ -601,7 +601,7 @@ int hdd_test_config_twt_setup_session(struct hdd_adapter *adapter,
 	}
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err_rl("Invalid state, vdev %d mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 		return -EINVAL;
@@ -668,7 +668,7 @@ int hdd_test_config_twt_terminate_session(struct hdd_adapter *adapter,
 	}
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err_rl("Invalid state, vdev %d mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 		return -EINVAL;
@@ -1017,7 +1017,7 @@ static int hdd_is_twt_command_allowed(struct hdd_adapter *adapter)
 	    adapter->device_mode != QDF_P2P_CLIENT_MODE)
 		return -EOPNOTSUPP;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err_rl("Invalid state, vdev %d mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 		return -EAGAIN;
@@ -2394,7 +2394,7 @@ hdd_send_twt_del_all_sessions_to_userspace(struct hdd_adapter *adapter)
 	struct wmi_twt_del_dialog_complete_event_param params;
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Not associated, vdev %d mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 		return;
@@ -2625,7 +2625,7 @@ static int hdd_sta_twt_terminate_session(struct hdd_adapter *adapter,
 	int id, ret;
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err_rl("Invalid state, vdev %d mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 
@@ -3633,7 +3633,7 @@ static int hdd_twt_get_capabilities(struct hdd_adapter *adapter,
 		return -EOPNOTSUPP;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err_rl("vdev %d not in connected state, mode %d",
 			   adapter->deflink->vdev_id, adapter->device_mode);
 		return -EAGAIN;

core/hdd/src/wlan_hdd_tx_rx.c

@@ -1662,7 +1662,7 @@ void wlan_hdd_set_tx_flow_info(void)
 		case QDF_P2P_CLIENT_MODE:
 			sta_ctx =
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-			if (hdd_cm_is_vdev_associated(adapter)) {
+			if (hdd_cm_is_vdev_associated(adapter->deflink)) {
 				chan_freq = sta_ctx->conn_info.chan_freq;
 				sta_chan = wlan_reg_freq_to_chan(hdd_ctx->pdev,
 								 chan_freq);

core/hdd/src/wlan_hdd_wext.c

@@ -6367,7 +6367,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		enable_snr_monitoring =
 				ucfg_scan_is_snr_monitor_enabled(hdd_ctx->psoc);
 		if (!enable_snr_monitoring ||
-		    !hdd_cm_is_vdev_associated(adapter)) {
+		    !hdd_cm_is_vdev_associated(adapter->deflink)) {
 			hdd_err("getSNR failed: Enable SNR Monitoring-%d",
 				enable_snr_monitoring);
 			return -ENONET;
@@ -7115,7 +7115,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info,
 		return -EPERM;
 
 	/* we must be associated in order to add a tspec */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		*wmm_status = HDD_WLAN_WMM_STATUS_SETUP_FAILED_BAD_PARAM;
 		return 0;
 	}
@@ -7460,7 +7460,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info,
 		return -EINVAL;
 	}
 	/* Added for debug on reception of Re-assoc Req. */
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_debug("Called with Ie of length = %d when not associated",
 		       wrqu->data.length);
 		hdd_debug("Should be Re-assoc Req IEs");
@@ -7564,7 +7564,7 @@ static int __iw_set_host_offload(struct net_device *dev,
 	if (0 != ret)
 		return ret;
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("dev is not in CONNECTED state, ignore!!!");
 		return -EINVAL;
 	}
@@ -7836,7 +7836,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev,
 		return -ENOTSUPP;
 	}
 
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		hdd_err("Packet filter not supported in disconnected state");
 		return -ENOTSUPP;
 	}
@@ -7932,7 +7932,7 @@ static int __iw_get_statistics(struct net_device *dev,
 		return ret;
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	if (!hdd_cm_is_vdev_associated(adapter)) {
+	if (!hdd_cm_is_vdev_associated(adapter->deflink)) {
 		wrqu->data.length = 0;
 		return 0;
 	}