qcacld-3.0: Remove unused members of struct wma_txrx_node

Some struct wma_txrx_node members are not used so remove them.

Change-Id: I900a0898e448dfc363aad1d157de74557bb982f6
CRs-Fixed: 2523105

core/wma/inc/wma.h

@@ -172,8 +172,6 @@
 #define WMA_BSS_STATUS_STARTED 0x1
 #define WMA_BSS_STATUS_STOPPED 0x2
 
-#define WMA_TARGET_REQ_TYPE_VDEV_START 0x1
-
 #define WMA_PEER_ASSOC_CNF_START 0x01
 #define WMA_PEER_ASSOC_TIMEOUT SIR_PEER_ASSOC_TIMEOUT
 
@@ -188,7 +186,6 @@
 #define WMA_PDEV_MAC_CFG_RESP 0x07
 
 /* FW response timeout values in milli seconds */
-#define WMA_VDEV_START_REQUEST_TIMEOUT   START_RESPONSE_TIMER
 #define WMA_VDEV_PLCY_MGR_TIMEOUT        SIR_VDEV_PLCY_MGR_TIMEOUT
 #define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT WMA_VDEV_PLCY_MGR_TIMEOUT
 #define WMA_VDEV_DUAL_MAC_CFG_TIMEOUT    WMA_VDEV_PLCY_MGR_TIMEOUT
@@ -695,8 +692,6 @@ struct roam_synch_frame_ind {
  * @shortSlotTimeSupported: is short slot time supported or not
  * @dtimPeriod: DTIM period
  * @chanmode: channel mode
- * @vht_capable: VHT capablity flag
- * @ht_capable: HT capablity flag
  * @mhz: channel frequency in KHz
  * @chan_width: channel bandwidth
  * @vdev_up: is vdev up or not
@@ -724,8 +719,6 @@ struct roam_synch_frame_ind {
  * @psnr_req: snr request
  * @delay_before_vdev_stop: delay
  * @tx_streams: number of tx streams can be used by the vdev
- * @rx_streams: number of rx streams can be used by the vdev
- * @chain_mask: chain mask can be used by the vdev
  * @mac_id: the mac on which vdev is on
  * @wep_default_key_idx: wep default index for group key
  * @arp_offload_req: cached arp offload request
@@ -757,8 +750,6 @@ struct wma_txrx_node {
 	uint8_t shortSlotTimeSupported;
 	uint8_t dtimPeriod;
 	WMI_HOST_WLAN_PHY_MODE chanmode;
-	uint8_t vht_capable;
-	uint8_t ht_capable;
 	A_UINT32 mhz;
 	enum phy_ch_width chan_width;
 	bool vdev_active;
@@ -789,8 +780,6 @@ struct wma_txrx_node {
 	bool extscan_in_progress;
 #endif
 	uint32_t tx_streams;
-	uint32_t rx_streams;
-	uint32_t chain_mask;
 	uint32_t mac_id;
 	bool roaming_in_progress;
 	int32_t roam_synch_delay;

core/wma/src/wma_dev_if.c

@@ -1143,10 +1143,6 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme,
 	if (rsp->status == QDF_STATUS_SUCCESS) {
 		wma->interfaces[rsp->vdev_id].tx_streams =
 			rsp->cfgd_tx_streams;
-		wma->interfaces[rsp->vdev_id].rx_streams =
-			rsp->cfgd_rx_streams;
-		wma->interfaces[rsp->vdev_id].chain_mask =
-			rsp->chain_mask;
 
 		if (wlan_res_cfg->use_pdev_id) {
 			if (rsp->mac_id == WMI_PDEV_ID_SOC) {
@@ -1163,9 +1159,9 @@ QDF_STATUS wma_vdev_start_resp_handler(struct vdev_mlme_obj *vdev_mlme,
 		WMA_LOGD("%s: vdev:%d tx ss=%d rx ss=%d chain mask=%d mac=%d",
 				__func__,
 				rsp->vdev_id,
-				wma->interfaces[rsp->vdev_id].tx_streams,
-				wma->interfaces[rsp->vdev_id].rx_streams,
-				wma->interfaces[rsp->vdev_id].chain_mask,
+				rsp->cfgd_tx_streams,
+				rsp->cfgd_rx_streams,
+				rsp->chain_mask,
 				wma->interfaces[rsp->vdev_id].mac_id);
 	}
 
@@ -2863,8 +2859,6 @@ QDF_STATUS wma_vdev_start(tp_wma_handle wma,
 	params.vdev_id = req->vdev_id;
 
 	intr[params.vdev_id].chanmode = chan_mode;
-	intr[params.vdev_id].ht_capable = req->ht_capable;
-	intr[params.vdev_id].vht_capable = req->vht_capable;
 	intr[params.vdev_id].config.gtx_info.gtxRTMask[0] =
 		CFG_TGT_DEFAULT_GTX_HT_MASK;
 	intr[params.vdev_id].config.gtx_info.gtxRTMask[1] =

core/wma/src/wma_main.c

@@ -2049,8 +2049,6 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
 			"\toem_response %u\n"
 			"dtimPeriod %d\n"
 			"chanmode %d\n"
-			"vht_capable %d\n"
-			"ht_capable %d\n"
 			"chan_width %d\n"
 			"vdev_active %d\n"
 			"vdev_up %d\n"
@@ -2060,9 +2058,7 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
 			"tx_power %d\n"
 			"max_tx_power %d\n"
 			"nwType %d\n"
-			"tx_streams %d\n"
-			"rx_streams %d\n"
-			"chain_mask %d",
+			"tx_streams %d",
 			vdev_id,
 			stats.pno_match_wake_up_count,
 			stats.pno_complete_wake_up_count,
@@ -2081,8 +2077,6 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
 			stats.oem_response_wake_up_count,
 			iface->dtimPeriod,
 			iface->chanmode,
-			iface->vht_capable,
-			iface->ht_capable,
 			iface->chan_width,
 			iface->vdev_active,
 			wma_is_vdev_up(vdev_id),
@@ -2092,9 +2086,7 @@ static void wma_state_info_dump(char **buf_ptr, uint16_t *size)
 			iface->tx_power,
 			iface->max_tx_power,
 			iface->nwType,
-			iface->tx_streams,
-			iface->rx_streams,
-			iface->chain_mask);
+			iface->tx_streams);
 		wlan_objmgr_vdev_release_ref(vdev, WLAN_LEGACY_WMA_ID);
 	}
 

core/wma/src/wma_utils.c

@@ -3250,22 +3250,17 @@ void wma_update_intf_hw_mode_params(uint32_t vdev_id, uint32_t mac_id,
 		return;
 	}
 	wma->interfaces[vdev_id].mac_id = mac_id;
-	if (mac_id == 0) {
+	if (mac_id == 0)
 		wma->interfaces[vdev_id].tx_streams =
 			hw_mode.mac0_tx_ss;
-		wma->interfaces[vdev_id].rx_streams =
-			hw_mode.mac0_rx_ss;
-	} else {
+	else
 		wma->interfaces[vdev_id].tx_streams =
 			hw_mode.mac1_tx_ss;
-		wma->interfaces[vdev_id].rx_streams =
-			hw_mode.mac1_tx_ss;
-	}
-	WMA_LOGD("%s: vdev %d, update tx ss:%d rx ss:%d mac %d hw_mode_id %d",
+
+	WMA_LOGD("%s: vdev %d, update tx ss:%d mac %d hw_mode_id %d",
 		 __func__,
 		 vdev_id,
 		 wma->interfaces[vdev_id].tx_streams,
-		 wma->interfaces[vdev_id].rx_streams,
 		 mac_id,
 		 cfgd_hw_mode_index);
 }