Jelajahi Sumber

qcacmn: Rename TX_DECAP_TYPE to TX_ENCAP_TYPE

The macros attributing the Tx encap type have been erroneously
named as TX decap.

Rename all occurences of TX_DECAP_* to TX_ENCAP_*. Also add support
to send WMI vdev params for tx_encap and rx_decap values.

CRs-Fixed: 2533710
Change-Id: Id6ef2955868010b264e76d2a416d22d30d2acedc
Aditya Sathish 5 tahun lalu
induk
melakukan
fbf9ece75d

+ 7 - 1
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_tx_ops.c

@@ -313,6 +313,12 @@ target_if_vdev_mlme_id_2_wmi(uint32_t cfg_id)
 	case WLAN_MLME_CFG_MAX_GROUP_KEYS:
 		wmi_id = wmi_vdev_param_max_group_keys;
 		break;
+	case WLAN_MLME_CFG_TX_ENCAP_TYPE:
+		wmi_id = wmi_vdev_param_tx_encap_type;
+		break;
+	case WLAN_MLME_CFG_RX_DECAP_TYPE:
+		wmi_id = wmi_vdev_param_rx_decap_type;
+		break;
 	default:
 		wmi_id = cfg_id;
 		break;
@@ -337,7 +343,7 @@ QDF_STATUS target_if_vdev_set_tx_rx_decap_type(struct wlan_objmgr_vdev *vdev,
 	if (!soc_txrx_handle || !vdev_txrx_handle)
 		return QDF_STATUS_E_INVAL;
 
-	if (param_id ==  WLAN_MLME_CFG_TX_DECAP_TYPE)
+	if (param_id ==  WLAN_MLME_CFG_TX_ENCAP_TYPE)
 		cdp_set_tx_encap_type(soc_txrx_handle,
 				      (struct cdp_vdev *)vdev_txrx_handle,
 				      value);

+ 2 - 2
umac/mlme/include/wlan_vdev_mlme.h

@@ -198,7 +198,7 @@ struct vdev_mlme_proto {
  * @type: vdev type
  * @sub_type: vdev subtype
  * @rx_decap_type: rx decap type
- * @tx_decap_type: tx decap type
+ * @tx_encap_type: tx encap type
  * @disable_hw_ack: disable ha ack flag
  * @bssid: bssid
  * @phy_mode: phy mode
@@ -223,7 +223,7 @@ struct vdev_mlme_mgmt_generic {
 	uint8_t type;
 	uint8_t subtype;
 	uint8_t rx_decap_type;
-	uint8_t tx_decap_type;
+	uint8_t tx_encap_type;
 	bool disable_hw_ack;
 	uint8_t bssid[QDF_MAC_ADDR_SIZE];
 	uint32_t phy_mode;

+ 1 - 1
umac/mlme/vdev_mgr/dispatcher/inc/wlan_vdev_mgr_ucfg_api.h

@@ -92,7 +92,7 @@ enum wlan_mlme_cfg_id {
 	WLAN_MLME_CFG_TYPE,
 	WLAN_MLME_CFG_SUBTYPE,
 	WLAN_MLME_CFG_UAPSD,
-	WLAN_MLME_CFG_TX_DECAP_TYPE,
+	WLAN_MLME_CFG_TX_ENCAP_TYPE,
 	WLAN_MLME_CFG_RX_DECAP_TYPE,
 	WLAN_MLME_CFG_RATEMASK_TYPE,
 	WLAN_MLME_CFG_RATEMASK_LOWER32,

+ 5 - 3
umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_utils_api.c

@@ -348,13 +348,15 @@ wlan_util_vdev_mlme_set_param(struct vdev_mlme_obj *vdev_mlme,
 	case WLAN_MLME_CFG_UAPSD:
 		mlme_proto->sta.uapsd_cfg = mlme_cfg.value;
 		break;
-	case WLAN_MLME_CFG_TX_DECAP_TYPE:
-		mlme_mgmt->generic.tx_decap_type = mlme_cfg.value;
+	case WLAN_MLME_CFG_TX_ENCAP_TYPE:
+		is_wmi_cmd = true;
+		mlme_mgmt->generic.tx_encap_type = mlme_cfg.value;
 		tgt_vdev_mgr_set_tx_rx_decap_type(vdev_mlme,
-						  WLAN_MLME_CFG_TX_DECAP_TYPE,
+						  WLAN_MLME_CFG_TX_ENCAP_TYPE,
 						  mlme_cfg.value);
 		break;
 	case WLAN_MLME_CFG_RX_DECAP_TYPE:
+		is_wmi_cmd = true;
 		mlme_mgmt->generic.rx_decap_type = mlme_cfg.value;
 		tgt_vdev_mgr_set_tx_rx_decap_type(vdev_mlme,
 						  WLAN_MLME_CFG_RX_DECAP_TYPE,