A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Rename hdd_adapter PSB fields

Browse source 
Per the Linux coding style "mixed-case names are frowned upon" so
rename fields psbChanged and configuredPsb in struct hdd_adapter.

Change-Id: I87d7b74f95e3644f718fc18ace285bf4b6066985
CRs-Fixed: 2134942
This commit is contained in:
Jeff Johnson 2017-10-28 13:06:48 -07:00
commit 137c8eec3a
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/hdd/inc/wlan_hdd_main.h
View file

@ -1144,9 +1144,9 @@ struct hdd_adapter {
struct hdd_scan_info scan_info;
/* Flag to ensure PSB is configured through framework */
uint8_t psbChanged;
uint8_t psb_changed;
/* UAPSD psb value configured through framework */
uint8_t configuredPsb;
uint8_t configured_psb;
#ifdef IPA_OFFLOAD
void *ipa_context;
#endif

6
core/hdd/src/wlan_hdd_tx_rx.c
View file

@ -635,7 +635,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
"%s: Classified as ac %d up %d", __func__, ac, up);
#endif /* HDD_WMM_DEBUG */
if (HDD_PSB_CHANGED == adapter->psbChanged) {
if (HDD_PSB_CHANGED == adapter->psb_changed) {
/*
* Function which will determine acquire admittance for a
* WMM AC is required or not based on psb configuration done
@ -649,7 +649,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
* can have artifically boosted higher qos priority.
*/
if (((adapter->psbChanged & (1 << ac)) &&
if (((adapter->psb_changed & (1 << ac)) &&
likely(adapter->hddWmmStatus.wmmAcStatus[ac].
wmmAcAccessAllowed)) ||
((sta_ctx->conn_info.uIsAuthenticated == false) &&
@ -660,7 +660,7 @@ static int __hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
granted = true;
} else {
status = hdd_wmm_acquire_access(adapter, ac, &granted);
adapter->psbChanged |= (1 << ac);
adapter->psb_changed |= (1 << ac);
}
if (!granted) {

24
core/hdd/src/wlan_hdd_wmm.c
View file

@ -975,8 +975,8 @@ int hdd_wmmps_helper(struct hdd_adapter *adapter, uint8_t *ptr)
return -EINVAL;
}
/* convert ASCII to integer */
adapter->configuredPsb = ptr[9] - '0';
adapter->psbChanged = HDD_PSB_CHANGED;
adapter->configured_psb = ptr[9] - '0';
adapter->psb_changed = HDD_PSB_CHANGED;
return 0;
}
@ -1031,13 +1031,13 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
memset(&qosInfo, 0, sizeof(qosInfo));
qosInfo.ts_info.psb = adapter->configuredPsb;
qosInfo.ts_info.psb = adapter->configured_psb;
switch (acType) {
case SME_AC_VO:
qosInfo.ts_info.up = SME_QOS_WMM_UP_VO;
/* Check if there is any valid configuration from framework */
if (HDD_PSB_CFG_INVALID == adapter->configuredPsb) {
if (HDD_PSB_CFG_INVALID == adapter->configured_psb) {
qosInfo.ts_info.psb =
((WLAN_HDD_GET_CTX(adapter))->config->
UapsdMask & SME_QOS_UAPSD_VO) ? 1 : 0;
@ -1062,7 +1062,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
case SME_AC_VI:
qosInfo.ts_info.up = SME_QOS_WMM_UP_VI;
/* Check if there is any valid configuration from framework */
if (HDD_PSB_CFG_INVALID == adapter->configuredPsb) {
if (HDD_PSB_CFG_INVALID == adapter->configured_psb) {
qosInfo.ts_info.psb =
((WLAN_HDD_GET_CTX(adapter))->config->
UapsdMask & SME_QOS_UAPSD_VI) ? 1 : 0;
@ -1088,7 +1088,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
case SME_AC_BE:
qosInfo.ts_info.up = SME_QOS_WMM_UP_BE;
/* Check if there is any valid configuration from framework */
if (HDD_PSB_CFG_INVALID == adapter->configuredPsb) {
if (HDD_PSB_CFG_INVALID == adapter->configured_psb) {
qosInfo.ts_info.psb =
((WLAN_HDD_GET_CTX(adapter))->config->
UapsdMask & SME_QOS_UAPSD_BE) ? 1 : 0;
@ -1113,7 +1113,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
case SME_AC_BK:
qosInfo.ts_info.up = SME_QOS_WMM_UP_BK;
/* Check if there is any valid configuration from framework */
if (HDD_PSB_CFG_INVALID == adapter->configuredPsb) {
if (HDD_PSB_CFG_INVALID == adapter->configured_psb) {
qosInfo.ts_info.psb =
((WLAN_HDD_GET_CTX(adapter))->config->
UapsdMask & SME_QOS_UAPSD_BK) ? 1 : 0;
@ -1308,7 +1308,7 @@ QDF_STATUS hdd_wmm_adapter_init(struct hdd_adapter *adapter)
/* Invalid value(0xff) to indicate psb not configured through
* framework initially.
*/
adapter->configuredPsb = HDD_PSB_CFG_INVALID;
adapter->configured_psb = HDD_PSB_CFG_INVALID;
return QDF_STATUS_SUCCESS;
}
@ -1650,19 +1650,19 @@ void hdd_wmm_acquire_access_required(struct hdd_adapter *adapter,
switch (acType) {
case SME_AC_BK:
/* clear first bit */
adapter->psbChanged &= ~SME_QOS_UAPSD_CFG_BK_CHANGED_MASK;
adapter->psb_changed &= ~SME_QOS_UAPSD_CFG_BK_CHANGED_MASK;
break;
case SME_AC_BE:
/* clear second bit */
adapter->psbChanged &= ~SME_QOS_UAPSD_CFG_BE_CHANGED_MASK;
adapter->psb_changed &= ~SME_QOS_UAPSD_CFG_BE_CHANGED_MASK;
break;
case SME_AC_VI:
/* clear third bit */
adapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VI_CHANGED_MASK;
adapter->psb_changed &= ~SME_QOS_UAPSD_CFG_VI_CHANGED_MASK;
break;
case SME_AC_VO:
/* clear fourth bit */
adapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK;
adapter->psb_changed &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK;
break;
default:
hdd_err("Invalid AC Type");