~indicator-network-developers/wpasupplicant/07-series.packaging

« back to all changes in this revision

Viewing changes to wpa_supplicant/dbus/dbus_old_handlers.c

Committer: Kalle Valo
Date: 2010-10-21 11:42:38 UTC
mfrom: (1950.1.51)
Revision ID: kalle.valo@canonical.com-20101021114238-ere89p31hxmjh6i5

Merge 07-series.

files modified:
hostapd/ChangeLog

hostapd/Makefile

hostapd/README-WPS

hostapd/ctrl_iface.c

hostapd/hostapd.conf

hostapd/hostapd_cli.c

src/ap/ap_config.c

src/ap/beacon.c

src/ap/hostapd.h

src/ap/ieee802_11.c

src/ap/ieee802_11.h

src/ap/ieee802_11_ht.c

src/ap/ieee802_1x.c

src/ap/wpa_auth_ft.c

src/ap/wpa_auth_glue.c

src/ap/wps_hostapd.c

src/ap/wps_hostapd.h

src/common/version.h

src/common/wpa_ctrl.h

src/crypto/crypto_openssl.c

src/drivers/driver_atheros.c

src/drivers/driver_nl80211.c

src/eap_peer/eap_wsc.c

src/eap_server/eap_server_fast.c

src/eap_server/eap_server_wsc.c

src/l2_packet/l2_packet_ndis.c

src/rsn_supp/preauth.c

src/utils/os_unix.c

src/wps/wps_attr_parse.c

src/wps/wps_enrollee.c

src/wps/wps_er.c

src/wps/wps_registrar.c

src/wps/wps_upnp.c

src/wps/wps_upnp.h

src/wps/wps_upnp_web.c

wpa_supplicant/ChangeLog

wpa_supplicant/bgscan_simple.c

wpa_supplicant/config_winreg.c

wpa_supplicant/dbus/dbus_new_handlers.c

wpa_supplicant/dbus/dbus_old_handlers.c

wpa_supplicant/events.c

wpa_supplicant/scan.c

wpa_supplicant/sme.c

wpa_supplicant/wpa_gui-qt4/wpagui.cpp

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.nsi

wpa_supplicant/wpa_supplicant_i.h

wpa_supplicant/wpas_glue.c

Show diffs side-by-side

added added

removed removed

wpa_supplicant/dbus/dbus_old_handlers.c

872

}

873

874

if (ssid == wpa_s->current_ssid)

875

wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

875

wpa_supplicant_deauthenticate(wpa_s,

876

WLAN_REASON_DEAUTH_LEAVING);

876

877

reply = wpas_dbus_new_success_reply(message);

877

878

879

out:

1141

1142

struct wpa_supplicant *wpa_s)

1142

1143

{

1143

1144

wpa_s->disconnected = 1;

1144

wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

1145

wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

1145

1146

1147

return wpas_dbus_new_success_reply(message);

1147

1148

}

Older »