Browse Source

qcacld-3.0: Rename HDD identifier wmmAcAccessRequired

The Linux Coding Style frowns upon mixed-case names so rename HDD
identifier wmmAcAccessRequired to be compliant.

Change-Id: I7492d6e53624d741a87a3ebbb414d48139d0c8f0
CRs-Fixed: 2414510
Jeff Johnson 6 years ago
parent
commit
30ac84f123
3 changed files with 13 additions and 13 deletions
  1. 2 2
      core/hdd/inc/wlan_hdd_wmm.h
  2. 4 4
      core/hdd/src/wlan_hdd_wext.c
  3. 7 7
      core/hdd/src/wlan_hdd_wmm.c

+ 2 - 2
core/hdd/inc/wlan_hdd_wmm.h

@@ -132,7 +132,7 @@ struct hdd_wmm_qos_context {
 
 /**
  * struct hdd_wmm_ac_status - WMM related per-AC state & status info
- * @wmmAcAccessRequired - does the AP require access to this AC?
+ * @is_access_required - does the AP require access to this AC?
  * @wmmAcAccessNeeded - does the worker thread need to acquire access to
  *	this AC?
  * @wmmAcAccessPending - is implicit QoS negotiation currently taking place?
@@ -153,7 +153,7 @@ struct hdd_wmm_qos_context {
  * @wmmInactivityTimer - timer used for inactivity detection
  */
 struct hdd_wmm_ac_status {
-	bool wmmAcAccessRequired;
+	bool is_access_required;
 	bool wmmAcAccessNeeded;
 	bool wmmAcAccessPending;
 	bool wmmAcAccessFailed;

+ 4 - 4
core/hdd/src/wlan_hdd_wext.c

@@ -7053,7 +7053,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 "|BK |  %d  |  %3s   |  %d  |\n"
 			 "|------------------------|\n",
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_VO].wmmAcAccessRequired,
+			 ac_status[SME_AC_VO].is_access_required,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_VO].
 			 wmmAcAccessAllowed ? "YES" : "NO",
@@ -7061,7 +7061,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_VO].wmmAcTspecInfo.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_VI].wmmAcAccessRequired,
+			 ac_status[SME_AC_VI].is_access_required,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_VI].
 			 wmmAcAccessAllowed ? "YES" : "NO",
@@ -7069,7 +7069,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_VI].wmmAcTspecInfo.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_BE].wmmAcAccessRequired,
+			 ac_status[SME_AC_BE].is_access_required,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_BE].
 			 wmmAcAccessAllowed ? "YES" : "NO",
@@ -7077,7 +7077,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_BE].wmmAcTspecInfo.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_BK].wmmAcAccessRequired,
+			 ac_status[SME_AC_BK].is_access_required,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_BK].
 			 wmmAcAccessAllowed ? "YES" : "NO",

+ 7 - 7
core/hdd/src/wlan_hdd_wmm.c

@@ -964,7 +964,7 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 	/* if we have valid Tpsec or if ACM bit is not set, allow access */
 	if ((ac->wmmAcTspecValid &&
 	     (ac->wmmAcTspecInfo.ts_info.direction !=
-	      SME_QOS_WMM_TS_DIR_DOWNLINK)) || !ac->wmmAcAccessRequired) {
+	      SME_QOS_WMM_TS_DIR_DOWNLINK)) || !ac->is_access_required) {
 		ac->wmmAcAccessAllowed = true;
 	}
 
@@ -1515,7 +1515,7 @@ QDF_STATUS hdd_wmm_adapter_init(struct hdd_adapter *adapter)
 
 	for (ac_type = 0; ac_type < WLAN_MAX_AC; ac_type++) {
 		ac_status = &adapter->hdd_wmm_status.ac_status[ac_type];
-		ac_status->wmmAcAccessRequired = false;
+		ac_status->is_access_required = false;
 		ac_status->wmmAcAccessNeeded = false;
 		ac_status->wmmAcAccessPending = false;
 		ac_status->wmmAcAccessFailed = false;
@@ -1548,7 +1548,7 @@ QDF_STATUS hdd_wmm_adapter_clear(struct hdd_adapter *adapter)
 	hdd_enter();
 	for (ac_type = 0; ac_type < WLAN_MAX_AC; ac_type++) {
 		ac_status = &adapter->hdd_wmm_status.ac_status[ac_type];
-		ac_status->wmmAcAccessRequired = false;
+		ac_status->is_access_required = false;
 		ac_status->wmmAcAccessNeeded = false;
 		ac_status->wmmAcAccessPending = false;
 		ac_status->wmmAcAccessFailed = false;
@@ -1903,7 +1903,7 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
 			hdd_err("Get implicit_qos_is_enabled failed");
 		}
 	if (!hdd_wmm_is_active(adapter) || !(enable) ||
-	    !adapter->hdd_wmm_status.ac_status[ac_type].wmmAcAccessRequired) {
+	    !adapter->hdd_wmm_status.ac_status[ac_type].is_access_required) {
 		/* either we don't want QoS or the AP doesn't support
 		 * QoS or we don't want to do implicit QoS
 		 */
@@ -1942,7 +1942,7 @@ QDF_STATUS hdd_wmm_acquire_access(struct hdd_adapter *adapter,
 			  __func__, ac_type);
 
 		if (!adapter->hdd_wmm_status.ac_status[ac_type].
-		    wmmAcAccessRequired) {
+		    is_access_required) {
 			adapter->hdd_wmm_status.ac_status[ac_type].
 			wmmAcAccessAllowed = true;
 			*granted = true;
@@ -2211,7 +2211,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 
 			/* admission is required */
 			adapter->hdd_wmm_status.ac_status[ac].
-			wmmAcAccessRequired = true;
+			is_access_required = true;
 			adapter->hdd_wmm_status.ac_status[ac].
 			wmmAcAccessAllowed = false;
 			adapter->hdd_wmm_status.ac_status[ac].
@@ -2239,7 +2239,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 			hdd_debug("ac %d off", ac);
 			/* admission is not required so access is allowed */
 			adapter->hdd_wmm_status.ac_status[ac].
-			wmmAcAccessRequired = false;
+			is_access_required = false;
 			adapter->hdd_wmm_status.ac_status[ac].
 			wmmAcAccessAllowed = true;
 		}