samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Rename hdd_vdev to vdev

Browse Source 
The name 'hdd_vdev' is misleading, since it is not actually an HDD vdev
context. Rather, it is the Object Manager vdev context. Rename hdd_vdev
to vdev for consistency, and to make room for HDD to have its own vdev
context.

Change-Id: I6186d010404c0a7b1e25590d87e5350195faba80
CRs-Fixed: 2311435
This commit is contained in:
Dustin Brown
2018-09-07 10:47:27 -07:00
committed by nshrivas
parent 6001532924
commit 89fa06ec3a
20 changed files with 127 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/hdd/inc/wlan_hdd_main.h
View File

@@ -1225,6 +1225,7 @@ struct hdd_context;
/**
* struct hdd_adapter - hdd vdev/net_device context
* @vdev: object manager vdev context
* @event_flags: a bitmap of hdd_adapter_flags
*/
struct hdd_adapter {
@@ -1239,7 +1240,7 @@ struct hdd_adapter {
qdf_list_node_t node;
struct hdd_context *hdd_ctx;
struct wlan_objmgr_vdev *hdd_vdev;
struct wlan_objmgr_vdev *vdev;
void *txrx_vdev;

28
core/hdd/src/wlan_hdd_assoc.c
View File

@@ -1342,7 +1342,7 @@ static void hdd_send_association_event(struct net_device *dev,
/* Update tdls module about the disconnection event */
hdd_notify_sta_disconnect(adapter->session_id,
true, false,
adapter->hdd_vdev);
adapter->vdev);
}
#endif
if (eConnectionState_Associated == sta_ctx->conn_info.connState) {
@@ -1362,7 +1362,7 @@ static void hdd_send_association_event(struct net_device *dev,
memcpy(wrqu.ap_addr.sa_data, pCsrRoamInfo->pBssDesc->bssId,
sizeof(pCsrRoamInfo->pBssDesc->bssId));
ucfg_p2p_status_connect(adapter->hdd_vdev);
ucfg_p2p_status_connect(adapter->vdev);
hdd_info("wlan: " MAC_ADDRESS_STR " connected to "
MAC_ADDRESS_STR "\n",
@@ -1403,7 +1403,7 @@ static void hdd_send_association_event(struct net_device *dev,
chan_info.reg_info_2 =
pCsrRoamInfo->chan_info.reg_info_2;
ret = hdd_objmgr_set_peer_mlme_state(adapter->hdd_vdev,
ret = hdd_objmgr_set_peer_mlme_state(adapter->vdev,
WLAN_ASSOC_STATE);
if (ret)
hdd_err("Peer object %pM fail to set associated state",
@@ -1419,7 +1419,7 @@ static void hdd_send_association_event(struct net_device *dev,
hdd_notify_sta_connect(adapter->session_id,
pCsrRoamInfo->tdls_chan_swit_prohibited,
pCsrRoamInfo->tdls_prohibited,
adapter->hdd_vdev);
adapter->vdev);
#ifdef MSM_PLATFORM
/* start timer in sta/p2p_cli */
@@ -1471,7 +1471,7 @@ static void hdd_send_association_event(struct net_device *dev,
hdd_notify_sta_disconnect(adapter->session_id,
false,
false,
adapter->hdd_vdev);
adapter->vdev);
#ifdef MSM_PLATFORM
/* stop timer in sta/p2p_cli */
@@ -1784,7 +1784,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
}
/* update P2P connection status */
ucfg_p2p_status_disconnect(adapter->hdd_vdev);
ucfg_p2p_status_disconnect(adapter->vdev);
}
hdd_wmm_adapter_clear(adapter);
@@ -1860,7 +1860,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
hdd_conn_set_connection_state(adapter,
eConnectionState_NotConnected);
}
pmo_ucfg_flush_gtk_offload_req(adapter->hdd_vdev);
pmo_ucfg_flush_gtk_offload_req(adapter->vdev);
if ((QDF_STA_MODE == adapter->device_mode) ||
(QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
@@ -2114,7 +2114,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
txrx_ops.tx.tx = NULL;
cdp_vdev_register(soc,
(struct cdp_vdev *)adapter->txrx_vdev, adapter,
(struct cdp_ctrl_objmgr_vdev *)adapter->hdd_vdev, &txrx_ops);
(struct cdp_ctrl_objmgr_vdev *)adapter->vdev, &txrx_ops);
if (!txrx_ops.tx.tx) {
hdd_err("%s vdev register fail", __func__);
return QDF_STATUS_E_FAILURE;
@@ -2145,7 +2145,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
);
hdd_conn_set_authenticated(adapter, true);
hdd_objmgr_set_peer_mlme_auth_state(adapter->hdd_vdev, true);
hdd_objmgr_set_peer_mlme_auth_state(adapter->vdev, true);
} else {
hdd_debug("ULA auth StaId= %d. Changing TL state to CONNECTED at Join time",
sta_ctx->conn_info.staId[0]);
@@ -2159,7 +2159,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
#endif
);
hdd_conn_set_authenticated(adapter, false);
hdd_objmgr_set_peer_mlme_auth_state(adapter->hdd_vdev, false);
hdd_objmgr_set_peer_mlme_auth_state(adapter->vdev, false);
}
return qdf_status;
}
@@ -2494,7 +2494,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
status = hdd_change_peer_state(adapter, staid, OL_TXRX_PEER_STATE_AUTH,
hdd_is_roam_sync_in_progress(roaminfo));
hdd_conn_set_authenticated(adapter, true);
hdd_objmgr_set_peer_mlme_auth_state(adapter->hdd_vdev, true);
hdd_objmgr_set_peer_mlme_auth_state(adapter->vdev, true);
if ((QDF_STA_MODE == adapter->device_mode) ||
(QDF_P2P_CLIENT_MODE == adapter->device_mode)) {
@@ -3236,7 +3236,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
);
hdd_conn_set_authenticated(adapter, false);
hdd_objmgr_set_peer_mlme_auth_state(
adapter->hdd_vdev,
adapter->vdev,
false);
} else {
hdd_debug("staId: %d Changing TL state to AUTHENTICATED",
@@ -3253,7 +3253,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
);
hdd_conn_set_authenticated(adapter, true);
hdd_objmgr_set_peer_mlme_auth_state(
adapter->hdd_vdev,
adapter->vdev,
true);
}
@@ -3964,7 +3964,7 @@ QDF_STATUS hdd_roam_register_tdlssta(struct hdd_adapter *adapter,
cdp_vdev_register(soc,
(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
(struct cdp_pdev *)pdev, adapter->session_id),
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->hdd_vdev,
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->vdev,
&txrx_ops);
adapter->tx_fn = txrx_ops.tx.tx;
txrx_ops.rx.stats_rx = hdd_tx_rx_collect_connectivity_stats_info;

36
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -4759,7 +4759,7 @@ void wlan_hdd_save_gtk_offload_params(struct hdd_adapter *adapter,
for (i = 0; i < 8; i++)
buf[7 - i] = replay_ctr[i];
status = pmo_ucfg_cache_gtk_offload_req(adapter->hdd_vdev, gtk_req);
status = pmo_ucfg_cache_gtk_offload_req(adapter->vdev, gtk_req);
if (status != QDF_STATUS_SUCCESS)
hdd_err("Failed to cache GTK Offload");
@@ -5216,7 +5216,7 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
hdd_err("Invalid interface type:%d", dev_mode);
return -EINVAL;
}
status = wlan_objmgr_vdev_try_get_ref(adapter->hdd_vdev, WLAN_OSIF_ID);
status = wlan_objmgr_vdev_try_get_ref(adapter->vdev, WLAN_OSIF_ID);
if (status != QDF_STATUS_SUCCESS) {
hdd_err("Access hdd_vdev failed: %d", status);
return -EINVAL;
@@ -5226,12 +5226,12 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
policy_mgr_convert_device_mode_to_qdf_type(dev_mode);
int chan;
u32 vdev_id = wlan_vdev_get_id(adapter->hdd_vdev);
u32 vdev_id = wlan_vdev_get_id(adapter->vdev);
wlan_vdev_obj_lock(adapter->hdd_vdev);
wlan_vdev_mlme_cap_set(adapter->hdd_vdev,
wlan_vdev_obj_lock(adapter->vdev);
wlan_vdev_mlme_cap_set(adapter->vdev,
WLAN_VDEV_C_RESTRICT_OFFCHAN);
wlan_vdev_obj_unlock(adapter->hdd_vdev);
wlan_vdev_obj_unlock(adapter->vdev);
chan = policy_mgr_get_channel(hdd_ctx->hdd_psoc, pmode,
&vdev_id);
if (!chan ||
@@ -5241,10 +5241,10 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
}
hdd_info("vdev %d mode %d dnbs enabled", vdev_id, dev_mode);
} else if (restrict_offchan == 0) {
wlan_vdev_obj_lock(adapter->hdd_vdev);
wlan_vdev_mlme_cap_clear(adapter->hdd_vdev,
wlan_vdev_obj_lock(adapter->vdev);
wlan_vdev_mlme_cap_clear(adapter->vdev,
WLAN_VDEV_C_RESTRICT_OFFCHAN);
wlan_vdev_obj_unlock(adapter->hdd_vdev);
wlan_vdev_obj_unlock(adapter->vdev);
if (wlan_hdd_send_avoid_freq_for_dnbs(hdd_ctx, 0)) {
hdd_err("unable to clear avoid_freq");
ret_val = -EINVAL;
@@ -5254,7 +5254,7 @@ static int wlan_hdd_handle_restrict_offchan_config(struct hdd_adapter *adapter,
ret_val = -EINVAL;
hdd_err("Invalid RESTRICT_OFFCHAN setting");
}
wlan_objmgr_vdev_release_ref(adapter->hdd_vdev, WLAN_OSIF_ID);
wlan_objmgr_vdev_release_ref(adapter->vdev, WLAN_OSIF_ID);
return ret_val;
}
@@ -5525,7 +5525,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
modulated_dtim = nla_get_u32(
tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MODULATED_DTIM]);
status = pmo_ucfg_config_modulated_dtim(adapter->hdd_vdev,
status = pmo_ucfg_config_modulated_dtim(adapter->vdev,
modulated_dtim);
if (QDF_STATUS_SUCCESS != status)
ret_val = -EPERM;
@@ -5541,7 +5541,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
return -EINVAL;
}
status = pmo_ucfg_config_listen_interval(adapter->hdd_vdev,
status = pmo_ucfg_config_listen_interval(adapter->vdev,
override_li);
if (status != QDF_STATUS_SUCCESS)
ret_val = -EPERM;
@@ -12928,7 +12928,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
if (!(adapter->device_mode == QDF_P2P_DEVICE_MODE &&
type == NL80211_IFTYPE_STATION)) {
hdd_debug("Teardown tdls links and disable tdls in FW as new interface is coming up");
hdd_notify_teardown_tdls_links(adapter->hdd_vdev);
hdd_notify_teardown_tdls_links(adapter->vdev);
}
if ((adapter->device_mode == QDF_STA_MODE) ||
@@ -14654,7 +14654,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
/* Disable roaming on all other adapters before connect start */
wlan_hdd_disable_roaming(adapter);
hdd_notify_teardown_tdls_links(adapter->hdd_vdev);
hdd_notify_teardown_tdls_links(adapter->vdev);
qdf_mem_zero(&hdd_sta_ctx->conn_info.conn_flag,
sizeof(hdd_sta_ctx->conn_info.conn_flag));
@@ -14787,7 +14787,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
}
}
#endif
pmo_ucfg_flush_gtk_offload_req(adapter->hdd_vdev);
pmo_ucfg_flush_gtk_offload_req(adapter->vdev);
roam_profile->csrPersona = adapter->device_mode;
if (operatingChannel) {
@@ -16824,7 +16824,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
reasonCode = eCSR_DISCONNECT_REASON_UNSPECIFIED;
break;
}
if (ucfg_scan_get_vdev_status(adapter->hdd_vdev) !=
if (ucfg_scan_get_vdev_status(adapter->vdev) !=
SCAN_NOT_IN_PROGRESS) {
hdd_debug("Disconnect is in progress, Aborting Scan");
wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
@@ -16833,7 +16833,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
wlan_hdd_cleanup_remain_on_channel_ctx(adapter);
/* First clean up the tdls peers if any */
hdd_notify_sta_disconnect(adapter->session_id,
false, true, adapter->hdd_vdev);
false, true, adapter->vdev);
hdd_info("Disconnect from userspace; reason:%d (%s)",
reason, hdd_ieee80211_reason_code_to_str(reason));
@@ -18353,7 +18353,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
wlan_hdd_copy_gtk_kek(gtk_req, data);
qdf_mem_copy(gtk_req->kck, data->kck, NL80211_KCK_LEN);
gtk_req->is_fils_connection = hdd_is_fils_connection(adapter);
status = pmo_ucfg_cache_gtk_offload_req(adapter->hdd_vdev, gtk_req);
status = pmo_ucfg_cache_gtk_offload_req(adapter->vdev, gtk_req);
if (status != QDF_STATUS_SUCCESS) {
hdd_err("Failed to cache GTK Offload");
result = qdf_status_to_os_return(status);

4
core/hdd/src/wlan_hdd_debugfs_offload.c
View File

@@ -142,7 +142,7 @@ wlan_hdd_arp_offload_info_debugfs(struct hdd_context *hdd_ctx,
struct pmo_arp_offload_params info = {0};
QDF_STATUS status;
status = pmo_ucfg_get_arp_offload_params(adapter->hdd_vdev,
status = pmo_ucfg_get_arp_offload_params(adapter->vdev,
&info);
if (!QDF_IS_STATUS_SUCCESS(status)) {
ret_val = scnprintf(buf, buf_avail_len,
@@ -232,7 +232,7 @@ wlan_hdd_ns_offload_info_debugfs(struct hdd_context *hdd_ctx,
QDF_STATUS status;
uint32_t i;
status = pmo_ucfg_get_ns_offload_params(adapter->hdd_vdev,
status = pmo_ucfg_get_ns_offload_params(adapter->vdev,
&info);
if (!QDF_IS_STATUS_SUCCESS(status)) {
ret = scnprintf(buf, buf_avail_len,

10
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -2160,7 +2160,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
qdf_mem_free(sta_info);
}
/* Lets abort scan to ensure smooth authentication for client */
if (ucfg_scan_get_vdev_status(adapter->hdd_vdev) !=
if (ucfg_scan_get_vdev_status(adapter->vdev) !=
SCAN_NOT_IN_PROGRESS) {
wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
adapter->session_id, INVALID_SCAN_ID, false);
@@ -4508,7 +4508,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
hdd_enter();
hdd_notify_teardown_tdls_links(adapter->hdd_vdev);
hdd_notify_teardown_tdls_links(adapter->vdev);
if (policy_mgr_is_hw_mode_change_in_progress(hdd_ctx->hdd_psoc)) {
status = policy_mgr_wait_for_connection_update(
@@ -5152,7 +5152,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
wlan_hdd_set_dhcp_server_offload(adapter);
#endif /* DHCP_SERVER_OFFLOAD */
ucfg_p2p_status_start_bss(adapter->hdd_vdev);
ucfg_p2p_status_start_bss(adapter->vdev);
/* Check and restart SAP if it is on unsafe channel */
hdd_unsafe_channel_restart_sap(hdd_ctx);
@@ -5384,7 +5384,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
wlan_hdd_reset_prob_rspies(adapter);
hdd_destroy_acs_timer(adapter);
ucfg_p2p_status_stop_bss(adapter->hdd_vdev);
ucfg_p2p_status_stop_bss(adapter->vdev);
hdd_exit();
@@ -5795,7 +5795,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
* If Do_Not_Break_Stream enabled send avoid channel list
* to application.
*/
if (policy_mgr_is_dnsc_set(adapter->hdd_vdev) &&
if (policy_mgr_is_dnsc_set(adapter->vdev) &&
sap_config->channel) {
wlan_hdd_send_avoid_freq_for_dnbs(hdd_ctx,
sap_config->channel);

2
core/hdd/src/wlan_hdd_hostapd_wext.c
View File

@@ -2526,7 +2526,7 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
hdd_err("String to Hex conversion Failed");
}
rssi_info = wlan_cfg80211_mc_cp_stats_get_peer_rssi(adapter->hdd_vdev,
rssi_info = wlan_cfg80211_mc_cp_stats_get_peer_rssi(adapter->vdev,
macaddress.bytes,
&ret);
if (ret || !rssi_info) {

22
core/hdd/src/wlan_hdd_main.c
View File

@@ -661,7 +661,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb,
break;
case NETDEV_GOING_DOWN:
if (ucfg_scan_get_vdev_status(adapter->hdd_vdev) !=
if (ucfg_scan_get_vdev_status(adapter->vdev) !=
SCAN_NOT_IN_PROGRESS) {
wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
adapter->session_id, INVALID_SCAN_ID, true);
@@ -3943,18 +3943,18 @@ int hdd_vdev_ready(struct hdd_adapter *adapter)
{
QDF_STATUS status;
status = pmo_vdev_ready(adapter->hdd_vdev);
status = pmo_vdev_ready(adapter->vdev);
if (QDF_IS_STATUS_ERROR(status))
return qdf_status_to_os_return(status);
status = ucfg_reg_11d_vdev_created_update(adapter->hdd_vdev);
status = ucfg_reg_11d_vdev_created_update(adapter->vdev);
if (QDF_IS_STATUS_ERROR(status))
return qdf_status_to_os_return(status);
if (wma_capability_enhanced_mcast_filter())
status = pmo_ucfg_enhanced_mc_filter_enable(adapter->hdd_vdev);
status = pmo_ucfg_enhanced_mc_filter_enable(adapter->vdev);
else
status = pmo_ucfg_enhanced_mc_filter_disable(adapter->hdd_vdev);
status = pmo_ucfg_enhanced_mc_filter_disable(adapter->vdev);
return qdf_status_to_os_return(status);
}
@@ -3975,8 +3975,8 @@ int hdd_vdev_destroy(struct hdd_adapter *adapter)
return -EINVAL;
}
status = ucfg_reg_11d_vdev_delete_update(adapter->hdd_vdev);
ucfg_scan_set_vdev_del_in_progress(adapter->hdd_vdev);
status = ucfg_reg_11d_vdev_delete_update(adapter->vdev);
ucfg_scan_set_vdev_del_in_progress(adapter->vdev);
/* close sme session (destroy vdev in firmware via legacy API) */
qdf_event_reset(&adapter->qdf_session_close_event);
@@ -4008,7 +4008,7 @@ int hdd_vdev_destroy(struct hdd_adapter *adapter)
}
release_vdev:
ucfg_scan_clear_vdev_del_in_progress(adapter->hdd_vdev);
ucfg_scan_clear_vdev_del_in_progress(adapter->vdev);
/* do vdev logical destroy via objmgr */
errno = hdd_objmgr_release_and_destroy_vdev(adapter);
@@ -4132,7 +4132,7 @@ int hdd_vdev_create(struct hdd_adapter *adapter,
if (adapter->device_mode == QDF_STA_MODE ||
adapter->device_mode == QDF_P2P_CLIENT_MODE)
wlan_vdev_set_max_peer_count(adapter->hdd_vdev,
wlan_vdev_set_max_peer_count(adapter->vdev,
HDD_MAX_VDEV_PEER_COUNT);
hdd_info("vdev %d created successfully", adapter->session_id);
@@ -5346,7 +5346,7 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
/*
* If Do_Not_Break_Stream was enabled clear avoid channel list.
*/
if (policy_mgr_is_dnsc_set(adapter->hdd_vdev))
if (policy_mgr_is_dnsc_set(adapter->vdev))
wlan_hdd_send_avoid_freq_for_dnbs(hdd_ctx, 0);
#ifdef WLAN_OPEN_SOURCE
@@ -5465,7 +5465,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
if ((adapter->device_mode == QDF_STA_MODE) ||
(adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
/* Stop tdls timers */
hdd_notify_tdls_reset_adapter(adapter->hdd_vdev);
hdd_notify_tdls_reset_adapter(adapter->vdev);
adapter->session.station.hdd_reassoc_scenario = false;
}

18
core/hdd/src/wlan_hdd_nan_datapath.c
View File

@@ -281,7 +281,7 @@ void hdd_ndp_event_handler(struct hdd_adapter *adapter,
eCsrRoamResult roam_result)
{
bool success;
struct wlan_objmgr_psoc *psoc = wlan_vdev_get_psoc(adapter->hdd_vdev);
struct wlan_objmgr_psoc *psoc = wlan_vdev_get_psoc(adapter->vdev);
if (roam_status == eCSR_ROAM_NDP_STATUS_UPDATE) {
switch (roam_result) {
@@ -385,7 +385,7 @@ int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
static int update_ndi_state(struct hdd_adapter *adapter, uint32_t state)
{
return os_if_nan_set_ndi_state(adapter->hdd_vdev, state);
return os_if_nan_set_ndi_state(adapter->vdev, state);
}
/**
@@ -530,9 +530,9 @@ int hdd_ndi_start(char *iface_name, uint16_t transaction_id)
* Create transaction id is required to be saved since the firmware
* does not honor the transaction id for create request
*/
ucfg_nan_set_ndp_create_transaction_id(adapter->hdd_vdev,
ucfg_nan_set_ndp_create_transaction_id(adapter->vdev,
transaction_id);
ucfg_nan_set_ndi_state(adapter->hdd_vdev,
ucfg_nan_set_ndi_state(adapter->vdev,
NAN_DATA_NDI_CREATING_STATE);
/*
@@ -594,9 +594,9 @@ int hdd_ndi_delete(uint8_t vdev_id, char *iface_name, uint16_t transaction_id)
hdd_ctx->sta_to_adapter[sta_ctx->broadcast_staid] = 0;
sta_ctx->broadcast_staid = HDD_WLAN_INVALID_STA_ID;
os_if_nan_set_ndp_delete_transaction_id(adapter->hdd_vdev,
os_if_nan_set_ndp_delete_transaction_id(adapter->vdev,
transaction_id);
os_if_nan_set_ndi_state(adapter->hdd_vdev, NAN_DATA_NDI_DELETING_STATE);
os_if_nan_set_ndi_state(adapter->vdev, NAN_DATA_NDI_DELETING_STATE);
/* Delete the interface */
ret = __wlan_hdd_del_virtual_intf(hdd_ctx->wiphy, &adapter->wdev);
@@ -638,8 +638,8 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
if (ndi_rsp->status == QDF_STATUS_SUCCESS) {
hdd_alert("NDI interface successfully created");
os_if_nan_set_ndp_create_transaction_id(adapter->hdd_vdev, 0);
os_if_nan_set_ndi_state(adapter->hdd_vdev,
os_if_nan_set_ndp_create_transaction_id(adapter->vdev, 0);
os_if_nan_set_ndi_state(adapter->vdev,
NAN_DATA_NDI_CREATED_STATE);
wlan_hdd_netif_queue_control(adapter,
WLAN_START_ALL_NETIF_QUEUE_N_CARRIER,
@@ -715,7 +715,7 @@ void hdd_ndi_drv_ndi_delete_rsp_handler(uint8_t vdev_id)
void hdd_ndp_session_end_handler(struct hdd_adapter *adapter)
{
os_if_nan_ndi_session_end(adapter->hdd_vdev);
os_if_nan_ndi_session_end(adapter->vdev);
}
int hdd_ndp_get_peer_idx(uint8_t vdev_id, struct qdf_mac_addr *addr)

6
core/hdd/src/wlan_hdd_object_manager.c
View File

@@ -281,7 +281,7 @@ int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
goto vdev_destroy;
}
adapter->hdd_vdev = vdev;
adapter->vdev = vdev;
adapter->session_id = wlan_vdev_get_id(vdev);
return 0;
@@ -298,10 +298,10 @@ osif_priv_free:
int hdd_objmgr_release_and_destroy_vdev(struct hdd_adapter *adapter)
{
QDF_STATUS status;
struct wlan_objmgr_vdev *vdev = adapter->hdd_vdev;
struct wlan_objmgr_vdev *vdev = adapter->vdev;
struct vdev_osif_priv *osif_priv;
adapter->hdd_vdev = NULL;
adapter->vdev = NULL;
adapter->session_id = HDD_SESSION_ID_INVALID;
QDF_BUG(vdev);

18
core/hdd/src/wlan_hdd_ocb.c
View File

@@ -256,7 +256,7 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
cdp_vdev_register(soc,
(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
(struct cdp_pdev *)pdev, adapter->session_id),
adapter, adapter->hdd_vdev, &txrx_ops);
adapter, adapter->vdev, &txrx_ops);
txrx_ops.rx.stats_rx = hdd_tx_rx_collect_connectivity_stats_info;
adapter->tx_fn = txrx_ops.tx.tx;
@@ -412,7 +412,7 @@ static int hdd_ocb_set_config_req(struct hdd_adapter *adapter,
WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
WLAN_CONTROL_PATH);
status = ucfg_ocb_set_channel_config(adapter->hdd_vdev, config,
status = ucfg_ocb_set_channel_config(adapter->vdev, config,
hdd_ocb_set_config_callback,
cookie);
if (QDF_IS_STATUS_ERROR(status)) {
@@ -1038,7 +1038,7 @@ static int __wlan_hdd_cfg80211_ocb_set_utc_time(struct wiphy *wiphy,
qdf_mem_copy(utc->time_error, nla_data(time_error_attr),
SIZE_UTC_TIME_ERROR);
if (ucfg_ocb_set_utc_time(adapter->hdd_vdev, utc) !=
if (ucfg_ocb_set_utc_time(adapter->vdev, utc) !=
QDF_STATUS_SUCCESS) {
hdd_err("Error while setting UTC time");
rc = -EINVAL;
@@ -1151,7 +1151,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
goto fail;
}
if (ucfg_ocb_start_timing_advert(adapter->hdd_vdev, timing_advert) !=
if (ucfg_ocb_start_timing_advert(adapter->vdev, timing_advert) !=
QDF_STATUS_SUCCESS) {
hdd_err("Error while starting timing advert");
rc = -EINVAL;
@@ -1250,7 +1250,7 @@ __wlan_hdd_cfg80211_ocb_stop_timing_advert(struct wiphy *wiphy,
timing_advert->chan_freq = nla_get_u32(
tb[QCA_WLAN_VENDOR_ATTR_OCB_STOP_TIMING_ADVERT_CHANNEL_FREQ]);
if (ucfg_ocb_stop_timing_advert(adapter->hdd_vdev, timing_advert) !=
if (ucfg_ocb_stop_timing_advert(adapter->vdev, timing_advert) !=
QDF_STATUS_SUCCESS) {
hdd_err("Error while stopping timing advert");
rc = -EINVAL;
@@ -1417,7 +1417,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
cookie = osif_request_cookie(request);
tsf_request.vdev_id = adapter->session_id;
status = ucfg_ocb_get_tsf_timer(adapter->hdd_vdev, &tsf_request,
status = ucfg_ocb_get_tsf_timer(adapter->vdev, &tsf_request,
hdd_ocb_get_tsf_timer_callback,
cookie);
if (QDF_IS_STATUS_ERROR(status)) {
@@ -1666,7 +1666,7 @@ static int __wlan_hdd_cfg80211_dcc_get_stats(struct wiphy *wiphy,
dcc_request.request_array_len = request_array_len;
dcc_request.request_array = request_array;
status = ucfg_ocb_dcc_get_stats(adapter->hdd_vdev, &dcc_request,
status = ucfg_ocb_dcc_get_stats(adapter->vdev, &dcc_request,
hdd_dcc_get_stats_callback,
cookie);
if (QDF_IS_STATUS_ERROR(status)) {
@@ -1776,7 +1776,7 @@ static int __wlan_hdd_cfg80211_dcc_clear_stats(struct wiphy *wiphy,
return -EINVAL;
}
if (ucfg_ocb_dcc_clear_stats(adapter->hdd_vdev, adapter->session_id,
if (ucfg_ocb_dcc_clear_stats(adapter->vdev, adapter->session_id,
nla_get_u32(
tb[QCA_WLAN_VENDOR_ATTR_DCC_CLEAR_STATS_BITMAP])) !=
QDF_STATUS_SUCCESS) {
@@ -1933,7 +1933,7 @@ static int __wlan_hdd_cfg80211_dcc_update_ndl(struct wiphy *wiphy,
dcc_request.dcc_ndl_active_state_list_len = ndl_active_state_array_len;
dcc_request.dcc_ndl_active_state_list = ndl_active_state_array;
status = ucfg_ocb_dcc_update_ndl(adapter->hdd_vdev, &dcc_request,
status = ucfg_ocb_dcc_update_ndl(adapter->vdev, &dcc_request,
hdd_dcc_update_ndl_callback,
cookie);
if (QDF_IS_STATUS_ERROR(status)) {

23
core/hdd/src/wlan_hdd_p2p.c
View File

@@ -86,7 +86,7 @@ void wlan_hdd_cancel_existing_remain_on_channel(struct hdd_adapter *adapter)
return;
}
ucfg_p2p_cleanup_roc_by_vdev(adapter->hdd_vdev);
ucfg_p2p_cleanup_roc_by_vdev(adapter->vdev);
}
int wlan_hdd_check_remain_on_channel(struct hdd_adapter *adapter)
@@ -105,7 +105,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(struct hdd_adapter *adapter)
return;
}
ucfg_p2p_cleanup_roc_by_vdev(adapter->hdd_vdev);
ucfg_p2p_cleanup_roc_by_vdev(adapter->vdev);
}
void wlan_hdd_cleanup_actionframe(struct hdd_adapter *adapter)
@@ -115,7 +115,7 @@ void wlan_hdd_cleanup_actionframe(struct hdd_adapter *adapter)
return;
}
ucfg_p2p_cleanup_tx_by_vdev(adapter->hdd_vdev);
ucfg_p2p_cleanup_tx_by_vdev(adapter->vdev);
}
static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
@@ -145,10 +145,9 @@ static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
if (wlan_hdd_validate_session_id(adapter->session_id))
return -EINVAL;
status = wlan_cfg80211_roc(adapter->hdd_vdev, chan,
duration, cookie);
status = wlan_cfg80211_roc(adapter->vdev, chan, duration, cookie);
hdd_debug("remain on channel request, status:%d, cookie:0x%llx",
status, *cookie);
status, *cookie);
return qdf_status_to_os_return(status);
}
@@ -189,7 +188,7 @@ __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
if (wlan_hdd_validate_session_id(adapter->session_id))
return -EINVAL;
status = wlan_cfg80211_cancel_roc(adapter->hdd_vdev, cookie);
status = wlan_cfg80211_cancel_roc(adapter->vdev, cookie);
hdd_debug("cancel remain on channel, status:%d", status);
return 0;
@@ -261,9 +260,8 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
return -EINVAL;
}
status = wlan_cfg80211_mgmt_tx(adapter->hdd_vdev, chan,
offchan, wait, buf, len, no_cck,
dont_wait_for_ack, cookie);
status = wlan_cfg80211_mgmt_tx(adapter->vdev, chan, offchan, wait, buf,
len, no_cck, dont_wait_for_ack, cookie);
hdd_debug("mgmt tx, status:%d, cookie:0x%llx", status, *cookie);
return 0;
@@ -317,8 +315,7 @@ static int __wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
if (wlan_hdd_validate_session_id(adapter->session_id))
return -EINVAL;
status = wlan_cfg80211_mgmt_tx_cancel(adapter->hdd_vdev,
cookie);
status = wlan_cfg80211_mgmt_tx_cancel(adapter->vdev, cookie);
hdd_debug("cancel mgmt tx, status:%d", status);
return 0;
@@ -659,7 +656,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE);
if (adapter && !wlan_hdd_validate_session_id(adapter->session_id)) {
if (ucfg_scan_get_vdev_status(adapter->hdd_vdev) !=
if (ucfg_scan_get_vdev_status(adapter->vdev) !=
SCAN_NOT_IN_PROGRESS) {
wlan_abort_scan(hdd_ctx->hdd_pdev, INVAL_PDEV_ID,
adapter->session_id, INVALID_SCAN_ID, false);

43
core/hdd/src/wlan_hdd_power.c
View File

@@ -134,7 +134,7 @@ static void hdd_enable_gtk_offload(struct hdd_adapter *adapter)
{
QDF_STATUS status;
status = pmo_ucfg_enable_gtk_offload_in_fwr(adapter->hdd_vdev);
status = pmo_ucfg_enable_gtk_offload_in_fwr(adapter->vdev);
if (status != QDF_STATUS_SUCCESS)
hdd_info("Failed to enable gtk offload");
}
@@ -153,22 +153,21 @@ static void hdd_disable_gtk_offload(struct hdd_adapter *adapter)
QDF_STATUS status;
/* ensure to get gtk rsp first before disable it*/
gtk_rsp_request.callback =
wlan_hdd_cfg80211_update_replay_counter_cb;
gtk_rsp_request.callback = wlan_hdd_cfg80211_update_replay_counter_cb;
/* Passing as void* as PMO does not know legacy HDD adapter type */
gtk_rsp_request.callback_context =
(void *)adapter;
status = pmo_ucfg_get_gtk_rsp(adapter->hdd_vdev,
&gtk_rsp_request);
gtk_rsp_request.callback_context = (void *)adapter;
status = pmo_ucfg_get_gtk_rsp(adapter->vdev, &gtk_rsp_request);
if (status != QDF_STATUS_SUCCESS) {
hdd_err("Failed to send get gtk rsp status:%d", status);
return;
}
hdd_debug("send get_gtk_rsp successful");
status = pmo_ucfg_disable_gtk_offload_in_fwr(adapter->hdd_vdev);
status = pmo_ucfg_disable_gtk_offload_in_fwr(adapter->vdev);
if (status != QDF_STATUS_SUCCESS)
hdd_info("Failed to disable gtk offload");
}
#ifdef WLAN_NS_OFFLOAD
@@ -405,7 +404,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
}
/* enable ns request */
status = pmo_ucfg_enable_ns_offload_in_fwr(adapter->hdd_vdev, trigger);
status = pmo_ucfg_enable_ns_offload_in_fwr(adapter->vdev, trigger);
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err("Failed to enable ns offload; status:%d", status);
goto free_req;
@@ -426,13 +425,13 @@ void hdd_disable_ns_offload(struct hdd_adapter *adapter,
QDF_STATUS status;
hdd_enter();
status = pmo_ucfg_flush_ns_offload_req(adapter->hdd_vdev);
status = pmo_ucfg_flush_ns_offload_req(adapter->vdev);
if (status != QDF_STATUS_SUCCESS) {
hdd_err("Failed to flush NS Offload");
goto out;
}
status = pmo_ucfg_disable_ns_offload_in_fwr(adapter->hdd_vdev, trigger);
status = pmo_ucfg_disable_ns_offload_in_fwr(adapter->vdev, trigger);
if (status != QDF_STATUS_SUCCESS)
hdd_err("Failed to disable NS Offload");
else
@@ -492,7 +491,7 @@ static void hdd_enable_hw_filter(struct hdd_adapter *adapter)
hdd_enter();
status = pmo_ucfg_enable_hw_filter_in_fwr(adapter->hdd_vdev);
status = pmo_ucfg_enable_hw_filter_in_fwr(adapter->vdev);
if (status != QDF_STATUS_SUCCESS)
hdd_info("Failed to enable hardware filter");
@@ -505,7 +504,7 @@ static void hdd_disable_hw_filter(struct hdd_adapter *adapter)
hdd_enter();
status = pmo_ucfg_disable_hw_filter_in_fwr(adapter->hdd_vdev);
status = pmo_ucfg_disable_hw_filter_in_fwr(adapter->vdev);
if (status != QDF_STATUS_SUCCESS)
hdd_info("Failed to disable hardware filter");
@@ -517,13 +516,13 @@ void hdd_enable_host_offloads(struct hdd_adapter *adapter,
{
hdd_enter();
if (!ucfg_pmo_is_vdev_supports_offload(adapter->hdd_vdev)) {
if (!ucfg_pmo_is_vdev_supports_offload(adapter->vdev)) {
hdd_debug("offload is not supported on vdev opmode %d",
adapter->device_mode);
goto out;
}
if (!ucfg_pmo_is_vdev_connected(adapter->hdd_vdev)) {
if (!ucfg_pmo_is_vdev_connected(adapter->vdev)) {
hdd_debug("offload is not supported on disconnected vdevs");
goto out;
}
@@ -544,13 +543,13 @@ void hdd_disable_host_offloads(struct hdd_adapter *adapter,
{
hdd_enter();
if (!ucfg_pmo_is_vdev_supports_offload(adapter->hdd_vdev)) {
if (!ucfg_pmo_is_vdev_supports_offload(adapter->vdev)) {
hdd_info("offload is not supported on this vdev opmode: %d",
adapter->device_mode);
goto out;
}
if (!ucfg_pmo_is_vdev_connected(adapter->hdd_vdev)) {
if (!ucfg_pmo_is_vdev_connected(adapter->vdev)) {
hdd_info("vdev is not connected");
goto out;
}
@@ -896,7 +895,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
goto free_req;
}
status = pmo_ucfg_enable_arp_offload_in_fwr(adapter->hdd_vdev, trigger);
status = pmo_ucfg_enable_arp_offload_in_fwr(adapter->vdev, trigger);
if (QDF_IS_STATUS_ERROR(status)) {
hdd_err("failed arp offload config in fw; status:%d", status);
goto free_req;
@@ -917,13 +916,13 @@ void hdd_disable_arp_offload(struct hdd_adapter *adapter,
QDF_STATUS status;
hdd_enter();
status = pmo_ucfg_flush_arp_offload_req(adapter->hdd_vdev);
status = pmo_ucfg_flush_arp_offload_req(adapter->vdev);
if (status != QDF_STATUS_SUCCESS) {
hdd_err("Failed to flush arp Offload");
goto out;
}
status = pmo_ucfg_disable_arp_offload_in_fwr(adapter->hdd_vdev,
status = pmo_ucfg_disable_arp_offload_in_fwr(adapter->vdev,
trigger);
if (status == QDF_STATUS_SUCCESS)
hdd_wlan_offload_event(PMO_IPV4_ARP_REPLY_OFFLOAD,
@@ -2000,7 +1999,7 @@ int wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
#ifdef QCA_SUPPORT_CP_STATS
static void wlan_hdd_get_tx_power(struct hdd_adapter *adapter, int *dbm)
{
wlan_cfg80211_mc_cp_stats_get_tx_power(adapter->hdd_vdev, dbm);
wlan_cfg80211_mc_cp_stats_get_tx_power(adapter->vdev, dbm);
}
#else
static void wlan_hdd_get_tx_power(struct hdd_adapter *adapter, int *dbm)

2
core/hdd/src/wlan_hdd_scan.c
View File

@@ -656,7 +656,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
if ((request->n_ssids == 1) && (request->ssids != NULL) &&
(request->ssids[0].ssid_len > 7) &&
!qdf_mem_cmp(&request->ssids[0], "DIRECT-", 7))
ucfg_p2p_status_scan(adapter->hdd_vdev);
ucfg_p2p_status_scan(adapter->vdev);
status = wlan_cfg80211_scan(hdd_ctx->hdd_pdev, request, &params);
if (params.default_ie.ptr)

4
core/hdd/src/wlan_hdd_softap_tx_rx.c
View File

@@ -1050,7 +1050,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
cdp_vdev_register(soc,
(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
(struct cdp_pdev *)pdev, adapter->session_id),
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->hdd_vdev,
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->vdev,
&txrx_ops);
adapter->txrx_vdev = (void *)cdp_get_vdev_from_vdev_id(soc,
(struct cdp_pdev *)pdev,
@@ -1225,7 +1225,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
if (QDF_STATUS_SUCCESS == qdf_status) {
adapter->sta_info[sta_id].peer_state =
OL_TXRX_PEER_STATE_AUTH;
p2p_peer_authorized(adapter->hdd_vdev, sta_mac->bytes);
p2p_peer_authorized(adapter->vdev, sta_mac->bytes);
}
hdd_exit();

2
core/hdd/src/wlan_hdd_station_info.c
View File

@@ -114,7 +114,7 @@ static int hdd_get_sta_congestion(struct hdd_adapter *adapter,
QDF_STATUS status;
struct cca_stats cca_stats;
status = ucfg_mc_cp_stats_cca_stats_get(adapter->hdd_vdev, &cca_stats);
status = ucfg_mc_cp_stats_cca_stats_get(adapter->vdev, &cca_stats);
if (QDF_IS_STATUS_ERROR(status))
return -EINVAL;

6
core/hdd/src/wlan_hdd_stats.c
View File

@@ -5048,7 +5048,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
}
rssi_info = wlan_cfg80211_mc_cp_stats_get_peer_rssi(
adapter->hdd_vdev,
adapter->vdev,
sta_ctx->conn_info.bssId.bytes,
&ret);
if (ret || !rssi_info) {
@@ -5752,7 +5752,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
uint8_t mcs_rate_flags;
struct stats_event *stats;
stats = wlan_cfg80211_mc_cp_stats_get_station_stats(adapter->hdd_vdev,
stats = wlan_cfg80211_mc_cp_stats_get_station_stats(adapter->vdev,
&ret);
if (ret || !stats) {
wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
@@ -5793,7 +5793,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
/* save class a stats to legacy location */
adapter->hdd_stats.class_a_stat.nss =
wlan_vdev_mlme_get_nss(adapter->hdd_vdev);
wlan_vdev_mlme_get_nss(adapter->vdev);
adapter->hdd_stats.class_a_stat.tx_rate = stats->tx_rate;
adapter->hdd_stats.class_a_stat.tx_rate_flags = stats->tx_rate_flags;
adapter->hdd_stats.class_a_stat.mcs_index =

14
core/hdd/src/wlan_hdd_tdls.c
View File

@@ -92,7 +92,7 @@ int wlan_hdd_tdls_get_all_peers(struct hdd_adapter *adapter,
return len;
}
return wlan_cfg80211_tdls_get_all_peers(adapter->hdd_vdev,
return wlan_cfg80211_tdls_get_all_peers(adapter->vdev,
buf, buflen);
}
@@ -232,8 +232,8 @@ __wlan_hdd_cfg80211_configure_tdls_mode(struct wiphy *wiphy,
hdd_debug("TDLS trigger mode %d", trigger_mode);
if (hdd_ctx->tdls_umac_comp_active) {
ret = wlan_cfg80211_tdls_configure_mode(adapter->hdd_vdev,
trigger_mode);
ret = wlan_cfg80211_tdls_configure_mode(adapter->vdev,
trigger_mode);
return ret;
}
@@ -749,7 +749,7 @@ int hdd_set_tdls_offchannel(struct hdd_context *hdd_ctx,
QDF_STATUS status = QDF_STATUS_E_FAILURE;
if (hdd_ctx->tdls_umac_comp_active)
status = ucfg_set_tdls_offchannel(adapter->hdd_vdev,
status = ucfg_set_tdls_offchannel(adapter->vdev,
offchannel);
return qdf_status_to_os_return(status);
}
@@ -761,7 +761,7 @@ int hdd_set_tdls_secoffchanneloffset(struct hdd_context *hdd_ctx,
QDF_STATUS status = QDF_STATUS_E_FAILURE;
if (hdd_ctx->tdls_umac_comp_active)
status = ucfg_set_tdls_secoffchanneloffset(adapter->hdd_vdev,
status = ucfg_set_tdls_secoffchanneloffset(adapter->vdev,
offchanoffset);
return qdf_status_to_os_return(status);
}
@@ -773,7 +773,7 @@ int hdd_set_tdls_offchannelmode(struct hdd_context *hdd_ctx,
QDF_STATUS status = QDF_STATUS_E_FAILURE;
if (hdd_ctx->tdls_umac_comp_active)
status = ucfg_set_tdls_offchan_mode(adapter->hdd_vdev,
status = ucfg_set_tdls_offchan_mode(adapter->vdev,
offchanmode);
return qdf_status_to_os_return(status);
}
@@ -819,7 +819,7 @@ int wlan_hdd_tdls_antenna_switch(struct hdd_context *hdd_ctx,
uint32_t mode)
{
if (hdd_ctx->tdls_umac_comp_active)
return wlan_tdls_antenna_switch(adapter->hdd_vdev, mode);
return wlan_tdls_antenna_switch(adapter->vdev, mode);
return 0;
}

6
core/hdd/src/wlan_hdd_tx_rx.c
View File

@@ -1064,7 +1064,7 @@ static netdev_tx_t __hdd_hard_start_xmit(struct sk_buff *skb,
mac_addr = (struct qdf_mac_addr *)skb->data;
ucfg_tdls_update_tx_pkt_cnt(adapter->hdd_vdev, mac_addr);
ucfg_tdls_update_tx_pkt_cnt(adapter->vdev, mac_addr);
if (qdf_nbuf_is_tso(skb))
adapter->stats.tx_packets += qdf_nbuf_get_tso_num_seg(skb);
@@ -1937,7 +1937,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *adapter_context,
mac_addr = (struct qdf_mac_addr *)(skb->data+QDF_MAC_ADDR_SIZE);
ucfg_tdls_update_rx_pkt_cnt(adapter->hdd_vdev, mac_addr);
ucfg_tdls_update_rx_pkt_cnt(adapter->vdev, mac_addr);
skb->dev = adapter->dev;
skb->protocol = eth_type_trans(skb, skb->dev);
@@ -2407,7 +2407,7 @@ int hdd_set_mon_rx_cb(struct net_device *dev)
cdp_vdev_register(soc,
(struct cdp_vdev *)cdp_get_vdev_from_vdev_id(soc,
(struct cdp_pdev *)pdev, adapter->session_id),
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->hdd_vdev,
adapter, (struct cdp_ctrl_objmgr_vdev *)adapter->vdev,
&txrx_ops);
/* peer is created wma_vdev_attach->wma_create_peer */
qdf_status = cdp_peer_register(soc,

2
core/hdd/src/wlan_hdd_wmm.c
View File

@@ -2081,7 +2081,7 @@ bool hdd_wmm_is_acm_allowed(struct wlan_objmgr_vdev **vdev)
struct hdd_wmm_ac_status *wmm_ac_status;
adapter = container_of(vdev, struct hdd_adapter, hdd_vdev);
adapter = container_of(vdev, struct hdd_adapter, vdev);
if (NULL == adapter) {
hdd_err("failed, hdd adapter is NULL");
return false;

8
core/hdd/src/wlan_hdd_wowl.c
View File

@@ -222,7 +222,7 @@ bool hdd_add_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
/* Register the pattern downstream */
status = pmo_ucfg_add_wow_user_pattern(
adapter->hdd_vdev, &localPattern);
adapter->vdev, &localPattern);
if (QDF_IS_STATUS_ERROR(status)) {
/* Add failed, so invalidate the local storage */
hdd_err("sme_wowl_add_bcast_pattern failed with error code (%d)",
@@ -281,7 +281,7 @@ bool hdd_del_wowl_ptrn(struct hdd_adapter *adapter, const char *ptrn)
if (!patternFound)
return false;
status = pmo_ucfg_del_wow_user_pattern(adapter->hdd_vdev, id);
status = pmo_ucfg_del_wow_user_pattern(adapter->vdev, id);
if (QDF_IS_STATUS_ERROR(status))
return false;
@@ -389,7 +389,7 @@ bool hdd_add_wowl_ptrn_debugfs(struct hdd_adapter *adapter, uint8_t pattern_idx,
/* Register the pattern downstream */
qdf_ret_status = pmo_ucfg_add_wow_user_pattern(
adapter->hdd_vdev, &localPattern);
adapter->vdev, &localPattern);
if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
hdd_err("pmo_wow_user_pattern failed with error code (%d).",
qdf_ret_status);
@@ -436,7 +436,7 @@ bool hdd_del_wowl_ptrn_debugfs(struct hdd_adapter *adapter,
}
qdf_ret_status = pmo_ucfg_del_wow_user_pattern(
adapter->hdd_vdev, pattern_idx);
adapter->vdev, pattern_idx);
if (!QDF_IS_STATUS_SUCCESS(qdf_ret_status)) {
hdd_err("sme_wowl_del_bcast_pattern failed with error code (%d).",
qdf_ret_status);