Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3082a2b7 authored by Matthew Garrett's avatar Matthew Garrett Committed by John W. Linville
Browse files

rfkill: Add support for KEY_RFKILL 



Add support for handling KEY_RFKILL in the rfkill input module. This
simply toggles the state of all rfkill devices. The comment in rfkill.h
is also updated to reflect that RFKILL_TYPE_ALL may be used inside the
kernel.

Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6510b891

include/linux/rfkill.h

+1 −1
Original line number Diff line number Diff line
@@ -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.

net/rfkill/input.c

+8 −0
Original line number Diff line number Diff line
@@ -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);
@@ -294,6 +297,11 @@ static const struct input_device_id rfkill_ids[] = { 
		.evbit = { BIT_MASK(EV_KEY) },

		.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) },