Hello community,
here is the log from the commit of package NetworkManager for openSUSE:Factory
checked in at Mon Oct 3 19:59:38 CEST 2011.
--------
--- openSUSE:Factory/NetworkManager/NetworkManager.changes 2011-10-02
09:45:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes
2011-10-03 08:19:14.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 3 06:17:56 UTC 2011 - g...@suse.com
+
+- Add nm-udev-rfkill-handling.patch to improve the rfkill handling
+ (bnc#709733,bgo#655773)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
nm-udev-rfkill-handling.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.uGPoXV/_old 2011-10-03 19:59:35.000000000 +0200
+++ /var/tmp/diff_new_pack.uGPoXV/_new 2011-10-03 19:59:35.000000000 +0200
@@ -31,6 +31,8 @@
Source99: NetworkManager-rpmlintrc
# PATCH-FEATURE-OPENSUSE systemd-network-config.patch -- don't try to start NM
under systemd if it is disabled in system configuration
Patch0: systemd-network-config.patch
+# PATCH-FIX-UPSTREAM nm-udev-rfkill-handling.patch bnc709733,bgo655773
g...@suse.com -- improve the rfkill handling to avoid some false-positive case
+Patch1: nm-udev-rfkill-handling.patch
BuildRequires: fdupes
BuildRequires: gobject-introspection-devel
BuildRequires: gtk-doc
@@ -127,6 +129,7 @@
%setup -n %{name}-%{version} -q
translation-update-upstream
%patch0 -p1
+%patch1 -p1
%build
#needed by patch0
++++++ nm-udev-rfkill-handling.patch ++++++
commit 339229e4c698c61e20a28bfc33d8501490891427
Author: Gary Ching-Pang Lin <chingp...@gmail.com>
Date: Tue Sep 20 16:36:35 2011 +0800
core: improving handling of rfkill (bgo #655773)
This commit improves the handling of rfkill.
- The original two passes check gathers the states of platform
and non-platform switches in two separate loops. Now we gather
the both states in one loop and determine the final states later.
- A new rule is used to determine the states of switches.
if (platform_state == UNBLOCKED)
choose non_platform_state;
else
choose platform_state;
The state is UNBLOCKED if and only if both the platform and
non-platform switches are unblocked, so the ambiguous state in
bgo#655773 will not happen.
Original code always preferred the platform switch state over
the device switch state, so if the platform switch was UNBLOCKED
but the device was BLOCKED, NM would treat the device as
UNBLOCKED and try to activate it, and obviously fail.
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
index 72501c2..3e855b7 100644
--- a/src/nm-udev-manager.c
+++ b/src/nm-udev-manager.c
@@ -195,78 +195,50 @@ recheck_killswitches (NMUdevManager *self)
NMUdevManagerPrivate *priv = NM_UDEV_MANAGER_GET_PRIVATE (self);
GSList *iter;
RfKillState poll_states[RFKILL_TYPE_MAX];
+ RfKillState platform_states[RFKILL_TYPE_MAX];
gboolean platform_checked[RFKILL_TYPE_MAX];
int i;
/* Default state is unblocked */
for (i = 0; i < RFKILL_TYPE_MAX; i++) {
poll_states[i] = RFKILL_UNBLOCKED;
+ platform_states[i] = RFKILL_UNBLOCKED;
platform_checked[i] = FALSE;
}
- /* Perform two passes here; the first pass is for non-platform switches,
- * which typically if hardkilled cannot be changed except by a physical
- * hardware switch. The second pass checks platform killswitches, which
- * take precedence over device killswitches, because typically platform
- * killswitches control device killswitches. That is, a hardblocked
device
- * switch can often be unblocked by a platform switch. Thus if we have
- * a hardblocked device switch and a softblocked platform switch, the
- * combined state should be softblocked since the platform switch can be
- * unblocked to change the device switch.
- */
-
- /* Device switches first */
+ /* Poll the states of all killswitches */
for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
Killswitch *ks = iter->data;
GUdevDevice *device;
RfKillState dev_state;
int sysfs_state;
- if (ks->platform == FALSE) {
- device = g_udev_client_query_by_subsystem_and_name
(priv->client, "rfkill", ks->name);
- if (device) {
- sysfs_state = g_udev_device_get_property_as_int
(device, "RFKILL_STATE");
- dev_state = sysfs_state_to_nm_state
(sysfs_state);
+ device = g_udev_client_query_by_subsystem_and_name
(priv->client, "rfkill", ks->name);
+ if (device) {
+ sysfs_state = g_udev_device_get_property_as_int
(device, "RFKILL_STATE");
+ dev_state = sysfs_state_to_nm_state (sysfs_state);
+ if (ks->platform == FALSE) {
if (dev_state > poll_states[ks->rtype])
poll_states[ks->rtype] = dev_state;
- g_object_unref (device);
- }
- }
- }
-
- /* Platform switches next; their state overwrites device state */
- for (iter = priv->killswitches; iter; iter = g_slist_next (iter)) {
- Killswitch *ks = iter->data;
- GUdevDevice *device;
- RfKillState dev_state;
- int sysfs_state;
-
- if (ks->platform == TRUE) {
- device = g_udev_client_query_by_subsystem_and_name
(priv->client, "rfkill", ks->name);
- if (device) {
- sysfs_state = g_udev_device_get_property_as_int
(device, "RFKILL_STATE");
- dev_state = sysfs_state_to_nm_state
(sysfs_state);
-
- if (platform_checked[ks->rtype] == FALSE) {
- /* Overwrite device state with platform
state for first
- * platform switch found.
- */
- poll_states[ks->rtype] = dev_state;
- platform_checked[ks->rtype] = TRUE;
- } else {
- /* If there are multiple platform
switches of the same type,
- * take the "worst" state for all of
that type.
- */
- if (dev_state > poll_states[ks->rtype])
- poll_states[ks->rtype] =
dev_state;
- }
- g_object_unref (device);
+ } else {
+ platform_checked[ks->rtype] = TRUE;
+ if (dev_state > platform_states[ks->rtype])
+ platform_states[ks->rtype] = dev_state;
}
+ g_object_unref (device);
}
}
/* Log and emit change signal for final rfkill states */
for (i = 0; i < RFKILL_TYPE_MAX; i++) {
+ if (platform_checked[i] == TRUE) {
+ /* blocked platform switch state overrides device
state, otherwise
+ * let the device state stand. (bgo #655773)
+ */
+ if (platform_states[i] != RFKILL_UNBLOCKED)
+ poll_states[i] = platform_states[i];
+ }
+
if (poll_states[i] != priv->rfkill_states[i]) {
nm_log_dbg (LOGD_RFKILL, "%s rfkill state now '%s'",
rfkill_type_to_desc (i),
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
