qcacld-3.0: Enable shortGI for 160 MHz based on BW cap

Enable the short GI support for 160 and 80+80 MHz only
if 160/80+80 MHz self cap is enabled for the STA DUT.

Change-Id: I4b9de06fe5b0cc8aecb35207fa1d117bfc23ed30
CRs-Fixed: 3416932

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -1367,8 +1367,10 @@ populate_dot11f_vht_caps(struct mac_context *mac,
 
 		pDot11f->shortGI80MHz =
 			pe_session->vht_config.shortgi80;
-		pDot11f->shortGI160and80plus80MHz =
-			pe_session->vht_config.shortgi160and80plus80;
+
+		if (pDot11f->supportedChannelWidthSet)
+			pDot11f->shortGI160and80plus80MHz =
+				pe_session->vht_config.shortgi160and80plus80;
 
 		if (pe_session->ht_config.tx_stbc)
 			pDot11f->txSTBC = pe_session->vht_config.tx_stbc;
@@ -1414,8 +1416,10 @@ populate_dot11f_vht_caps(struct mac_context *mac,
 		nCfgValue = vht_cap_info->short_gi_80mhz;
 		pDot11f->shortGI80MHz = (nCfgValue & 0x0001);
 
-		nCfgValue = vht_cap_info->short_gi_160mhz;
-		pDot11f->shortGI160and80plus80MHz = (nCfgValue & 0x0001);
+		if (pDot11f->supportedChannelWidthSet) {
+			nCfgValue = vht_cap_info->short_gi_160mhz;
+			pDot11f->shortGI160and80plus80MHz = (nCfgValue & 0x0001);
+		}
 
 		nCfgValue = vht_cap_info->tx_stbc;
 		pDot11f->txSTBC = (nCfgValue & 0x0001);