53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 06d4bc456d4a43fc79288b576a7ff8a15109a3fd Mon Sep 17 00:00:00 2001
|
|
From: Kyle McMartin <kyle@treachery.i.jkkm.org>
|
|
Date: Mon, 11 Jan 2010 08:47:44 -0500
|
|
Subject: linux-2.6-rfkill-all.patch
|
|
|
|
---
|
|
include/linux/rfkill.h | 2 +-
|
|
net/rfkill/input.c | 8 ++++++++
|
|
3 files changed, 11 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
|
|
index 97059d0..4f82326 100644
|
|
--- a/include/linux/rfkill.h
|
|
+++ b/include/linux/rfkill.h
|
|
@@ -29,7 +29,7 @@
|
|
/**
|
|
* enum rfkill_type - type of rfkill switch.
|
|
*
|
|
- * @RFKILL_TYPE_ALL: toggles all switches (userspace only)
|
|
+ * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
|
|
* @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
|
|
* @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
|
|
* @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
|
|
diff --git a/net/rfkill/input.c b/net/rfkill/input.c
|
|
index a7295ad..3713d7e 100644
|
|
--- a/net/rfkill/input.c
|
|
+++ b/net/rfkill/input.c
|
|
@@ -212,6 +212,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
|
|
case KEY_WIMAX:
|
|
rfkill_schedule_toggle(RFKILL_TYPE_WIMAX);
|
|
break;
|
|
+ case KEY_RFKILL:
|
|
+ rfkill_schedule_toggle(RFKILL_TYPE_ALL);
|
|
+ break;
|
|
}
|
|
} else if (type == EV_SW && code == SW_RFKILL_ALL)
|
|
rfkill_schedule_evsw_rfkillall(data);
|
|
@@ -295,6 +298,11 @@ static const struct input_device_id rfkill_ids[] = {
|
|
.keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) },
|
|
},
|
|
{
|
|
+ .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
|
|
+ .evbit = { BIT_MASK(EV_KEY) },
|
|
+ .keybit = { [BIT_WORD(KEY_RFKILL)] = BIT_MASK(KEY_RFKILL) },
|
|
+ },
|
|
+ {
|
|
.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_SWBIT,
|
|
.evbit = { BIT(EV_SW) },
|
|
.swbit = { [BIT_WORD(SW_RFKILL_ALL)] = BIT_MASK(SW_RFKILL_ALL) },
|
|
--
|
|
1.6.5.2
|
|
|