Get rid of unnecessary typedefs for enums.

[mech_eap.git] / wpa_supplicant / notify.c

diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 5678814..f398ee9 100644 (file)
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -18,8 +18,8 @@
 #include "config.h"
 #include "wpa_supplicant_i.h"
 #include "wps_supplicant.h"
-#include "ctrl_iface_dbus.h"
-#include "ctrl_iface_dbus_new.h"
+#include "dbus/dbus.h"
+#include "dbus/dbus_new.h"
 #include "notify.h"
 
 int wpas_notify_supplicant_initialized(struct wpa_global *global)
@@ -27,17 +27,17 @@ int wpas_notify_supplicant_initialized(struct wpa_global *global)
        struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
 
        if (global->params.dbus_ctrl_interface) {
-               global->dbus_ctrl_iface =
-                       wpa_supplicant_dbus_ctrl_iface_init(global);
-               if (global->dbus_ctrl_iface == NULL)
-                       return -1;
-
                if (cbs) {
                        global->dbus_new_ctrl_iface =
                                cbs->dbus_ctrl_init(global);
                        if (global->dbus_new_ctrl_iface == NULL)
                                return -1;
                }
+
+               global->dbus_ctrl_iface =
+                       wpa_supplicant_dbus_ctrl_iface_init(global);
+               if (global->dbus_ctrl_iface == NULL)
+                       return -1;
        }
 
        return 0;
@@ -48,11 +48,11 @@ void wpas_notify_supplicant_deinitialized(struct wpa_global *global)
 {
        struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
 
-       if (global->dbus_ctrl_iface)
-               wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
-
        if (cbs && global->dbus_new_ctrl_iface)
                cbs->dbus_ctrl_deinit(global->dbus_new_ctrl_iface);
+
+       if (global->dbus_ctrl_iface)
+               wpa_supplicant_dbus_ctrl_iface_deinit(global->dbus_ctrl_iface);
 }
 
 
@@ -85,7 +85,8 @@ void wpas_notify_iface_removed(struct wpa_supplicant *wpa_s)
 
 
 void wpas_notify_state_changed(struct wpa_supplicant *wpa_s,
-                              wpa_states new_state, wpa_states old_state)
+                              enum wpa_states new_state,
+                              enum wpa_states old_state)
 {
        struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
 
@@ -237,6 +238,24 @@ void wpas_notify_network_removed(struct wpa_supplicant *wpa_s,
 }
 
 
+void wpas_notify_bss_added(struct wpa_supplicant *wpa_s,
+                                u8 bssid[])
+{
+       struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
+       if (cbs)
+               cbs->register_bss(wpa_s, bssid);
+}
+
+
+void wpas_notify_bss_removed(struct wpa_supplicant *wpa_s,
+                                u8 bssid[])
+{
+       struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();
+       if (cbs)
+               cbs->unregister_bss(wpa_s, bssid);
+}
+
+
 void wpas_notify_blob_added(struct wpa_supplicant *wpa_s, const char *name)
 {
        struct wpas_dbus_callbacks *cbs = wpas_dbus_get_callbacks();