The patch titled
Subject: drivers/platform/x86/acer-wmi.c: no wifi rfkill on Lenovo machines
has been removed from the -mm tree. Its filename was
drivers-platform-x86-acer-wmic-no-wifi-rfkill-on-lenovo-machines.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: Ike Panhc <[email protected]>
Subject: drivers/platform/x86/acer-wmi.c: no wifi rfkill on Lenovo machines
We have several reports which says acer-wmi is loaded on ideapads and
register rfkill for wifi which can not be unblocked. Symptom is that wifi
just doesn't work on these machines until the acer-wmi driver is unloaded.
Since ideapad-laptop also register rfkill for wifi and it works reliably,
it will be fine acer-wmi is not going to register rfkill for wifi once
VPC2004 is found.
Also put IBM0068/LEN0068 in the list. Though thinkpad_acpi has no wifi
rfkill capability, there are reports which says acer-wmi also block
wireless on Thinkpad E520/E420.
Addresses http://bugs.debian.org/655941 and
https://bugzilla.redhat.com/show_bug.cgi?id=674353
Signed-off-by: Ike Panhc <[email protected]>
Acked-by: Lee, Chun-Yi <[email protected]>
Tested-by: Andrey <[email protected]> # Ideapad Z570
Signed-off-by: Jonathan Nieder <[email protected]>
Cc: Matthew Garrett <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
drivers/platform/x86/acer-wmi.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff -puN
drivers/platform/x86/acer-wmi.c~drivers-platform-x86-acer-wmic-no-wifi-rfkill-on-lenovo-machines
drivers/platform/x86/acer-wmi.c
---
a/drivers/platform/x86/acer-wmi.c~drivers-platform-x86-acer-wmic-no-wifi-rfkill-on-lenovo-machines
+++ a/drivers/platform/x86/acer-wmi.c
@@ -679,6 +679,32 @@ static acpi_status AMW0_find_mailled(voi
return AE_OK;
}
+static int AMW0_set_cap_acpi_check_device_found;
+
+static acpi_status AMW0_set_cap_acpi_check_device_cb(acpi_handle handle,
+ u32 level, void *context, void **retval)
+{
+ AMW0_set_cap_acpi_check_device_found = 1;
+ return AE_OK;
+}
+
+static const struct acpi_device_id norfkill_ids[] = {
+ { "VPC2004", 0},
+ { "IBM0068", 0},
+ { "LEN0068", 0},
+ { "", 0},
+};
+
+static int AMW0_set_cap_acpi_check_device(void)
+{
+ const struct acpi_device_id *id;
+
+ for (id = norfkill_ids; id->id[0]; id++)
+ acpi_get_devices(id->id, AMW0_set_cap_acpi_check_device_cb,
+ NULL, NULL);
+ return AMW0_set_cap_acpi_check_device_found;
+}
+
static acpi_status AMW0_set_capabilities(void)
{
struct wmab_args args;
@@ -692,7 +718,9 @@ static acpi_status AMW0_set_capabilities
* work.
*/
if (wmi_has_guid(AMW0_GUID2)) {
- interface->capability |= ACER_CAP_WIRELESS;
+ if ((quirks != &quirk_unknown) ||
+ !AMW0_set_cap_acpi_check_device())
+ interface->capability |= ACER_CAP_WIRELESS;
return AE_OK;
}
_
Patches currently in -mm which might be from [email protected] are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
