qcacld-3.0: Remove current country BSSID & RSSI fields

struct csr_scanstruct contains fields currentCountryBssid and
currentCountryRSSI which are obsolete, so remove them.

Change-Id: I47f40cc687b0e905d3c2db4ad67fa32f70d5181e
CRs-Fixed: 2212972

core/sme/inc/csr_internal.h

@@ -666,10 +666,6 @@ struct csr_scanstruct {
 	v_REGDOMAIN_t domainIdDefault;  /* default regulatory domain */
 	v_REGDOMAIN_t domainIdCurrent;  /* current regulatory domain */
 
-	/* Bssid for current country code */
-	struct qdf_mac_addr currentCountryBssid;
-
-	int8_t currentCountryRSSI;      /* RSSI for current country code */
 	bool fCancelIdleScan;
 	uint8_t countryCodeCount;
 	/* counts for various advertized country codes */

core/sme/src/csr/csr_api_roam.c

@@ -3729,7 +3729,6 @@ static QDF_STATUS csr_init11d_info(tpAniSirGlobal pMac, tCsr11dinfo *ps11dinfo)
 	tSirMacChanInfo *pChanInfoStart;
 	bool applyConfig = true;
 
-	pMac->scan.currentCountryRSSI = -128;
 	if (!ps11dinfo)
 		return status;
 
@@ -5502,14 +5501,6 @@ QDF_STATUS csr_roam_set_bss_config_cfg(tpAniSirGlobal pMac, uint32_t sessionId,
 		if ((wlan_reg_11d_enabled_on_host(pMac->psoc)) && pIes) {
 			if (!pIes->Country.present)
 				csr_apply_channel_power_info_wrapper(pMac);
-			else
-				/* Let's also update the below to make sure
-				 * we don't update CC while connected to an
-				 * AP which is advertising some CC
-				 */
-				qdf_mem_copy(pMac->scan.currentCountryBssid.
-					bytes, pBssDesc->bssId,
-					     sizeof(tSirMacAddr));
 		}
 	}
 	/* Qos */