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

Commit 477576a0 authored by Henrique de Moraes Holschuh's avatar Henrique de Moraes Holschuh Committed by John W. Linville
Browse files

rfkill: add the WWAN radio type 



Unfortunately, instead of adding a generic Wireless WAN type, a technology-
specific type (WiMAX) was added.  That's useless for other WWAN devices,
such as EDGE, UMTS, X-RTT and other such radios.

Add a WWAN rfkill type for generic wireless WAN devices.  No keys are added
as most devices really want to use KEY_WLAN for WWAN control (in a cycle of
none, WLAN, WWAN, WLAN+WWAN) and need no specific keycode added.

Signed-off-by: default avatarHenrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Cc: Iñaky Pérez-González <inaky.perez-gonzalez@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 801e49af

include/linux/rfkill.h

+2 −0
Original line number Diff line number Diff line
@@ -34,12 +34,14 @@ 
 * RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.

 * RFKILL_TYPE_UWB: switch is on a ultra wideband device.

 * RFKILL_TYPE_WIMAX: switch is on a WiMAX device.

 * RFKILL_TYPE_WWAN: switch is on a wireless WAN device.

 */

enum rfkill_type {

	RFKILL_TYPE_WLAN ,

	RFKILL_TYPE_BLUETOOTH,

	RFKILL_TYPE_UWB,

	RFKILL_TYPE_WIMAX,

	RFKILL_TYPE_WWAN,

	RFKILL_TYPE_MAX,

};

net/rfkill/rfkill-input.c

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ static DEFINE_RFKILL_TASK(rfkill_wlan, RFKILL_TYPE_WLAN); 
static DEFINE_RFKILL_TASK(rfkill_bt, RFKILL_TYPE_BLUETOOTH);

static DEFINE_RFKILL_TASK(rfkill_uwb, RFKILL_TYPE_UWB);

static DEFINE_RFKILL_TASK(rfkill_wimax, RFKILL_TYPE_WIMAX);

static DEFINE_RFKILL_TASK(rfkill_wwan, RFKILL_TYPE_WWAN);



static void rfkill_event(struct input_handle *handle, unsigned int type,

			unsigned int code, int data)
@@ -126,6 +127,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type, 
		switch (code) {

		case SW_RFKILL_ALL:

			/* EVERY radio type. data != 0 means radios ON */

			rfkill_schedule_set(&rfkill_wwan,

					    (data)? RFKILL_STATE_ON:

						    RFKILL_STATE_OFF);

			rfkill_schedule_set(&rfkill_wimax,

					    (data)? RFKILL_STATE_ON:

						    RFKILL_STATE_OFF);

net/rfkill/rfkill.c

+3 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ static ssize_t rfkill_type_show(struct device *dev, 
	case RFKILL_TYPE_WIMAX:

		type = "wimax";

		break;

	case RFKILL_TYPE_WWAN:

		type = "wwan";

		break;

	default:

		BUG();

	}