Merge commit '778ad70' into master_merge

Change-Id: I2928bb3e4c82d13caf3a1cd4b15f1d17969a610d

diff --cc include/hardware_legacy/wifi_hal.h
index 2478330,0755834..63db82b
--- 1/include/hardware_legacy/wifi_hal.h
--- 2/include/hardware_legacy/wifi_hal.h
+++ b/include/hardware_legacy/wifi_hal.h
@@@ -201,26 -200,14 +201,32 @@@ typedef struct 
      wifi_error (* wifi_set_epno_list)(int, wifi_interface_info *, int, wifi_epno_network *,
              wifi_epno_handler);
      wifi_error (* wifi_set_country_code)(wifi_interface_handle, const char *);
 +    wifi_error (* wifi_get_firmware_memory_dump)( wifi_interface_handle iface,
 +            wifi_firmware_memory_dump_handler handler);
 +    wifi_error (* wifi_set_log_handler)(wifi_request_id id, wifi_interface_handle iface,
 +        wifi_ring_buffer_data_handler handler);
 +    wifi_error (* wifi_set_alert_handler)(wifi_request_id id, wifi_interface_handle iface,
 +        wifi_alert_handler handler);
 +    wifi_error (* wifi_get_firmware_version)( wifi_interface_handle iface, char **buffer,
 +        int *buffer_size);
 +    wifi_error (* wifi_get_ring_buffers_status)(wifi_interface_handle iface,
 +        u32 *num_rings, wifi_ring_buffer_status **status);
 +    wifi_error (* wifi_get_logger_supported_feature_set)(wifi_interface_handle iface,
 +        unsigned int *support);
 +    wifi_error (* wifi_get_ring_data)(wifi_interface_handle iface, char *ring_name);
 +    wifi_error (* wifi_get_driver_version)(wifi_interface_handle iface, char **buffer,
 +    int *buffer_size);
+     wifi_error (* wifi_enable_tdls)(wifi_interface_handle, mac_addr, wifi_tdls_params *,
+             wifi_tdls_handler);
+     wifi_error (* wifi_disable_tdls)(wifi_interface_handle, mac_addr);
+     wifi_error (*wifi_get_tdls_status) (wifi_interface_handle, mac_addr, wifi_tdls_status *);
+     wifi_error (*wifi_get_tdls_capabilities)(wifi_interface_handle iface,
+             wifi_tdls_capabilities *capabilities);
  } wifi_hal_fn;
  wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn);
 +#ifdef __cplusplus
 +}
 +#endif
  
  #endif