about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-13 20:52:45 +0100
committerMichael Biebl <biebl@debian.org>2016-03-13 20:52:49 +0100
commit0cec9d3f48ea608859566e03916aedc9ce40f382 (patch)
treecfd4cf1fe55db86b68145fc5e2623c84a4bc05dd
parentd6071c078ed8c31161c48c3e85d399ddbc2fe789 (diff)
Add a hack for wext devices reporting IW_MODE_AUTO configuration mode
Patch cherry-picked from upstream Git.

Closes: #817115
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/series1
-rw-r--r--debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch22
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a1058e80..1705fe7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ network-manager (1.1.91-2) UNRELEASED; urgency=medium
     DEB_HOST_MULTIARCH.
   * Ensure proper upgrade from network-manager-dbg to new dbgsym packages by
     using dh_strip --dbgsym-migration.
+  * Add a hack for wext devices reporting IW_MODE_AUTO configuration mode.
+    Patch cherry-picked from upstream Git. (Closes: #817115)
 
  -- Michael Biebl <biebl@debian.org>  Tue, 01 Mar 2016 21:34:04 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 85bedbaa..b1724483 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ Don-t-make-NetworkManager-D-Bus-activatable.patch
 Don-t-block-network.target-on-NetworkManager-wait-on.patch
 Fix-iscsiadm-path.patch
 tests-fix-bashism-in-run-test-dbus-session.sh.patch
+wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
diff --git a/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch b/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
new file mode 100644
index 00000000..c54a64a1
--- /dev/null
+++ b/debian/patches/wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
@@ -0,0 +1,22 @@
+From: Francesco Giudici <fgiudici@redhat.com>
+Date: Fri, 11 Mar 2016 09:55:39 +0100
+Subject: wifi: hack for wext devices reporting IW_MODE_AUTO configuration
+ mode.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=763388
+---
+ src/platform/wifi/wifi-utils-wext.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
+index 029601e..bb015c1 100644
+--- a/src/platform/wifi/wifi-utils-wext.c
++++ b/src/platform/wifi/wifi-utils-wext.c
+@@ -118,6 +118,7 @@ wifi_wext_get_mode (WifiData *data)
+ 	case IW_MODE_MASTER:
+ 		return NM_802_11_MODE_AP;
+ 	case IW_MODE_INFRA:
++	case IW_MODE_AUTO: /* hack for WEXT devices reporting IW_MODE_AUTO */
+ 		return NM_802_11_MODE_INFRA;
+ 	default:
+ 		break;