qcacld-3.0: Move 6ghz check in band bitmap conversion API

Move the 6GHz support check so that the logic is invoked
regardless of the input band bitmap.

Change-Id: I45db2d2be8966ac073a8ede721d52bd689a98a88
CRs-fixed: 3069557

core/hdd/src/wlan_hdd_cfg80211.c

@@ -1012,13 +1012,8 @@ wlan_vendor_bitmap_to_reg_wifi_band_bitmap(struct wlan_objmgr_psoc *psoc,
 {
 	uint32_t reg_bitmap = 0;
 
-	if (vendor_bitmap == QCA_SETBAND_AUTO) {
+	if (vendor_bitmap == QCA_SETBAND_AUTO)
 		reg_bitmap |= REG_BAND_MASK_ALL;
-		if (!wlan_reg_is_6ghz_supported(psoc)) {
-			hdd_debug("Driver doesn't support 6ghz");
-			reg_bitmap = (reg_bitmap & (~BIT(REG_BAND_6G)));
-		}
-	}
 	if (vendor_bitmap & QCA_SETBAND_2G)
 		reg_bitmap |= BIT(REG_BAND_2G);
 	if (vendor_bitmap & QCA_SETBAND_5G)
@@ -1026,6 +1021,11 @@ wlan_vendor_bitmap_to_reg_wifi_band_bitmap(struct wlan_objmgr_psoc *psoc,
 	if (vendor_bitmap & QCA_SETBAND_6G)
 		reg_bitmap |= BIT(REG_BAND_6G);
 
+	if (!wlan_reg_is_6ghz_supported(psoc)) {
+		hdd_debug("Driver doesn't support 6ghz");
+		reg_bitmap = (reg_bitmap & (~BIT(REG_BAND_6G)));
+	}
+
 	return reg_bitmap;
 }