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

qcacld-3.0: Use mac_handle_t in wlan_hdd_p2p

Browse Source 
Change "qcacld-3.0: Introduce mac_handle_t" introduced a modern
name for what was previously called the tHalHandle. Transition
wlan_hdd_p2p to use the new naming.

Change-Id: I93514340fcfcf136e6e635aa142209f7cf35a68f
CRs-Fixed: 2266176
This commit is contained in:
Jeff Johnson
2018-06-13 18:12:38 -07:00
committed by nshrivas
parent 4a371d0e8e
commit a96ee9371e
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,7 +253,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
if ((adapter->device_mode == QDF_STA_MODE) && if ((adapter->device_mode == QDF_STA_MODE) &&
(type == SIR_MAC_MGMT_FRAME && (type == SIR_MAC_MGMT_FRAME &&
sub_type == SIR_MAC_MGMT_AUTH)) { sub_type == SIR_MAC_MGMT_AUTH)) {
qdf_status = sme_send_mgmt_tx(WLAN_HDD_GET_HAL_CTX(adapter), qdf_status = sme_send_mgmt_tx(hdd_ctx->mac_handle,
adapter->session_id, buf, len); adapter->session_id, buf, len);
if (QDF_IS_STATUS_SUCCESS(qdf_status)) if (QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -840,8 +840,8 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
{ {
struct net_device *dev = wdev->netdev; struct net_device *dev = wdev->netdev;
struct hdd_context *hdd_ctx = (struct hdd_context *) wiphy_priv(wiphy); struct hdd_context *hdd_ctx = (struct hdd_context *) wiphy_priv(wiphy);
struct hdd_adapter *pVirtAdapter = WLAN_HDD_GET_PRIV_PTR(dev); struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
int status; int errno;
hdd_enter(); hdd_enter();
@@ -854,34 +854,33 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
* Clear SOFTAP_INIT_DONE flag to mark SAP unload, so that we do * Clear SOFTAP_INIT_DONE flag to mark SAP unload, so that we do
* not restart SAP after SSR as SAP is already stopped from user space. * not restart SAP after SSR as SAP is already stopped from user space.
*/ */
clear_bit(SOFTAP_INIT_DONE, &pVirtAdapter->event_flags); clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
MTRACE(qdf_trace(QDF_MODULE_ID_HDD, MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
TRACE_CODE_HDD_DEL_VIRTUAL_INTF, TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
pVirtAdapter->session_id, pVirtAdapter->device_mode)); adapter->session_id, adapter->device_mode));
hdd_debug("Device_mode %s(%d)", hdd_debug("Device_mode %s(%d)",
hdd_device_mode_to_string(pVirtAdapter->device_mode), hdd_device_mode_to_string(adapter->device_mode),
pVirtAdapter->device_mode); adapter->device_mode);
status = wlan_hdd_validate_context(hdd_ctx); errno = wlan_hdd_validate_context(hdd_ctx);
if (errno)
if (0 != status) return errno;
return status;
/* check state machine state and kickstart modules if they are closed */ /* check state machine state and kickstart modules if they are closed */
status = hdd_wlan_start_modules(hdd_ctx, false); errno = hdd_wlan_start_modules(hdd_ctx, false);
if (status) if (errno)
return status; return errno;
if (pVirtAdapter->device_mode == QDF_SAP_MODE && if (adapter->device_mode == QDF_SAP_MODE &&
wlan_sap_is_pre_cac_active(hdd_ctx->hHal)) { wlan_sap_is_pre_cac_active(hdd_ctx->mac_handle)) {
hdd_clean_up_pre_cac_interface(hdd_ctx); hdd_clean_up_pre_cac_interface(hdd_ctx);
} else { } else {
wlan_hdd_release_intf_addr(hdd_ctx, wlan_hdd_release_intf_addr(hdd_ctx,
pVirtAdapter->mac_addr.bytes); adapter->mac_addr.bytes);
hdd_stop_adapter(hdd_ctx, pVirtAdapter); hdd_stop_adapter(hdd_ctx, adapter);
hdd_deinit_adapter(hdd_ctx, pVirtAdapter, true); hdd_deinit_adapter(hdd_ctx, adapter, true);
hdd_close_adapter(hdd_ctx, pVirtAdapter, true); hdd_close_adapter(hdd_ctx, adapter, true);
} }
hdd_exit(); hdd_exit();