From ae35a2c76f9b1a09a672857fe13836578cb34eff Mon Sep 17 00:00:00 2001 From: Nachiket Kukade Date: Tue, 22 May 2018 12:17:15 +0530 Subject: [PATCH] qcacmn: Rename legacy definitions containing BPF to APF In implementation of Android Packet Filter, functions, variables, definitions are named after BPF, which stands for Berkely Packet Filter. The term was more appropriate for Link Layer packet filters implemented in the Linux kernel, known as Linux Socket Filters. The term BPF is obsolete now, so rename it with the appropriate acronym, APF. Change-Id: I606afc747cddedb524a41cd8e5998400f04e69f6 CRs-Fixed: 2191531 --- wmi_unified_apf_tlv.c | 12 ++++++------ wmi_unified_api.c | 15 ++++++++------- wmi_unified_non_tlv.c | 2 +- wmi_unified_tlv.c | 8 ++++---- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/wmi_unified_apf_tlv.c b/wmi_unified_apf_tlv.c index f5a0670cea..e61d3ac547 100644 --- a/wmi_unified_apf_tlv.c +++ b/wmi_unified_apf_tlv.c @@ -18,11 +18,11 @@ #include "wmi_unified_apf_tlv.h" -QDF_STATUS send_set_active_bpf_mode_cmd_tlv(wmi_unified_t wmi_handle, +QDF_STATUS send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id, - enum wmi_host_active_bpf_mode + enum wmi_host_active_apf_mode ucast_mode, - enum wmi_host_active_bpf_mode + enum wmi_host_active_apf_mode mcast_bcast_mode) { const WMITLV_TAG_ID tag_id = @@ -33,7 +33,7 @@ QDF_STATUS send_set_active_bpf_mode_cmd_tlv(wmi_unified_t wmi_handle, wmi_bpf_set_vdev_active_mode_cmd_fixed_param *cmd; wmi_buf_t buf; - WMI_LOGD("Sending WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID(%u, %d, %d)", + WMI_LOGD("Sending WMI_APF_SET_VDEV_ACTIVE_MODE_CMDID(%u, %d, %d)", vdev_id, ucast_mode, mcast_bcast_mode); /* allocate command buffer */ @@ -56,13 +56,13 @@ QDF_STATUS send_set_active_bpf_mode_cmd_tlv(wmi_unified_t wmi_handle, status = wmi_unified_cmd_send(wmi_handle, buf, sizeof(*cmd), WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID); if (QDF_IS_STATUS_ERROR(status)) { - WMI_LOGE("Failed to send WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID:%d", + WMI_LOGE("Failed to send WMI_APF_SET_VDEV_ACTIVE_MODE_CMDID:%d", status); wmi_buf_free(buf); return status; } - WMI_LOGD("Sent WMI_BPF_SET_VDEV_ACTIVE_MODE_CMDID successfully"); + WMI_LOGD("Sent WMI_APF_SET_VDEV_ACTIVE_MODE_CMDID successfully"); return QDF_STATUS_SUCCESS; } diff --git a/wmi_unified_api.c b/wmi_unified_api.c index fc98960131..6dce61cbb1 100644 --- a/wmi_unified_api.c +++ b/wmi_unified_api.c @@ -3157,19 +3157,20 @@ QDF_STATUS wmi_unified_roam_send_hlp_cmd(void *wmi_hdl, } #endif -QDF_STATUS wmi_unified_set_active_bpf_mode_cmd(void *wmi_hdl, - uint8_t vdev_id, - enum wmi_host_active_bpf_mode ucast_mode, - enum wmi_host_active_bpf_mode mcast_bcast_mode) +QDF_STATUS +wmi_unified_set_active_apf_mode_cmd(void *wmi_hdl, uint8_t vdev_id, + enum wmi_host_active_apf_mode ucast_mode, + enum wmi_host_active_apf_mode + mcast_bcast_mode) { wmi_unified_t wmi = (wmi_unified_t)wmi_hdl; - if (!wmi->ops->send_set_active_bpf_mode_cmd) { - WMI_LOGD("send_set_active_bpf_mode_cmd op is NULL"); + if (!wmi->ops->send_set_active_apf_mode_cmd) { + WMI_LOGD("send_set_active_apf_mode_cmd op is NULL"); return QDF_STATUS_E_FAILURE; } - return wmi->ops->send_set_active_bpf_mode_cmd(wmi, vdev_id, + return wmi->ops->send_set_active_apf_mode_cmd(wmi, vdev_id, ucast_mode, mcast_bcast_mode); } diff --git a/wmi_unified_non_tlv.c b/wmi_unified_non_tlv.c index 6629205e91..ed2c54bc5b 100644 --- a/wmi_unified_non_tlv.c +++ b/wmi_unified_non_tlv.c @@ -8894,7 +8894,7 @@ static void populate_non_tlv_service(uint32_t *wmi_service) wmi_service[wmi_service_unified_wow_capability] = WMI_SERVICE_UNAVAILABLE; wmi_service[wmi_service_enterprise_mesh] = WMI_SERVICE_UNAVAILABLE; - wmi_service[wmi_service_bpf_offload] = WMI_SERVICE_UNAVAILABLE; + wmi_service[wmi_service_apf_offload] = WMI_SERVICE_UNAVAILABLE; wmi_service[wmi_service_sync_delete_cmds] = WMI_SERVICE_UNAVAILABLE; wmi_service[wmi_service_ratectrl_limit_max_min_rates] = WMI_SERVICE_UNAVAILABLE; diff --git a/wmi_unified_tlv.c b/wmi_unified_tlv.c index 274ab9649d..5489449cde 100644 --- a/wmi_unified_tlv.c +++ b/wmi_unified_tlv.c @@ -12423,7 +12423,7 @@ void wmi_copy_resource_config(wmi_resource_config *resource_cfg, tgt_res_cfg->num_ocb_channels; resource_cfg->num_ocb_schedules = tgt_res_cfg->num_ocb_schedules; - resource_cfg->bpf_instruction_size = tgt_res_cfg->bpf_instruction_size; + resource_cfg->bpf_instruction_size = tgt_res_cfg->apf_instruction_size; resource_cfg->max_bssid_rx_filters = tgt_res_cfg->max_bssid_rx_filters; resource_cfg->use_pdev_id = tgt_res_cfg->use_pdev_id; resource_cfg->max_num_dbs_scan_duty_cycle = @@ -21741,7 +21741,7 @@ struct wmi_ops tlv_ops = { send_roam_scan_offload_chan_list_cmd_tlv, .send_roam_scan_offload_rssi_change_cmd = send_roam_scan_offload_rssi_change_cmd_tlv, - .send_set_active_bpf_mode_cmd = send_set_active_bpf_mode_cmd_tlv, + .send_set_active_apf_mode_cmd = send_set_active_apf_mode_cmd_tlv, .send_adapt_dwelltime_params_cmd = send_adapt_dwelltime_params_cmd_tlv, .send_dbs_scan_sel_params_cmd = @@ -22233,7 +22233,7 @@ static void populate_tlv_events_id(uint32_t *event_ids) event_ids[wmi_ap_ps_egap_info_event_id] = WMI_AP_PS_EGAP_INFO_EVENTID; event_ids[wmi_peer_assoc_conf_event_id] = WMI_PEER_ASSOC_CONF_EVENTID; event_ids[wmi_vdev_delete_resp_event_id] = WMI_VDEV_DELETE_RESP_EVENTID; - event_ids[wmi_bpf_capability_info_event_id] = + event_ids[wmi_apf_capability_info_event_id] = WMI_BPF_CAPABILIY_INFO_EVENTID; event_ids[wmi_vdev_encrypt_decrypt_data_rsp_event_id] = WMI_VDEV_ENCRYPT_DECRYPT_DATA_RESP_EVENTID; @@ -22413,7 +22413,7 @@ static void populate_tlv_service(uint32_t *wmi_service) wmi_service[wmi_service_unified_wow_capability] = WMI_SERVICE_UNIFIED_WOW_CAPABILITY; wmi_service[wmi_service_enterprise_mesh] = WMI_SERVICE_ENTERPRISE_MESH; - wmi_service[wmi_service_bpf_offload] = WMI_SERVICE_BPF_OFFLOAD; + wmi_service[wmi_service_apf_offload] = WMI_SERVICE_BPF_OFFLOAD; wmi_service[wmi_service_sync_delete_cmds] = WMI_SERVICE_SYNC_DELETE_CMDS; wmi_service[wmi_service_ratectrl_limit_max_min_rates] =