|
@@ -7823,7 +7823,7 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
|
|
|
{
|
|
|
QDF_STATUS status = QDF_STATUS_E_FAILURE;
|
|
|
struct mac_context *mac = MAC_CONTEXT(mac_handle);
|
|
|
- ePhyChanBondState cbMode;
|
|
|
+ ePhyChanBondState cb_mode;
|
|
|
struct csr_roam_session *session = CSR_GET_SESSION(mac, sessionId);
|
|
|
|
|
|
if (!CSR_IS_SESSION_VALID(mac, sessionId)) {
|
|
@@ -7832,33 +7832,33 @@ QDF_STATUS sme_set_ht2040_mode(mac_handle_t mac_handle, uint8_t sessionId,
|
|
|
}
|
|
|
session = CSR_GET_SESSION(mac, sessionId);
|
|
|
sme_debug("Update HT operation beacon IE, channel_type=%d cur cbmode %d",
|
|
|
- channel_type, session->bssParams.cbMode);
|
|
|
+ channel_type, session->bssParams.cb_mode);
|
|
|
|
|
|
switch (channel_type) {
|
|
|
case eHT_CHAN_HT20:
|
|
|
- if (!session->bssParams.cbMode)
|
|
|
+ if (!session->bssParams.cb_mode)
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
- cbMode = PHY_SINGLE_CHANNEL_CENTERED;
|
|
|
+ cb_mode = PHY_SINGLE_CHANNEL_CENTERED;
|
|
|
break;
|
|
|
case eHT_CHAN_HT40MINUS:
|
|
|
- if (session->bssParams.cbMode)
|
|
|
+ if (session->bssParams.cb_mode)
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
- cbMode = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
|
|
|
+ cb_mode = PHY_DOUBLE_CHANNEL_HIGH_PRIMARY;
|
|
|
break;
|
|
|
case eHT_CHAN_HT40PLUS:
|
|
|
- if (session->bssParams.cbMode)
|
|
|
+ if (session->bssParams.cb_mode)
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
- cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
|
|
|
+ cb_mode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
|
|
|
break;
|
|
|
default:
|
|
|
sme_err("Error!!! Invalid HT20/40 mode !");
|
|
|
return QDF_STATUS_E_FAILURE;
|
|
|
}
|
|
|
- session->bssParams.cbMode = cbMode;
|
|
|
+ session->bssParams.cb_mode = cb_mode;
|
|
|
status = sme_acquire_global_lock(&mac->sme);
|
|
|
if (QDF_IS_STATUS_SUCCESS(status)) {
|
|
|
status = csr_set_ht2040_mode(mac, sessionId,
|
|
|
- cbMode, obssEnabled);
|
|
|
+ cb_mode, obssEnabled);
|
|
|
sme_release_global_lock(&mac->sme);
|
|
|
}
|
|
|
return status;
|
|
@@ -7876,9 +7876,9 @@ QDF_STATUS sme_get_ht2040_mode(mac_handle_t mac_handle, uint8_t vdev_id,
|
|
|
}
|
|
|
session = CSR_GET_SESSION(mac, vdev_id);
|
|
|
sme_debug("Get HT operation beacon IE, channel_type=%d cur cbmode %d",
|
|
|
- *channel_type, session->bssParams.cbMode);
|
|
|
+ *channel_type, session->bssParams.cb_mode);
|
|
|
|
|
|
- switch (session->bssParams.cbMode) {
|
|
|
+ switch (session->bssParams.cb_mode) {
|
|
|
case PHY_SINGLE_CHANNEL_CENTERED:
|
|
|
*channel_type = eHT_CHAN_HT20;
|
|
|
break;
|