Procházet zdrojové kódy

qcacld-3.0: Rename HDD identifier wmmAcTspecInfo

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

Change-Id: I707b0351effc4a6d5d2554a283c519c89b0f0b42
CRs-Fixed: 2414518
Jeff Johnson před 6 roky
rodič
revize
64d94dd5d7

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

@@ -141,9 +141,9 @@ struct hdd_wmm_qos_context {
  * @is_access_allowed - is access to this AC allowed, either because we
  *	are not doing WMM, we are not doing implicit QoS, implict QoS has
  *	completed, or explicit QoS has completed?
- * @is_tspec_valid - is the wmmAcTspecInfo valid?
+ * @is_tspec_valid - is the tspec valid?
  * @is_uapsd_info_valid - are the UAPSD-related fields valid?
- * @wmmAcTspecInfo - current (possibly aggregate) Tspec for this AC
+ * @tspec - current (possibly aggregate) Tspec for this AC
  * @wmmAcIsUapsdEnabled - is UAPSD enabled on this AC?
  * @wmmAcUapsdServiceInterval - service interval for this AC
  * @wmmAcUapsdSuspensionInterval - suspension interval for this AC
@@ -161,7 +161,7 @@ struct hdd_wmm_ac_status {
 	bool is_access_allowed;
 	bool is_tspec_valid;
 	bool is_uapsd_info_valid;
-	struct sme_qos_wmmtspecinfo wmmAcTspecInfo;
+	struct sme_qos_wmmtspecinfo tspec;
 	bool wmmAcIsUapsdEnabled;
 	uint32_t wmmAcUapsdServiceInterval;
 	uint32_t wmmAcUapsdSuspensionInterval;

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

@@ -7058,7 +7058,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_VO].
 			 is_access_allowed ? "YES" : "NO",
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_VO].wmmAcTspecInfo.
+			 ac_status[SME_AC_VO].tspec.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_VI].is_access_required,
@@ -7066,7 +7066,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_VI].
 			 is_access_allowed ? "YES" : "NO",
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_VI].wmmAcTspecInfo.
+			 ac_status[SME_AC_VI].tspec.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_BE].is_access_required,
@@ -7074,7 +7074,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_BE].
 			 is_access_allowed ? "YES" : "NO",
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_BE].wmmAcTspecInfo.
+			 ac_status[SME_AC_BE].tspec.
 			 ts_info.direction,
 			 adapter->hdd_wmm_status.
 			 ac_status[SME_AC_BK].is_access_required,
@@ -7082,7 +7082,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			 ac_status[SME_AC_BK].
 			 is_access_allowed ? "YES" : "NO",
 			 adapter->hdd_wmm_status.
-			 ac_status[SME_AC_BK].wmmAcTspecInfo.
+			 ac_status[SME_AC_BK].tspec.
 			 ts_info.direction);
 
 		wrqu->data.length = strlen(extra) + 1;

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

@@ -132,10 +132,10 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 		return;
 	}
 	/* determine the service interval */
-	if (ac->wmmAcTspecInfo.min_service_interval) {
-		service_interval = ac->wmmAcTspecInfo.min_service_interval;
-	} else if (ac->wmmAcTspecInfo.max_service_interval) {
-		service_interval = ac->wmmAcTspecInfo.max_service_interval;
+	if (ac->tspec.min_service_interval) {
+		service_interval = ac->tspec.min_service_interval;
+	} else if (ac->tspec.max_service_interval) {
+		service_interval = ac->tspec.max_service_interval;
 	} else {
 		/* no service interval is present in the TSPEC */
 		/* this is OK, there just won't be U-APSD */
@@ -144,9 +144,9 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 	}
 
 	/* determine the suspension interval & direction */
-	suspension_interval = ac->wmmAcTspecInfo.suspension_interval;
-	direction = ac->wmmAcTspecInfo.ts_info.direction;
-	psb = ac->wmmAcTspecInfo.ts_info.psb;
+	suspension_interval = ac->tspec.suspension_interval;
+	direction = ac->tspec.ts_info.direction;
+	psb = ac->tspec.ts_info.psb;
 
 	/* if we have previously enabled U-APSD, have any params changed? */
 	if ((ac->is_uapsd_info_valid) &&
@@ -164,8 +164,8 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 	status =
 		sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR(adapter))->
 					   conn_info.sta_id[0], ac_type,
-					   ac->wmmAcTspecInfo.ts_info.tid,
-					   ac->wmmAcTspecInfo.ts_info.up,
+					   ac->tspec.ts_info.tid,
+					   ac->tspec.ts_info.up,
 					   service_interval, suspension_interval,
 					   direction, psb, adapter->vdev_id,
 					   delayed_trgr_frm_int);
@@ -525,8 +525,8 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 		 */
 		if (tspec_info) {
 			ac->is_tspec_valid = true;
-			memcpy(&ac->wmmAcTspecInfo,
-			       tspec_info, sizeof(ac->wmmAcTspecInfo));
+			memcpy(&ac->tspec,
+			       tspec_info, sizeof(ac->tspec));
 		}
 		ac->is_access_allowed = true;
 		ac->was_access_granted = true;
@@ -658,8 +658,8 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 		if (tspec_info) {
 			/* update the TSPEC */
 			ac->is_tspec_valid = true;
-			memcpy(&ac->wmmAcTspecInfo,
-			       tspec_info, sizeof(ac->wmmAcTspecInfo));
+			memcpy(&ac->tspec,
+			       tspec_info, sizeof(ac->tspec));
 
 			if (HDD_WMM_HANDLE_IMPLICIT != qos_context->handle) {
 				hdd_debug("Explicit Qos, notifying user space");
@@ -739,8 +739,8 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 			/* there is still at least one flow active for
 			 * this AC so update the AC state
 			 */
-			memcpy(&ac->wmmAcTspecInfo,
-			       tspec_info, sizeof(ac->wmmAcTspecInfo));
+			memcpy(&ac->tspec,
+			       tspec_info, sizeof(ac->tspec));
 
 			/* need to tell TL to update its UAPSD handling */
 			hdd_wmm_enable_tl_uapsd(qos_context);
@@ -844,8 +844,8 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 		 */
 		if (tspec_info) {
 			ac->is_tspec_valid = true;
-			memcpy(&ac->wmmAcTspecInfo,
-			       tspec_info, sizeof(ac->wmmAcTspecInfo));
+			memcpy(&ac->tspec,
+			       tspec_info, sizeof(ac->tspec));
 		}
 
 		if (HDD_WMM_HANDLE_IMPLICIT != qos_context->handle) {
@@ -957,13 +957,13 @@ static QDF_STATUS hdd_wmm_sme_callback(mac_handle_t mac_handle,
 	 * allowed
 	 */
 	if (ac->is_tspec_valid &&
-	    (ac->wmmAcTspecInfo.ts_info.direction ==
+	    (ac->tspec.ts_info.direction ==
 	     SME_QOS_WMM_TS_DIR_DOWNLINK)) {
 		ac->is_access_allowed = false;
 	}
 	/* if we have valid Tpsec or if ACM bit is not set, allow access */
 	if ((ac->is_tspec_valid &&
-	     (ac->wmmAcTspecInfo.ts_info.direction !=
+	     (ac->tspec.ts_info.direction !=
 	      SME_QOS_WMM_TS_DIR_DOWNLINK)) || !ac->is_access_required) {
 		ac->is_access_allowed = true;
 	}
@@ -2220,7 +2220,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 			if (adapter->hdd_wmm_status.ac_status[ac].
 			    is_tspec_valid
 			    && (adapter->hdd_wmm_status.ac_status[ac].
-				wmmAcTspecInfo.ts_info.direction !=
+				tspec.ts_info.direction !=
 				SME_QOS_WMM_TS_DIR_DOWNLINK)) {
 				adapter->hdd_wmm_status.ac_status[ac].
 				is_access_allowed = true;