qcacmn: Replace different struct of SISD with struct wlan_ssid

There are different version of SSID structure used in driver, replace
them with struct wlan_ssid.

Also move struct element_info from scan module to generic structures.

Change-Id: Ia32f82d943980c23b4ff478f5a06c5c053036de5
CRs-Fixed: 2721872

umac/cmn_services/cmn_defs/inc/wlan_cmn_ieee80211.h

@@ -503,6 +503,16 @@ enum extn_element_ie {
 #define RSN_CAP_MFP_CAPABLE 0x80
 #define RSN_CAP_MFP_REQUIRED 0x40
 
+/**
+ * struct element_info - defines length of a memory block and memory block
+ * @len: length of memory block
+ * @ptr: memory block pointer
+ */
+struct element_info {
+	uint32_t len;
+	uint8_t *ptr;
+};
+
 /**
  * struct wlan_rsn_ie_hdr: rsn ie header
  * @elem_id: RSN element id WLAN_ELEMID_RSN.

umac/mlme/vdev_mgr/core/src/vdev_mgr_ops.c

@@ -206,8 +206,7 @@ static QDF_STATUS vdev_mgr_start_param_update(
 		param->hidden_ssid = mlme_obj->mgmt.ap.hidden_ssid;
 		param->cac_duration_ms = mlme_obj->mgmt.ap.cac_duration_ms;
 	}
-	wlan_vdev_mlme_get_ssid(vdev, param->ssid.mac_ssid,
-				&param->ssid.length);
+	wlan_vdev_mlme_get_ssid(vdev, param->ssid.ssid, &param->ssid.length);
 
 	if (des_chan->ch_phymode == WLAN_PHYMODE_11AC_VHT80 ||
 	    des_chan->ch_phymode == WLAN_PHYMODE_11AXA_HE80) {

umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_tgt_if_tx_defs.h

@@ -27,16 +27,6 @@
 
 #include <qdf_nbuf.h>
 
-/**
- * struct mac_ssid - mac ssid structure
- * @length: ssid length
- * @mac_ssid: ssid
- */
-struct mlme_mac_ssid {
-	uint8_t length;
-	uint8_t mac_ssid[WLAN_SSID_MAX_LEN];
-} qdf_packed;
-
 /** slot time long */
 #define WLAN_MLME_VDEV_SLOT_TIME_LONG   0x1
 /** slot time short */
@@ -467,7 +457,7 @@ struct vdev_start_params {
 	uint32_t disable_hw_ack;
 	bool hidden_ssid;
 	bool pmf_enabled;
-	struct mlme_mac_ssid ssid;
+	struct wlan_ssid ssid;
 	uint32_t num_noa_descriptors;
 	uint32_t preferred_rx_streams;
 	uint32_t preferred_tx_streams;

umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -118,7 +118,7 @@ struct wlan_vdev_mgr_cfg {
 		uint32_t value;
 		uint64_t tsf;
 		uint8_t trans_bssid[QDF_MAC_ADDR_SIZE];
-		struct mlme_mac_ssid ssid_cfg;
+		struct wlan_ssid ssid_cfg;
 	};
 };
 

umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -326,7 +326,7 @@ wlan_util_vdev_mlme_set_param(struct vdev_mlme_obj *vdev_mlme,
 	case WLAN_MLME_CFG_SSID:
 		if (mlme_cfg.ssid_cfg.length <= WLAN_SSID_MAX_LEN) {
 			qdf_mem_copy(mlme_mgmt->generic.ssid,
-				     mlme_cfg.ssid_cfg.mac_ssid,
+				     mlme_cfg.ssid_cfg.ssid,
 				     mlme_cfg.ssid_cfg.length);
 			mlme_mgmt->generic.ssid_len =
 						mlme_cfg.ssid_cfg.length;

umac/scan/dispatcher/inc/wlan_scan_public_structs.h

@@ -77,16 +77,6 @@ struct channel_info {
 	void *priv;
 };
 
-/**
- * struct element_info - defines length of a memory block and memory block
- * @len: length of memory block
- * @ptr: memory block pointer
- */
-struct element_info {
-	uint32_t len;
-	uint8_t *ptr;
-};
-
 /**
  * struct ie_list - pointers to various IEs
  * @tim:        pointer to tim ie

wmi/inc/wmi_unified_param.h

@@ -687,16 +687,6 @@ struct oem_data {
 };
 #endif
 
-/**
- * struct mac_ssid - mac ssid structure
- * @length:
- * @mac_ssid[WMI_MAC_MAX_SSID_LENGTH]:
- */
-struct mac_ssid {
-	uint8_t length;
-	uint8_t mac_ssid[WMI_MAC_MAX_SSID_LENGTH];
-} qdf_packed;
-
 /**
  * enum nss_chains_band_info - Band info for dynamic nss, chains change feature
  * @NSS_CHAINS_BAND_2GHZ: 2.4Ghz band
@@ -1760,7 +1750,7 @@ struct roam_offload_scan_params {
  * @auth_bit_field: auth bit field for matching WPA IE
  */
 struct wifi_epno_network_params {
-	struct mac_ssid  ssid;
+	struct wlan_ssid  ssid;
 	int8_t       rssi_threshold;
 	uint8_t      flags;
 	uint8_t      auth_bit_field;

wmi/inc/wmi_unified_sta_param.h

@@ -214,7 +214,7 @@ struct wmi_unified_pmk_cache {
 	uint32_t            pmkid_len;
 	uint8_t             pmkid[WMI_UNIFIED_MAX_PMKID_LEN];
 	wmi_host_mac_addr   bssid;
-	struct mac_ssid     ssid;
+	struct wlan_ssid    ssid;
 	uint32_t            cache_id;
 	uint32_t            cat_flag;
 	uint32_t            action_flag;

wmi/src/wmi_unified_extscan_tlv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -214,7 +214,7 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 			nlo_list[i].ssid.ssid.ssid_len =
 				req->networks[i].ssid.length;
 			qdf_mem_copy(nlo_list[i].ssid.ssid.ssid,
-				     req->networks[i].ssid.mac_ssid,
+				     req->networks[i].ssid.ssid,
 				     nlo_list[i].ssid.ssid.ssid_len);
 			WMI_LOGD("index: %d ssid: %.*s len: %d", i,
 				 nlo_list[i].ssid.ssid.ssid_len,

wmi/src/wmi_unified_sta_tlv.c

@@ -1493,7 +1493,7 @@ static QDF_STATUS send_set_del_pmkid_cache_cmd_tlv(wmi_unified_t wmi_handle,
 	qdf_mem_copy(pmksa->pmkid, pmk_info->pmkid, pmksa->pmkid_len);
 	qdf_mem_copy(&(pmksa->bssid), &(pmk_info->bssid), sizeof(wmi_mac_addr));
 	pmksa->ssid.ssid_len = pmk_info->ssid.length;
-	qdf_mem_copy(&(pmksa->ssid.ssid), &(pmk_info->ssid.mac_ssid),
+	qdf_mem_copy(&(pmksa->ssid.ssid), &(pmk_info->ssid.ssid),
 		     pmksa->ssid.ssid_len);
 	pmksa->cache_id = pmk_info->cache_id;
 	pmksa->cat_flag = pmk_info->cat_flag;

wmi/src/wmi_unified_tlv.c

@@ -1049,7 +1049,7 @@ static QDF_STATUS send_vdev_start_cmd_tlv(wmi_unified_t wmi_handle,
 			cmd->ssid.ssid_len = req->ssid.length;
 		else
 			cmd->ssid.ssid_len = sizeof(cmd->ssid.ssid);
-		qdf_mem_copy(cmd->ssid.ssid, req->ssid.mac_ssid,
+		qdf_mem_copy(cmd->ssid.ssid, req->ssid.ssid,
 			     cmd->ssid.ssid_len);
 	}