qcacld-3.0: Downgrade bandwidth to 40Mhz in 2.4Ghz case

When the channel list contains only 2.4Ghz channels and
bandwidth is coming as 80Mhz in __wlan_hdd_cfg80211_do_acs(),
max weight gets assigned to all the channels irrespective of
scan results and channel 1 gets selected in the end.

Downgrade bandwidth to 40Mhz if channel list contains only 2.4Ghz
channels and bandwidth is coming as 80Mhz.

Change-Id: I0e54b5db0020768c219acc0d864e72813c9185e9
CRs-Fixed: 2193438

core/hdd/src/wlan_hdd_cfg80211.c

@@ -2721,12 +2721,13 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 		sap_config->acs_cfg.hw_mode = eCSR_DOT11_MODE_11ac;
 		sap_config->acs_cfg.ch_width =
 					hdd_ctx->config->vhtChannelWidth;
-		/* No VHT80 in 2.4G so perform ACS accordingly */
-		if (sap_config->acs_cfg.end_ch <= 14 &&
-		    sap_config->acs_cfg.ch_width == eHT_CHANNEL_WIDTH_80MHZ) {
-			sap_config->acs_cfg.ch_width = eHT_CHANNEL_WIDTH_40MHZ;
-			hdd_debug("resetting to 40Mhz in 2.4Ghz");
-		}
+	}
+
+	/* No VHT80 in 2.4G so perform ACS accordingly */
+	if (sap_config->acs_cfg.end_ch <= 14 &&
+	    sap_config->acs_cfg.ch_width == eHT_CHANNEL_WIDTH_80MHZ) {
+		sap_config->acs_cfg.ch_width = eHT_CHANNEL_WIDTH_40MHZ;
+		hdd_debug("resetting to 40Mhz in 2.4Ghz");
 	}
 
 	hdd_debug("ACS Config for %s: HW_MODE: %d ACS_BW: %d HT: %d VHT: %d START_CH: %d END_CH: %d band %d",