Merged the hostap_2.6 updates, and the Leap of Faith work, from the hostap_update...

[mech_eap.git] / libeap / wpa_supplicant / dbus / dbus_common_i.h

diff --git a/libeap/wpa_supplicant/dbus/dbus_common_i.h b/libeap/wpa_supplicant/dbus/dbus_common_i.h
index 9dab1ee..95eb4bc 100644 (file)
--- a/libeap/wpa_supplicant/dbus/dbus_common_i.h
+++ b/libeap/wpa_supplicant/dbus/dbus_common_i.h
@@ -4,14 +4,8 @@
  * Copyright (c) 2009, Witold Sowa <witold.sowa@gmail.com>
  * Copyright (c) 2009, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef DBUS_COMMON_I_H
@@ -19,12 +13,22 @@
 
 #include <dbus/dbus.h>
 
+struct wpa_dbus_property_desc;
+
 struct wpas_dbus_priv {
        DBusConnection *con;
        int should_dispatch;
        struct wpa_global *global;
        u32 next_objid;
        int dbus_new_initialized;
+
+#if defined(CONFIG_CTRL_IFACE_DBUS_NEW)
+       struct wpa_dbus_property_desc *all_interface_properties;
+       int globals_start;
+#if defined(CONFIG_AP)
+       int dbus_noc_refcnt;
+#endif /* CONFIG_AP */
+#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
 };
 
 #endif /* DBUS_COMMON_I_H */