Revert "qcacld-3.0: 11ac 160MHZ support workaround"

Revert the change merged while adding 160MHz support.

RM 5.0 FW was not handling phymode VHT20/40 in 2G correctly which
was resulting in an assert. This revert will now enable host to
associate in VHT20/40 modes in 2G. This change will revert
the Change-Id: I7e7f1a9c1ff82a567f278987dbbe14c5c8b9bb2e

Change-Id: If0f8fb71413e0aeb5d355c5bbb1f0626a18b8d6f
CRs-Fixed: 1014267

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -2048,7 +2048,7 @@ static void lim_fill_assoc_ind_vht_info(tpAniSirGlobal mac_ctx,
 
 	if (session_entry->limRFBand == SIR_BAND_2_4_GHZ) {
 		if (session_entry->vhtCapability && assoc_req->VHTCaps.present)
-			assoc_ind->chan_info.info = MODE_11AC_VHT20;
+			assoc_ind->chan_info.info = MODE_11AC_VHT20_2G;
 		else if (session_entry->htCapability
 			    && assoc_req->HTCaps.present)
 			assoc_ind->chan_info.info = MODE_11NG_HT20;

core/wma/src/wma_utils.c

@@ -1710,10 +1710,10 @@ WLAN_PHY_MODE wma_peer_phymode(tSirNwType nw_type, uint8_t sta_type,
 			WMA_LOGE("80/160 MHz BW sent in 11G, configured 40MHz");
 		if (ch_width)
 			phymode = (is_vht) ?
-				MODE_11AC_VHT40 : MODE_11NG_HT40;
+				MODE_11AC_VHT40_2G : MODE_11NG_HT40;
 		else
 			phymode = (is_vht) ?
-				MODE_11AC_VHT20 : MODE_11NG_HT20;
+				MODE_11AC_VHT20_2G : MODE_11NG_HT20;
 		break;
 	case eSIR_11A_NW_TYPE:
 		if (!(is_ht || is_vht)) {