qcacld-3.0: Tx rate show as 80M after roamed to 160M AP

When roaming to 160M AP by LFR3, host will update BSS info after
received roam sync event from firmware, but 160M isn't considered
when calculate channel width.
Actually vht_op->chanWidth alone cannot decide the actual BW, we need to
check difference of center_freq0 and center_freq1 to decide 160/80+80 or
80 if vht_op->chanWidth is 1.

Fix it by copying ft_session->ch_width to BSS info which covered 160M
channel width.

Change-Id: Ic4a992acfce186f7248dcc99d0c7b44ce38f099b
CRs-Fixed: 2954900

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

@@ -187,13 +187,19 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 	ft_session->htSecondaryChannelOffset =
 		pBeaconStruct->HTInfo.secondaryChannelOffset;
 	sta_ctx = &pAddBssParams->staContext;
+	/*
+	 * in lim_extract_ap_capability function intersection of FW
+	 * advertised channel width and AP advertised channel
+	 * width has been taken into account for calculating
+	 * pe_session->ch_width
+	 */
+	pAddBssParams->ch_width = ft_session->ch_width;
+	sta_ctx->ch_width = ft_session->ch_width;
 
 	if (ft_session->vhtCapability &&
 	    ft_session->vhtCapabilityPresentInBeacon) {
 		pAddBssParams->vhtCapable = pBeaconStruct->VHTCaps.present;
 		if (pBeaconStruct->VHTOperation.chanWidth && chan_width_support)
-			pAddBssParams->ch_width =
-				pBeaconStruct->VHTOperation.chanWidth + 1;
 		vht_caps = &pBeaconStruct->VHTCaps;
 		lim_update_vhtcaps_assoc_resp(mac, pAddBssParams,
 					      vht_caps, ft_session);
@@ -204,8 +210,6 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 			pBeaconStruct->vendor_vht_ie.VHTCaps.present;
 		if (pBeaconStruct->vendor_vht_ie.VHTOperation.chanWidth &&
 		    chan_width_support)
-			pAddBssParams->ch_width =
-			pBeaconStruct->vendor_vht_ie.VHTOperation.chanWidth + 1;
 		vht_caps = &pBeaconStruct->vendor_vht_ie.VHTCaps;
 		lim_update_vhtcaps_assoc_resp(mac, pAddBssParams,
 					      vht_caps, ft_session);
@@ -225,8 +229,8 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		lim_add_bss_eht_cfg(pAddBssParams, ft_session);
 	}
 
-	pe_debug("SIR_HAL_ADD_BSS_REQ with frequency: %d",
-		bssDescription->chan_freq);
+	pe_debug("SIR_HAL_ADD_BSS_REQ with frequency: %d, width: %d",
+		 bssDescription->chan_freq, pAddBssParams->ch_width);
 
 	/* Populate the STA-related parameters here */
 	/* Note that the STA here refers to the AP */
@@ -250,14 +254,6 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		if (IS_DOT11_MODE_HT(ft_session->dot11mode) &&
 		    (pBeaconStruct->HTCaps.present)) {
 			pAddBssParams->staContext.htCapable = 1;
-			if (pBeaconStruct->HTCaps.supportedChannelWidthSet &&
-			    chan_width_support) {
-				pAddBssParams->staContext.ch_width = (uint8_t)
-					pBeaconStruct->HTInfo.recommendedTxWidthSet;
-			} else {
-				pAddBssParams->staContext.ch_width =
-					CH_WIDTH_20MHZ;
-			}
 			if (ft_session->vhtCapability &&
 			    IS_BSS_VHT_CAPABLE(pBeaconStruct->VHTCaps)) {
 				pAddBssParams->staContext.vhtCapable = 1;
@@ -281,19 +277,6 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 							  pAddBssParams,
 							  pBeaconStruct, NULL);
 
-			if (pBeaconStruct->HTCaps.supportedChannelWidthSet &&
-			    chan_width_support) {
-				sta_ctx->ch_width = (uint8_t)
-					pBeaconStruct->HTInfo.recommendedTxWidthSet;
-				if (pAddBssParams->staContext.vhtCapable &&
-					pBeaconStruct->VHTOperation.chanWidth)
-					sta_ctx->ch_width =
-					pBeaconStruct->VHTOperation.chanWidth
-						+ 1;
-			} else {
-				pAddBssParams->staContext.ch_width =
-					CH_WIDTH_20MHZ;
-			}
 			pAddBssParams->staContext.mimoPS =
 				(tSirMacHTMIMOPowerSaveState) pBeaconStruct->HTCaps.
 				mimoPowerSave;