Browse Source

qcacld-3.0: Reindent lim_fill_assoc_ind_wapi_info

This patch fixes multi-level indentation for function
lim_fill_assoc_ind_wapi_info()

Change-Id: I438309425a82bb76c4c31d463b6cead7c661e27b
CRs-Fixed: 824222
Naveen Rawat 9 years ago
parent
commit
6186ff9600
1 changed files with 47 additions and 43 deletions
  1. 47 43
      core/mac/src/pe/lim/lim_process_assoc_req_frame.c

+ 47 - 43
core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -1660,61 +1660,65 @@ static void lim_fill_assoc_ind_wapi_info(tpAniSirGlobal mac_ctx,
  * Return: None
  */
 static void lim_fill_assoc_ind_vht_info(tpAniSirGlobal mac_ctx,
-	tpPESession session_entry, tpSirAssocReq assoc_req,
-	tpLimMlmAssocInd assoc_ind)
+					tpPESession session_entry,
+					tpSirAssocReq assoc_req,
+					tpLimMlmAssocInd assoc_ind)
 {
 	uint8_t chan;
 
 	if (session_entry->limRFBand == SIR_BAND_2_4_GHZ) {
-		if (session_entry->vhtCapability
-			&& assoc_req->VHTCaps.present)
+		if (session_entry->vhtCapability && assoc_req->VHTCaps.present)
 			assoc_ind->chan_info.info = MODE_11AC_VHT20;
 		else if (session_entry->htCapability
-				&& assoc_req->HTCaps.present)
+			    && assoc_req->HTCaps.present)
 			assoc_ind->chan_info.info = MODE_11NG_HT20;
 		else
 			assoc_ind->chan_info.info = MODE_11G;
-	} else {
-		if (session_entry->vhtCapability
-			&& assoc_req->VHTCaps.present) {
-			if ((session_entry->ch_width > CH_WIDTH_40MHZ)
-				&& assoc_req->HTCaps.supportedChannelWidthSet) {
-				chan = session_entry->ch_center_freq_seg0;
-				assoc_ind->chan_info.band_center_freq1 =
-					cds_chan_to_freq(chan);
-				assoc_ind->chan_info.info = MODE_11AC_VHT80;
-			} else if ((session_entry->ch_width == CH_WIDTH_40MHZ)
-				&& assoc_req->HTCaps.supportedChannelWidthSet) {
-				assoc_ind->chan_info.info = MODE_11AC_VHT40;
-				if (session_entry->htSecondaryChannelOffset ==
-					PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
-					assoc_ind->chan_info.band_center_freq1
-						+= 10;
-				else
-					assoc_ind->chan_info.band_center_freq1
-						-= 10;
-			} else {
-				assoc_ind->chan_info.info = MODE_11AC_VHT20;
-			}
-		} else if (session_entry->htCapability
-				&& assoc_req->HTCaps.present) {
-			if ((session_entry->ch_width == CH_WIDTH_40MHZ)
+		return;
+	}
+
+	if (session_entry->vhtCapability && assoc_req->VHTCaps.present) {
+		if ((session_entry->ch_width > CH_WIDTH_40MHZ)
+		    && assoc_req->HTCaps.supportedChannelWidthSet) {
+			chan = session_entry->ch_center_freq_seg0;
+			assoc_ind->chan_info.band_center_freq1 =
+				cds_chan_to_freq(chan);
+			assoc_ind->chan_info.info = MODE_11AC_VHT80;
+			return;
+		}
+
+		if ((session_entry->ch_width == CH_WIDTH_40MHZ)
 			&& assoc_req->HTCaps.supportedChannelWidthSet) {
-				assoc_ind->chan_info.info = MODE_11NA_HT40;
-				if (session_entry->htSecondaryChannelOffset ==
-					PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
-					assoc_ind->chan_info.band_center_freq1
-						+= 10;
-				else
-					assoc_ind->chan_info.band_center_freq1
-						-= 10;
-			} else {
-				assoc_ind->chan_info.info = MODE_11NA_HT20;
-			}
-		} else {
-			assoc_ind->chan_info.info = MODE_11A;
+			assoc_ind->chan_info.info = MODE_11AC_VHT40;
+			if (session_entry->htSecondaryChannelOffset ==
+			    PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
+				assoc_ind->chan_info.band_center_freq1 += 10;
+			else
+				assoc_ind->chan_info.band_center_freq1 -= 10;
+			return;
+		}
+
+		assoc_ind->chan_info.info = MODE_11AC_VHT20;
+		return;
+	}
+
+	if (session_entry->htCapability && assoc_req->HTCaps.present) {
+		if ((session_entry->ch_width == CH_WIDTH_40MHZ)
+		    && assoc_req->HTCaps.supportedChannelWidthSet) {
+			assoc_ind->chan_info.info = MODE_11NA_HT40;
+			if (session_entry->htSecondaryChannelOffset ==
+			    PHY_DOUBLE_CHANNEL_LOW_PRIMARY)
+				assoc_ind->chan_info.band_center_freq1 += 10;
+			else
+				assoc_ind->chan_info.band_center_freq1 -= 10;
+			return;
 		}
+
+		assoc_ind->chan_info.info = MODE_11NA_HT20;
+		return;
 	}
+
+	assoc_ind->chan_info.info = MODE_11A;
 	return;
 }