qcacld-3.0: Re-enable 6 GHz connection

When initial connection was 320 MHz, via command SET_MAX_BANDWIDTH
set channel bandwidth less than 320 MHz, driver disable 6 GHz
connection by disable support_320mhz_6g EHT capability.
In order to allow re-connection with 320 MHz, need to re-enable
support_320mhz_6g EHT capability before disconnect complete.

Change-Id: I8b3203c14893d2c5db658ca42e90de4946c3d836
CRs-Fixed: 3629179

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -495,6 +495,27 @@ static inline enum eSirMacHTChannelWidth get_max_bw(void)
 	else
 		return eHT_CHANNEL_WIDTH_40MHZ;
 }
+
+static
+void wlan_hdd_re_enable_320mhz_6g_conection(struct hdd_context *hdd_ctx,
+					    enum phy_ch_width assoc_ch_width)
+{
+	struct wlan_mlme_psoc_ext_obj *mlme_obj;
+
+	mlme_obj = mlme_get_psoc_ext_obj(hdd_ctx->psoc);
+	if (!mlme_obj)
+		return;
+	/*
+	 * Initial connection was in 320 MHz and if via SET_MAX_BANDWIDTH
+	 * command, current channel BW (des_chan->ch_width) gets modified
+	 * to less than 320MHz, driver disables 6 GHz connection by disabling
+	 * support_320mhz_6ghz EHT capability. So, in order to allow
+	 * re-connection (after disconnection) in 320 MHz, also re-enable
+	 * support_320mhz_6ghz EHT capability before disconnect complete.
+	 */
+	if (assoc_ch_width == CH_WIDTH_320MHZ)
+		mlme_obj->cfg.eht_caps.dot11_eht_cap.support_320mhz_6ghz = 1;
+}
 #else
 static inline enum eSirMacHTChannelWidth get_max_bw(void)
 {
@@ -509,6 +530,12 @@ static inline enum eSirMacHTChannelWidth get_max_bw(void)
 	else
 		return eHT_CHANNEL_WIDTH_40MHZ;
 }
+
+static
+void wlan_hdd_re_enable_320mhz_6g_conection(struct hdd_context *hdd_ctx,
+					    enum phy_ch_width assoc_ch_width)
+{
+}
 #endif
 
 static void hdd_cm_restore_ch_width(struct wlan_objmgr_vdev *vdev,
@@ -538,6 +565,9 @@ static void hdd_cm_restore_ch_width(struct wlan_objmgr_vdev *vdev,
 
 	cm_update_associated_ch_info(vdev, false);
 
+	if (des_chan->ch_width != assoc_ch_width)
+		wlan_hdd_re_enable_320mhz_6g_conection(hdd_ctx, assoc_ch_width);
+
 	max_bw = get_max_bw();
 	ret = hdd_set_mac_chan_width(adapter, max_bw, link_id, true);
 	if (ret) {