wpa_supplicant: fix wpa_dbus_property_changed
This commit fixes problems described in
https://bugs.archlinux.org/task/65482. This patch is taken from
73ce2847ae
.
This commit is contained in:
parent
66bbaa74f0
commit
2ee4c935bb
2 changed files with 89 additions and 1 deletions
88
srcpkgs/wpa_supplicant/patches/roam-properties.patch
Normal file
88
srcpkgs/wpa_supplicant/patches/roam-properties.patch
Normal file
|
@ -0,0 +1,88 @@
|
|||
From 23d87687c2428f3b94865580b0d33e05c03e6756 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Wang <matthewmwang@chromium.org>
|
||||
Date: Fri, 11 Oct 2019 13:49:25 -0700
|
||||
Subject: dbus: Move roam metrics to the correct interface
|
||||
|
||||
These properties were in the wpas_dbus_bss_properties array when they
|
||||
should have been in the wpas_dbus_interface_properties array. Move them
|
||||
to the right place. This is the logical location for these properties
|
||||
and it matches both the other parts of the implementation (e.g., being
|
||||
in enum wpas_dbus_prop, not in enum wpas_dbus_bss_prop) and what
|
||||
was originally documented for the interface in dbus.doxygen.
|
||||
|
||||
Fixes: 2bbad1c7c9cb ("dbus: Export roam time, roam complete, and session length")
|
||||
Fixes: 80d06d0ca9f3 ("dbus: Export BSS Transition Management status")
|
||||
Signed-off-by: Matthew Wang <matthewmwang@chromium.org>
|
||||
---
|
||||
wpa_supplicant/dbus/dbus_new.c | 48 +++++++++++++++++++++---------------------
|
||||
1 file changed, 24 insertions(+), 24 deletions(-)
|
||||
|
||||
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
|
||||
index 5e6b522..e9e77bd 100644
|
||||
--- a/wpa_supplicant/dbus/dbus_new.c
|
||||
+++ b/wpa_supplicant/dbus/dbus_new.c
|
||||
@@ -2855,30 +2855,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = {
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
- {
|
||||
- "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_roam_time,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
|
||||
- wpas_dbus_getter_roam_complete,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_session_length,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
- {
|
||||
- "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
- wpas_dbus_getter_bss_tm_status,
|
||||
- NULL,
|
||||
- NULL
|
||||
- },
|
||||
{ NULL, NULL, NULL, NULL, NULL, NULL }
|
||||
};
|
||||
|
||||
@@ -3786,6 +3762,30 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
|
||||
NULL,
|
||||
NULL
|
||||
},
|
||||
+ {
|
||||
+ "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_roam_time,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b",
|
||||
+ wpas_dbus_getter_roam_complete,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_session_length,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
+ {
|
||||
+ "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u",
|
||||
+ wpas_dbus_getter_bss_tm_status,
|
||||
+ NULL,
|
||||
+ NULL
|
||||
+ },
|
||||
#ifdef CONFIG_MESH
|
||||
{ "MeshPeers", WPAS_DBUS_NEW_IFACE_MESH, "aay",
|
||||
wpas_dbus_getter_mesh_peers,
|
||||
--
|
||||
cgit v0.12
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'wpa_supplicant'
|
||||
pkgname=wpa_supplicant
|
||||
version=2.9
|
||||
revision=5
|
||||
revision=6
|
||||
build_wrksrc="$pkgname"
|
||||
short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
|
||||
maintainer="Enno Boland <gottox@voidlinux.org>"
|
||||
|
|
Loading…
Reference in a new issue