Merge branch 'upstream' into debian

[mech_eap.git] / libeap / wpa_supplicant / mesh.h

diff --git a/libeap/wpa_supplicant/mesh.h b/libeap/wpa_supplicant/mesh.h
deleted file mode 100644 (file)
index 7317083..0000000
--- a/libeap/wpa_supplicant/mesh.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * WPA Supplicant - Basic mesh mode routines
- * Copyright (c) 2013-2014, cozybit, Inc.  All rights reserved.
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#ifndef MESH_H
-#define MESH_H
-
-int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
-                            struct wpa_ssid *ssid);
-int wpa_supplicant_leave_mesh(struct wpa_supplicant *wpa_s);
-void wpa_supplicant_mesh_iface_deinit(struct wpa_supplicant *wpa_s,
-                                     struct hostapd_iface *ifmsh);
-int wpas_mesh_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
-                              char *end);
-int wpas_mesh_add_interface(struct wpa_supplicant *wpa_s, char *ifname,
-                           size_t len);
-int wpas_mesh_peer_remove(struct wpa_supplicant *wpa_s, const u8 *addr);
-int wpas_mesh_peer_add(struct wpa_supplicant *wpa_s, const u8 *addr,
-                      int duration);
-
-#ifdef CONFIG_MESH
-
-void wpa_mesh_notify_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
-                         const u8 *ies, size_t ie_len);
-void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s,
-                                    struct wpabuf **extra_ie);
-
-#else /* CONFIG_MESH */
-
-static inline void wpa_mesh_notify_peer(struct wpa_supplicant *wpa_s,
-                                       const u8 *addr,
-                                       const u8 *ies, size_t ie_len)
-{
-}
-
-static inline void wpa_supplicant_mesh_add_scan_ie(struct wpa_supplicant *wpa_s,
-                                                  struct wpabuf **extra_ie)
-{
-}
-
-#endif /* CONFIG_MESH */
-
-#endif /* MESH_H */