qcacld-3.0: Update dfs region enum names
Update dfs region enum names to fix the compilation due to name change. Change-Id: If3ed7c5d2eb9ce855f62df98301196395e7febf9 CRs-Fixed: 2300595
Dieser Commit ist enthalten in:

committet von
nshrivas

Ursprung
16796952eb
Commit
e37c8559a1
@@ -530,7 +530,7 @@ static int hdd_regulatory_init_no_offload(struct hdd_context *hdd_ctx,
|
||||
return ret_val;
|
||||
}
|
||||
|
||||
hdd_set_dfs_region(hdd_ctx, DFS_FCC_REG);
|
||||
hdd_set_dfs_region(hdd_ctx, DFS_FCC_REGION);
|
||||
|
||||
hdd_regulatory_wiphy_init(hdd_ctx, reg_info, wiphy);
|
||||
|
||||
@@ -966,11 +966,11 @@ void hdd_reg_notifier(struct wiphy *wiphy,
|
||||
|
||||
if (('K' == request->alpha2[0]) &&
|
||||
('R' == request->alpha2[1]))
|
||||
request->dfs_region = (enum nl80211_dfs_regions) DFS_KR_REG;
|
||||
request->dfs_region = (enum nl80211_dfs_regions)DFS_KR_REGION;
|
||||
|
||||
if (('C' == request->alpha2[0]) &&
|
||||
('N' == request->alpha2[1]))
|
||||
request->dfs_region = (enum nl80211_dfs_regions) DFS_CN_REG;
|
||||
request->dfs_region = (enum nl80211_dfs_regions)DFS_CN_REGION;
|
||||
|
||||
/* first check if this callback is in response to the driver callback */
|
||||
switch (request->initiator) {
|
||||
@@ -1220,13 +1220,13 @@ static enum nl80211_dfs_regions dfs_reg_to_nl80211_dfs_regions(
|
||||
enum dfs_reg dfs_region)
|
||||
{
|
||||
switch (dfs_region) {
|
||||
case DFS_UNINIT_REG:
|
||||
case DFS_UNINIT_REGION:
|
||||
return NL80211_DFS_UNSET;
|
||||
case DFS_FCC_REG:
|
||||
case DFS_FCC_REGION:
|
||||
return NL80211_DFS_FCC;
|
||||
case DFS_ETSI_REG:
|
||||
case DFS_ETSI_REGION:
|
||||
return NL80211_DFS_ETSI;
|
||||
case DFS_MKK_REG:
|
||||
case DFS_MKK_REGION:
|
||||
return NL80211_DFS_JP;
|
||||
default:
|
||||
return NL80211_DFS_UNSET;
|
||||
|
@@ -463,7 +463,7 @@ static void sap_get_cac_dur_dfs_region(struct sap_context *sap_ctx,
|
||||
}
|
||||
*cac_duration_ms = DEFAULT_CAC_TIMEOUT;
|
||||
|
||||
if (*dfs_region != DFS_ETSI_REG) {
|
||||
if (*dfs_region != DFS_ETSI_REGION) {
|
||||
QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
|
||||
FL("sapdfs: default cac duration"));
|
||||
return;
|
||||
|
@@ -1996,7 +1996,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
|
||||
* Set the JAPAN W53 restriction only if the current
|
||||
* regulatory domain is JAPAN.
|
||||
*/
|
||||
if (DFS_MKK_REG == dfs_region) {
|
||||
if (DFS_MKK_REGION == dfs_region) {
|
||||
pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53;
|
||||
QDF_TRACE(QDF_MODULE_ID_SAP,
|
||||
QDF_TRACE_LEVEL_INFO_LOW,
|
||||
@@ -2092,7 +2092,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
|
||||
* restriction is currently enforeced only for
|
||||
* JAPAN regulatory domain.
|
||||
*/
|
||||
if (DFS_MKK_REG == dfs_region) {
|
||||
if (DFS_MKK_REGION == dfs_region) {
|
||||
pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location =
|
||||
dfs_Preferred_Channels_location;
|
||||
QDF_TRACE(QDF_MODULE_ID_SAP,
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren