qcacld-3.0: Rename operationChannel in struct hdd_connection_info

The Linux Coding Style frowns upon mixed-case names so rename field
operationChannel in struct hdd_connection_info to be compliant.

Change-Id: Ic6d600997fc41a17c1ff6502a576b14b3f3ca2c0
CRs-Fixed: 2409884

core/hdd/inc/wlan_hdd_assoc.h

@@ -146,7 +146,7 @@ struct hdd_conn_flag {
  * @auth_type: Auth Type
  * @uc_encrypt_type: Unicast Encryption Type
  * @mc_encrypt_type: Multicast Encryption Type
- * @operationChannel: Operation Channel
+ * @channel: Operation Channel
  * @is_authenticated: Remembers authenticated state
  * @dot11mode: dot11mode
  * @proxy_arp_service: proxy arp service
@@ -180,7 +180,7 @@ struct hdd_connection_info {
 	eCsrAuthType auth_type;
 	eCsrEncryptionType uc_encrypt_type;
 	eCsrEncryptionType mc_encrypt_type;
-	uint8_t operationChannel;
+	uint8_t channel;
 	uint8_t is_authenticated;
 	uint32_t dot11mode;
 	uint8_t proxy_arp_service;

core/hdd/src/wlan_hdd_assoc.c

@@ -337,7 +337,7 @@ enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *sta_ctx)
 	uint8_t staChannel = 0;
 
 	if (eConnectionState_Associated == sta_ctx->conn_info.conn_state)
-		staChannel = sta_ctx->conn_info.operationChannel;
+		staChannel = sta_ctx->conn_info.channel;
 
 	if (staChannel > 0 && staChannel < 14)
 		return BAND_2G;
@@ -907,7 +907,7 @@ static void hdd_save_bss_info(struct hdd_adapter *adapter,
 		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	hdd_sta_ctx->conn_info.freq = cds_chan_to_freq(
-		hdd_sta_ctx->conn_info.operationChannel);
+		hdd_sta_ctx->conn_info.channel);
 	if (roam_info->vht_caps.present) {
 		hdd_sta_ctx->conn_info.conn_flag.vht_present = true;
 		hdd_copy_vht_caps(&hdd_sta_ctx->conn_info.vht_caps,
@@ -1016,7 +1016,7 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 			sta_ctx->conn_info.last_auth_type =
 				sta_ctx->conn_info.auth_type;
 
-			sta_ctx->conn_info.operationChannel =
+			sta_ctx->conn_info.channel =
 			    roam_info->u.pConnectedProfile->operationChannel;
 
 			/* Save the ssid for the connection */
@@ -2916,16 +2916,16 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 
 		hdd_debug("check if STA chan ok for DNBS");
 		if (policy_mgr_is_chan_ok_for_dnbs(hdd_ctx->psoc,
-					sta_ctx->conn_info.operationChannel,
+					sta_ctx->conn_info.channel,
 					&ok)) {
 			hdd_err("Unable to check DNBS eligibility for chan:%d",
-					sta_ctx->conn_info.operationChannel);
+					sta_ctx->conn_info.channel);
 			return QDF_STATUS_E_FAILURE;
 		}
 
 		if (!ok) {
 			hdd_err("Chan:%d not suitable for DNBS",
-				sta_ctx->conn_info.operationChannel);
+				sta_ctx->conn_info.channel);
 			wlan_hdd_netif_queue_control(adapter,
 				WLAN_NETIF_CARRIER_OFF,
 				WLAN_CONTROL_PATH);
@@ -3114,7 +3114,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						cdp_hl_fc_set_td_limit(soc,
 						adapter->vdev_id,
 						sta_ctx->
-						conn_info.operationChannel);
+						conn_info.channel);
 
 						hdd_send_roamed_ind(
 								dev,
@@ -3162,7 +3162,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 						 ft_carrier_on);
 					cdp_hl_fc_set_td_limit(soc,
 					adapter->vdev_id,
-					sta_ctx->conn_info.operationChannel);
+					sta_ctx->conn_info.channel);
 					hdd_connect_result(dev,
 							   roam_info->
 							   bssid.bytes,
@@ -3221,7 +3221,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 					}
 					cdp_hl_fc_set_td_limit(soc,
 					adapter->vdev_id,
-					sta_ctx->conn_info.operationChannel);
+					sta_ctx->conn_info.channel);
 				}
 			}
 			if (!hddDisconInProgress) {
@@ -3258,7 +3258,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 
 			cdp_hl_fc_set_td_limit(soc,
 				adapter->vdev_id,
-				sta_ctx->conn_info.operationChannel);
+				sta_ctx->conn_info.channel);
 			hdd_send_re_assoc_event(dev, adapter, roam_info,
 						reqRsnIe, reqRsnLength);
 			/* Reassoc successfully */

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4250,7 +4250,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(struct hdd_context *hdd_ctx,
 			if (hdd_conn_is_connected(sta_ctx) &&
 				(CHANNEL_STATE_DFS ==
 				wlan_reg_get_channel_state(hdd_ctx->pdev,
-					sta_ctx->conn_info.operationChannel))) {
+					sta_ctx->conn_info.channel))) {
 				hdd_err("client connected on DFS channel");
 				return true;
 			}
@@ -8204,7 +8204,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 
 		nss  = hdd_sta_ctx->conn_info.nss;
 		freq = cds_chan_to_freq(
-				hdd_sta_ctx->conn_info.operationChannel);
+				hdd_sta_ctx->conn_info.channel);
 		rate_flags = hdd_sta_ctx->conn_info.rate_flags;
 	} else if (adapter->device_mode == QDF_P2P_GO_MODE ||
 		   adapter->device_mode == QDF_SAP_MODE) {
@@ -18508,9 +18508,9 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		/* Set the Operational Channel */
 		hdd_debug("set channel %d", channelNum);
 		roam_profile->ChannelInfo.numOfChannels = 1;
-		sta_ctx->conn_info.operationChannel = channelNum;
+		sta_ctx->conn_info.channel = channelNum;
 		roam_profile->ChannelInfo.ChannelList =
-			&sta_ctx->conn_info.operationChannel;
+			&sta_ctx->conn_info.channel;
 	}
 
 	/* Initialize security parameters */
@@ -18525,7 +18525,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 						 params->ssid_len,
 						 bssid.bytes, NULL,
 						 sta_ctx->conn_info.
-						 operationChannel,
+						 channel,
 						 params->chandef.width);
 
 	if (0 > status) {

core/hdd/src/wlan_hdd_hostapd.c

@@ -3111,7 +3111,7 @@ QDF_STATUS wlan_hdd_get_channel_for_sap_restart(
 				policy_mgr_mode_specific_get_channel(
 					hdd_ctx->psoc, PM_SAP_MODE)))) {
 			hdd_debug("can't move sap to %d",
-				hdd_sta_ctx->conn_info.operationChannel);
+				hdd_sta_ctx->conn_info.channel);
 			return QDF_STATUS_E_FAILURE;
 		}
 	}
@@ -3610,9 +3610,9 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 
 		roam_profile = hdd_roam_profile(adapter);
 		num_ch = roam_profile->ChannelInfo.numOfChannels = 1;
-		sta_ctx->conn_info.operationChannel = channel;
+		sta_ctx->conn_info.channel = channel;
 		roam_profile->ChannelInfo.ChannelList =
-			&sta_ctx->conn_info.operationChannel;
+			&sta_ctx->conn_info.channel;
 	} else if ((adapter->device_mode == QDF_SAP_MODE)
 		   || (adapter->device_mode == QDF_P2P_GO_MODE)
 		   ) {

core/hdd/src/wlan_hdd_ioctl.c

@@ -737,7 +737,7 @@ int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 	if (!memcmp(bssid, sta_ctx->conn_info.bssid.bytes,
 			QDF_MAC_ADDR_SIZE)) {
 		hdd_warn("Reassoc BSSID is same as currently associated AP bssid");
-		channel = sta_ctx->conn_info.operationChannel;
+		channel = sta_ctx->conn_info.channel;
 	}
 
 	/* Check channel number is a valid channel number */
@@ -958,11 +958,11 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 			 */
 			if (channel != 0) {
 				if (channel !=
-				    sta_ctx->conn_info.operationChannel) {
+				    sta_ctx->conn_info.channel) {
 					hdd_warn("channel(%d) is different from operating channel(%d)",
 						  channel,
 						  sta_ctx->conn_info.
-						  operationChannel);
+						  channel);
 					ret = -EINVAL;
 					goto exit;
 				}
@@ -983,7 +983,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 				 */
 				chan.center_freq =
 					sme_chn_to_freq(sta_ctx->conn_info.
-							operationChannel);
+							channel);
 			}
 		}
 	}
@@ -4319,7 +4319,7 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 			 QDF_MAC_ADDR_SIZE)) {
 		hdd_warn("Reassoc BSSID is same as currently associated AP bssid");
 		if (roaming_offload_enabled(hdd_ctx)) {
-			channel = sta_ctx->conn_info.operationChannel;
+			channel = sta_ctx->conn_info.channel;
 			hdd_wma_send_fastreassoc_cmd(adapter, bssid,
 						     channel);
 		} else {

core/hdd/src/wlan_hdd_ipa.c

@@ -76,7 +76,7 @@ void hdd_ipa_set_tx_flow_info(void)
 			if (eConnectionState_Associated ==
 			    sta_ctx->conn_info.conn_state) {
 				staChannel =
-					sta_ctx->conn_info.operationChannel;
+					sta_ctx->conn_info.channel;
 				qdf_copy_macaddr(&staBssid,
 						 &sta_ctx->conn_info.bssid);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
@@ -89,7 +89,7 @@ void hdd_ipa_set_tx_flow_info(void)
 			if (eConnectionState_Associated ==
 			    sta_ctx->conn_info.conn_state) {
 				p2pChannel =
-					sta_ctx->conn_info.operationChannel;
+					sta_ctx->conn_info.channel;
 				qdf_copy_macaddr(&p2pBssid,
 						&sta_ctx->conn_info.bssid);
 				p2pMode = "CLI";

core/hdd/src/wlan_hdd_lpass.c

@@ -141,7 +141,7 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 		data->is_connected = is_connected;
 		data->rssi = adapter->rssi;
 		data->freq =
-			cds_chan_to_freq(sta_ctx->conn_info.operationChannel);
+			cds_chan_to_freq(sta_ctx->conn_info.channel);
 		if (WLAN_SVC_MAX_SSID_LEN >=
 		    sta_ctx->conn_info.ssid.SSID.length) {
 			data->ssid_len = sta_ctx->conn_info.ssid.SSID.length;

core/hdd/src/wlan_hdd_main.c

@@ -4312,7 +4312,7 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 	status = sme_config_fast_roaming(mac_handle, adapter->vdev_id,
 					 true);
 	/* Set the default operation channel */
-	sta_ctx->conn_info.operationChannel =
+	sta_ctx->conn_info.channel =
 		hdd_ctx->config->operating_channel;
 
 	/* Make the default Auth Type as OPEN */
@@ -6947,7 +6947,7 @@ uint8_t hdd_get_operating_channel(struct hdd_context *hdd_ctx,
 					operatingChannel =
 						(WLAN_HDD_GET_STATION_CTX_PTR
 						(adapter))->conn_info.
-							operationChannel;
+							channel;
 				}
 				break;
 			case QDF_SAP_MODE:

core/hdd/src/wlan_hdd_wext.c

@@ -7487,7 +7487,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
 		tSirMacAddr bssid;
 		uint32_t roam_id = INVALID_ROAM_ID;
 		uint8_t operating_ch =
-			adapter->session.station.conn_info.operationChannel;
+			adapter->session.station.conn_info.channel;
 		tCsrRoamModifyProfileFields mod_fields;
 
 		sme_get_modify_profile_fields(mac_handle, adapter->vdev_id,