qcacld-3.0: Rename HDD identifier phddctx
The Linux Coding Style frowns upon so-called Hungarian notation so rename HDD identifier phddctx to be compliant. Change-Id: I36541226f54efd2421772cebc233566f16ed8039 CRs-Fixed: 2427176
This commit is contained in:
@@ -8383,32 +8383,32 @@ static void hdd_init_offloaded_packets_ctx(struct hdd_context *hdd_ctx)
|
|||||||
#ifdef WLAN_FEATURE_WOW_PULSE
|
#ifdef WLAN_FEATURE_WOW_PULSE
|
||||||
/**
|
/**
|
||||||
* wlan_hdd_set_wow_pulse() - call SME to send wmi cmd of wow pulse
|
* wlan_hdd_set_wow_pulse() - call SME to send wmi cmd of wow pulse
|
||||||
* @phddctx: struct hdd_context structure pointer
|
* @hdd_ctx: struct hdd_context structure pointer
|
||||||
* @enable: enable or disable this behaviour
|
* @enable: enable or disable this behaviour
|
||||||
*
|
*
|
||||||
* Return: int
|
* Return: int
|
||||||
*/
|
*/
|
||||||
static int wlan_hdd_set_wow_pulse(struct hdd_context *phddctx, bool enable)
|
static int wlan_hdd_set_wow_pulse(struct hdd_context *hdd_ctx, bool enable)
|
||||||
{
|
{
|
||||||
struct wow_pulse_mode wow_pulse_set_info;
|
struct wow_pulse_mode wow_pulse_set_info;
|
||||||
QDF_STATUS status;
|
QDF_STATUS status;
|
||||||
|
|
||||||
hdd_debug("wow pulse enable flag is %d", enable);
|
hdd_debug("wow pulse enable flag is %d", enable);
|
||||||
|
|
||||||
if (!ucfg_pmo_is_wow_pulse_enabled(phddctx->psoc))
|
if (!ucfg_pmo_is_wow_pulse_enabled(hdd_ctx->psoc))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* prepare the request to send to SME */
|
/* prepare the request to send to SME */
|
||||||
if (enable == true) {
|
if (enable == true) {
|
||||||
wow_pulse_set_info.wow_pulse_enable = true;
|
wow_pulse_set_info.wow_pulse_enable = true;
|
||||||
wow_pulse_set_info.wow_pulse_pin =
|
wow_pulse_set_info.wow_pulse_pin =
|
||||||
ucfg_pmo_get_wow_pulse_pin(phddctx->psoc);
|
ucfg_pmo_get_wow_pulse_pin(hdd_ctx->psoc);
|
||||||
|
|
||||||
wow_pulse_set_info.wow_pulse_interval_high =
|
wow_pulse_set_info.wow_pulse_interval_high =
|
||||||
ucfg_pmo_get_wow_pulse_interval_high(phddctx->psoc);
|
ucfg_pmo_get_wow_pulse_interval_high(hdd_ctx->psoc);
|
||||||
|
|
||||||
wow_pulse_set_info.wow_pulse_interval_low =
|
wow_pulse_set_info.wow_pulse_interval_low =
|
||||||
ucfg_pmo_get_wow_pulse_interval_low(phddctx->psoc);
|
ucfg_pmo_get_wow_pulse_interval_low(hdd_ctx->psoc);
|
||||||
} else {
|
} else {
|
||||||
wow_pulse_set_info.wow_pulse_enable = false;
|
wow_pulse_set_info.wow_pulse_enable = false;
|
||||||
wow_pulse_set_info.wow_pulse_pin = 0;
|
wow_pulse_set_info.wow_pulse_pin = 0;
|
||||||
@@ -8430,7 +8430,7 @@ static int wlan_hdd_set_wow_pulse(struct hdd_context *phddctx, bool enable)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static inline int wlan_hdd_set_wow_pulse(struct hdd_context *phddctx, bool enable)
|
static inline int wlan_hdd_set_wow_pulse(struct hdd_context *hdd_ctx, bool enable)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@@ -3933,15 +3933,15 @@ static int iw_get_wlm_stats(struct net_device *net_dev,
|
|||||||
int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
||||||
{
|
{
|
||||||
struct net_device *net = adapter->dev;
|
struct net_device *net = adapter->dev;
|
||||||
struct hdd_context *phddctx = WLAN_HDD_GET_CTX(adapter);
|
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
|
||||||
mac_handle_t mac_handle = phddctx->mac_handle;
|
mac_handle_t mac_handle = hdd_ctx->mac_handle;
|
||||||
bool band_24 = false, band_5g = false;
|
bool band_24 = false, band_5g = false;
|
||||||
bool ch_bond24 = false, ch_bond5g = false;
|
bool ch_bond24 = false, ch_bond5g = false;
|
||||||
struct sme_config_params *sme_config;
|
struct sme_config_params *sme_config;
|
||||||
uint32_t chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
|
uint32_t chwidth = WNI_CFG_CHANNEL_BONDING_MODE_DISABLE;
|
||||||
uint8_t vhtchanwidth;
|
uint8_t vhtchanwidth;
|
||||||
eCsrPhyMode phymode = -EIO, old_phymode;
|
eCsrPhyMode phymode = -EIO, old_phymode;
|
||||||
enum hdd_dot11_mode hdd_dot11mode = phddctx->config->dot11Mode;
|
enum hdd_dot11_mode hdd_dot11mode = hdd_ctx->config->dot11Mode;
|
||||||
enum band_info curr_band = BAND_ALL;
|
enum band_info curr_band = BAND_ALL;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
uint8_t band_capability;
|
uint8_t band_capability;
|
||||||
@@ -3953,19 +3953,19 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
|
|
||||||
old_phymode = sme_get_phy_mode(mac_handle);
|
old_phymode = sme_get_phy_mode(mac_handle);
|
||||||
|
|
||||||
ucfg_mlme_get_channel_bonding_24ghz(phddctx->psoc,
|
ucfg_mlme_get_channel_bonding_24ghz(hdd_ctx->psoc,
|
||||||
&channel_bonding_mode);
|
&channel_bonding_mode);
|
||||||
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
|
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
|
||||||
sme_get_cb_phy_state_from_cb_ini_value(channel_bonding_mode))
|
sme_get_cb_phy_state_from_cb_ini_value(channel_bonding_mode))
|
||||||
ch_bond24 = true;
|
ch_bond24 = true;
|
||||||
|
|
||||||
ucfg_mlme_get_channel_bonding_5ghz(phddctx->psoc,
|
ucfg_mlme_get_channel_bonding_5ghz(hdd_ctx->psoc,
|
||||||
&channel_bonding_mode);
|
&channel_bonding_mode);
|
||||||
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
|
if (WNI_CFG_CHANNEL_BONDING_MODE_DISABLE !=
|
||||||
sme_get_cb_phy_state_from_cb_ini_value(channel_bonding_mode))
|
sme_get_cb_phy_state_from_cb_ini_value(channel_bonding_mode))
|
||||||
ch_bond5g = true;
|
ch_bond5g = true;
|
||||||
|
|
||||||
status = wlan_mlme_get_band_capability(phddctx->psoc, &band_capability);
|
status = wlan_mlme_get_band_capability(hdd_ctx->psoc, &band_capability);
|
||||||
if (QDF_IS_STATUS_ERROR(status)) {
|
if (QDF_IS_STATUS_ERROR(status)) {
|
||||||
hdd_err("Failed to get MLME Band capability");
|
hdd_err("Failed to get MLME Band capability");
|
||||||
return -EIO;
|
return -EIO;
|
||||||
@@ -3978,7 +3978,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
else if (band_capability == BAND_5G)
|
else if (band_capability == BAND_5G)
|
||||||
band_5g = true;
|
band_5g = true;
|
||||||
|
|
||||||
status = ucfg_mlme_get_vht_channel_width(phddctx->psoc, &vhtchanwidth);
|
status = ucfg_mlme_get_vht_channel_width(hdd_ctx->psoc, &vhtchanwidth);
|
||||||
if (!QDF_IS_STATUS_SUCCESS(status))
|
if (!QDF_IS_STATUS_SUCCESS(status))
|
||||||
hdd_err("Failed to get channel_width");
|
hdd_err("Failed to get channel_width");
|
||||||
|
|
||||||
@@ -4164,7 +4164,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
vhtchanwidth = eHT_CHANNEL_WIDTH_80MHZ;
|
vhtchanwidth = eHT_CHANNEL_WIDTH_80MHZ;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
status = ucfg_mlme_get_vht_channel_width(phddctx->psoc,
|
status = ucfg_mlme_get_vht_channel_width(hdd_ctx->psoc,
|
||||||
&vhtchanwidth);
|
&vhtchanwidth);
|
||||||
if (!QDF_IS_STATUS_SUCCESS(status))
|
if (!QDF_IS_STATUS_SUCCESS(status))
|
||||||
hdd_err("Failed to get channel_width");
|
hdd_err("Failed to get channel_width");
|
||||||
@@ -4205,7 +4205,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
status = ucfg_mlme_set_band_capability(phddctx->psoc,
|
status = ucfg_mlme_set_band_capability(hdd_ctx->psoc,
|
||||||
curr_band);
|
curr_band);
|
||||||
if (QDF_IS_STATUS_ERROR(status)) {
|
if (QDF_IS_STATUS_ERROR(status)) {
|
||||||
hdd_err("failed to set MLME band capability");
|
hdd_err("failed to set MLME band capability");
|
||||||
@@ -4213,7 +4213,7 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (curr_band == BAND_2G) {
|
if (curr_band == BAND_2G) {
|
||||||
status = ucfg_mlme_set_11h_enabled(phddctx->psoc, 0);
|
status = ucfg_mlme_set_11h_enabled(hdd_ctx->psoc, 0);
|
||||||
if (!QDF_IS_STATUS_SUCCESS(status)) {
|
if (!QDF_IS_STATUS_SUCCESS(status)) {
|
||||||
hdd_err("Failed to set 11h_enable flag");
|
hdd_err("Failed to set 11h_enable flag");
|
||||||
goto free;
|
goto free;
|
||||||
@@ -4229,14 +4229,14 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
}
|
}
|
||||||
sme_update_config(mac_handle, sme_config);
|
sme_update_config(mac_handle, sme_config);
|
||||||
|
|
||||||
phddctx->config->dot11Mode = hdd_dot11mode;
|
hdd_ctx->config->dot11Mode = hdd_dot11mode;
|
||||||
ucfg_mlme_set_channel_bonding_24ghz(
|
ucfg_mlme_set_channel_bonding_24ghz(
|
||||||
phddctx->psoc,
|
hdd_ctx->psoc,
|
||||||
sme_config->csrConfig.channelBondingMode24GHz);
|
sme_config->csrConfig.channelBondingMode24GHz);
|
||||||
ucfg_mlme_set_channel_bonding_5ghz(
|
ucfg_mlme_set_channel_bonding_5ghz(
|
||||||
phddctx->psoc,
|
hdd_ctx->psoc,
|
||||||
sme_config->csrConfig.channelBondingMode5GHz);
|
sme_config->csrConfig.channelBondingMode5GHz);
|
||||||
if (hdd_update_config_cfg(phddctx) == false) {
|
if (hdd_update_config_cfg(hdd_ctx) == false) {
|
||||||
hdd_err("could not update config_dat");
|
hdd_err("could not update config_dat");
|
||||||
retval = -EIO;
|
retval = -EIO;
|
||||||
goto free;
|
goto free;
|
||||||
@@ -4246,8 +4246,8 @@ int wlan_hdd_update_phymode(struct hdd_adapter *adapter, int new_phymode)
|
|||||||
struct ieee80211_supported_band *band;
|
struct ieee80211_supported_band *band;
|
||||||
|
|
||||||
ucfg_mlme_get_channel_bonding_5ghz(
|
ucfg_mlme_get_channel_bonding_5ghz(
|
||||||
phddctx->psoc, &channel_bonding_mode);
|
hdd_ctx->psoc, &channel_bonding_mode);
|
||||||
band = phddctx->wiphy->bands[HDD_NL80211_BAND_5GHZ];
|
band = hdd_ctx->wiphy->bands[HDD_NL80211_BAND_5GHZ];
|
||||||
if (channel_bonding_mode)
|
if (channel_bonding_mode)
|
||||||
band->ht_cap.cap |=
|
band->ht_cap.cap |=
|
||||||
IEEE80211_HT_CAP_SUP_WIDTH_20_40;
|
IEEE80211_HT_CAP_SUP_WIDTH_20_40;
|
||||||
|
Reference in New Issue
Block a user