qcacld-3.0: Modify regulatory apis to pdev level

To support reg-domain at pdev level, modify the usage of some
apis to pdev level.

Change-Id: I37c504f77c7704553714cc74cba6c5ef882e774c
CRs-Fixed: 2048784
This commit is contained in:
Amar Singhal
2017-05-24 15:23:06 -07:00
committed by snandini
parent 51f6b3d2b1
commit 7f55e34ea7
3 changed files with 7 additions and 18 deletions

View File

@@ -1257,7 +1257,7 @@ static void sap_get_cac_dur_dfs_region(ptSapContext sap_ctx,
}
mac = PMAC_STRUCT(hal);
wlan_reg_get_dfs_region(mac->psoc, dfs_region);
wlan_reg_get_dfs_region(mac->pdev, dfs_region);
if (mac->sap.SapDfsInfo.ignore_cac) {
*cac_duration_ms = 0;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
@@ -1266,17 +1266,6 @@ static void sap_get_cac_dur_dfs_region(ptSapContext sap_ctx,
}
*cac_duration_ms = DEFAULT_CAC_TIMEOUT;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("sapdfs: dfs_region=%d, chwidth=%d, seg0=%d, seg1=%d"),
*dfs_region, ch_params->ch_width,
ch_params->center_freq_seg0, ch_params->center_freq_seg1);
if (*dfs_region != DFS_ETSI_REG) {
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
FL("sapdfs: defult cac duration"));
return;
}
if (sap_is_channel_bonding_etsi_weather_channel(sap_ctx)) {
*cac_duration_ms = ETSI_WEATHER_CH_CAC_TIMEOUT;
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,

View File

@@ -2976,7 +2976,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
return QDF_STATUS_E_FAULT;
}
wlan_reg_get_dfs_region(pMac->psoc, &dfs_region);
wlan_reg_get_dfs_region(pMac->pdev, &dfs_region);
/*
* Set the JAPAN W53 restriction only if the current
@@ -3072,7 +3072,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
return QDF_STATUS_E_FAULT;
}
wlan_reg_get_dfs_region(pMac->psoc, &dfs_region);
wlan_reg_get_dfs_region(pMac->pdev, &dfs_region);
/*
* The Indoor/Outdoor only random channel selection