From: Etan Cohen Date: Wed, 27 Jan 2016 18:55:23 +0000 (+0000) Subject: Merge "Wifi-HAL: New NAN Discovery engine changes" into mm-wireless-dev X-Git-Tag: android-x86-7.1-r1~11^2~11 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8abbec7396ed1bd03d0e078b2672fce3ae3575ae;p=android-x86%2Fhardware-libhardware_legacy.git Merge "Wifi-HAL: New NAN Discovery engine changes" into mm-wireless-dev --- 8abbec7396ed1bd03d0e078b2672fce3ae3575ae diff --cc include/hardware_legacy/wifi_hal.h index d2ea7a0,8121c7f..cb23a24 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@@ -330,23 -337,9 +330,25 @@@ typedef struct NanCallbackHandler handlers); wifi_error (*wifi_nan_get_version)(wifi_handle handle, NanVersion* version); + wifi_error (*wifi_nan_get_capabilities)(transaction_id id, + wifi_interface_handle iface); + /** + * Returns the chipset's hardware filtering capabilities: + * @param version pointer to version of the packet filter interpreter + *                supported, filled in upon return. 0 indicates no support. + * @param max_len pointer to maximum size of the filter bytecode, filled in + *                upon return. + */ + wifi_error (*wifi_get_packet_filter_capabilities)(wifi_interface_handle handle, + u32 *version, u32 *max_len); + /** +     * Programs the packet filter. + * @param program pointer to the program byte-code. + * @param len length of the program byte-code. +     */ + wifi_error (*wifi_set_packet_filter)(wifi_interface_handle handle, + const u8 *program, u32 len); } wifi_hal_fn; wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn); #ifdef __cplusplus