wpa_supplicant: add patch to make this work with NetworkManager >= 0.8.995.

--HG--
branch : gnome3
This commit is contained in:
Juan RP 2011-03-11 15:57:54 +01:00
parent b33afe3100
commit 14f79e1f94
2 changed files with 64 additions and 4 deletions

View file

@ -0,0 +1,61 @@
From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 17 Dec 2010 15:56:01 +0200
Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes
The supplicant was not emitting property changed events when the BSSs
property changed.
Signed-off-by: Dan Williams <dcbw@redhat.com>
(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72)
---
wpa_supplicant/dbus/dbus_new.c | 6 ++++++
wpa_supplicant/dbus/dbus_new.h | 1 +
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index bdfbbac..c66640a 100644
--- dbus/dbus_new.c
+++ dbus/dbus_new.c
@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s,
wpas_dbus_getter_current_network;
prop = "CurrentNetwork";
break;
+ case WPAS_DBUS_PROP_BSSS:
+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
+ prop = "BSSs";
+ break;
default:
wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
__func__, property);
@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s,
}
wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
return 0;
}
@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s,
}
wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
return 0;
diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index 80ea98c..9cdefcb 100644
--- dbus/dbus_new.h
+++ dbus/dbus_new.h
@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
WPAS_DBUS_PROP_STATE,
WPAS_DBUS_PROP_CURRENT_BSS,
WPAS_DBUS_PROP_CURRENT_NETWORK,
+ WPAS_DBUS_PROP_BSSS,
};
enum wpas_dbus_bss_prop {
--
1.7.4-rc1

View file

@ -1,7 +1,7 @@
# Template file for 'wpa_supplicant' # Template file for 'wpa_supplicant'
pkgname=wpa_supplicant pkgname=wpa_supplicant
version=0.7.3 version=0.7.3
revision=1 revision=2
wrksrc=${pkgname}-${version}/${pkgname} wrksrc=${pkgname}-${version}/${pkgname}
distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz" distfiles="http://hostap.epitest.fi/releases/$pkgname-$version.tar.gz"
build_style=custom-install build_style=custom-install
@ -38,13 +38,12 @@ do_build()
{ {
sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile sed -i 's|/usr/local|$(PREFIX)|g' ${wrksrc}/Makefile
cp -f ${FILESDIR}/config ${wrksrc}/.config cp -f ${FILESDIR}/config ${wrksrc}/.config
make ${makejobs} || return 1 make ${makejobs}
} }
do_install() do_install()
{ {
cd ${wrksrc} || return 1 make PREFIX=/usr DESTDIR=${DESTDIR} install
make PREFIX=/usr DESTDIR=${DESTDIR} install || return 1
install -d ${DESTDIR}/etc/init.d install -d ${DESTDIR}/etc/init.d
install -m755 ${FILESDIR}/${pkgname}.rc \ install -m755 ${FILESDIR}/${pkgname}.rc \