Browse Source

qcacld-3.0: Rename HDD identifier currBand

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

Change-Id: I5ecc8773f985ca4558a87250446f492ec7f6b1cc
CRs-Fixed: 2414994
Jeff Johnson 6 years ago
parent
commit
dbae017255
2 changed files with 9 additions and 9 deletions
  1. 5 5
      core/hdd/src/wlan_hdd_regulatory.c
  2. 4 4
      core/hdd/src/wlan_hdd_wext.c

+ 5 - 5
core/hdd/src/wlan_hdd_regulatory.c

@@ -749,7 +749,7 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 	enum band_info band;
 	QDF_STATUS status;
 	struct hdd_context *hdd_ctx;
-	enum band_info currBand;
+	enum band_info current_band;
 	enum band_info connectedBand;
 	long lrc;
 	uint8_t band_capability;
@@ -791,13 +791,13 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 		band = band_capability;
 	}
 
-	if (ucfg_reg_get_curr_band(hdd_ctx->pdev, &currBand) !=
+	if (ucfg_reg_get_curr_band(hdd_ctx->pdev, &current_band) !=
 	    QDF_STATUS_SUCCESS) {
 		hdd_debug("Failed to get current band config");
 		return -EIO;
 	}
 
-	if (currBand == band)
+	if (current_band == band)
 		return 0;
 
 	hdd_ctx->curr_band = band;
@@ -807,7 +807,7 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 	 * and change the band capability
 	 */
 	hdd_debug("Current band value = %u, new setting %u ",
-			currBand, band);
+			current_band, band);
 
 	mac_handle = hdd_ctx->mac_handle;
 	hdd_for_each_adapter(hdd_ctx, adapter) {
@@ -832,7 +832,7 @@ int hdd_reg_set_band(struct net_device *dev, u8 ui_band)
 
 			hdd_debug("STA (Device mode %s(%d)) connected in band %u, Changing band to %u, Issuing Disconnect",
 				  qdf_opmode_str(adapter->device_mode),
-				  adapter->device_mode, currBand, band);
+				  adapter->device_mode, current_band, band);
 			INIT_COMPLETION(adapter->disconnect_comp_var);
 
 			status = sme_roam_disconnect(

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

@@ -7243,7 +7243,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		bool ch_bond24 = false, ch_bond5g = false;
 		struct hdd_context *hddctx = WLAN_HDD_GET_CTX(adapter);
 		eCsrPhyMode phymode;
-		enum band_info currBand;
+		enum band_info current_band;
 		struct sme_config_params *sme_config;
 
 		sme_config = qdf_mem_malloc(sizeof(*sme_config));
@@ -7266,7 +7266,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 
 		phymode = sme_get_phy_mode(mac_handle);
 		if ((QDF_STATUS_SUCCESS !=
-		     sme_get_freq_band(mac_handle, &currBand))) {
+		     sme_get_freq_band(mac_handle, &current_band))) {
 			hdd_err("Failed to get current band config");
 			return -EIO;
 		}
@@ -7277,14 +7277,14 @@ static int __iw_get_char_setnone(struct net_device *dev,
 			break;
 		case eCSR_DOT11_MODE_11n:
 		case eCSR_DOT11_MODE_11n_ONLY:
-			if (currBand == BAND_2G) {
+			if (current_band == BAND_2G) {
 				if (ch_bond24)
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NGHT40");
 				else
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NGHT20");
-			} else if (currBand == BAND_5G) {
+			} else if (current_band == BAND_5G) {
 				if (ch_bond5g)
 					snprintf(extra, WE_MAX_STR_LEN,
 						 "11NAHT40");