From c63197fb97e05b2c2e01ea72f886b27e1ab8e4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aky=20P=C3=A9rez-Gonz=C3=A1lez?=
 <inaky.perez-gonzalez@intel.com>
Date: Wed, 23 Jan 2008 13:40:27 -0800
Subject: [PATCH] --- yaml --- r: 81827 b: refs/heads/master c:
 303d9bf6bb64ead8e3f1d7e29904a4025502e591 h: refs/heads/master i:   81825:
 963f83584af8add6a258249725b59f0a51bdd08f   81823:
 bcfc5a6bca479473bd07f0d6c817f1f2a1bb72bc v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/input.h     | 2 ++
 trunk/include/linux/rfkill.h    | 2 ++
 trunk/net/rfkill/rfkill-input.c | 9 +++++++++
 trunk/net/rfkill/rfkill.c       | 3 +++
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b28f005e60cb..cdd75cbfc09b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09552ccd8277e6382097e93a40f7311a09449367
+refs/heads/master: 303d9bf6bb64ead8e3f1d7e29904a4025502e591
diff --git a/trunk/include/linux/input.h b/trunk/include/linux/input.h
index 2075d6da2a31..056a17a4f34f 100644
--- a/trunk/include/linux/input.h
+++ b/trunk/include/linux/input.h
@@ -371,6 +371,8 @@ struct input_absinfo {
 #define KEY_BRIGHTNESS_ZERO	244	/* brightness off, use ambient */
 #define KEY_DISPLAY_OFF		245	/* display device to off state */
 
+#define KEY_WIMAX		246
+
 #define BTN_MISC		0x100
 #define BTN_0			0x100
 #define BTN_1			0x101
diff --git a/trunk/include/linux/rfkill.h b/trunk/include/linux/rfkill.h
index 0ce5e0b52dbd..e3ab21d7fc7f 100644
--- a/trunk/include/linux/rfkill.h
+++ b/trunk/include/linux/rfkill.h
@@ -33,11 +33,13 @@
  * 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.
+ * RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
  */
 enum rfkill_type {
 	RFKILL_TYPE_WLAN ,
 	RFKILL_TYPE_BLUETOOTH,
 	RFKILL_TYPE_UWB,
+	RFKILL_TYPE_WIMAX,
 	RFKILL_TYPE_MAX,
 };
 
diff --git a/trunk/net/rfkill/rfkill-input.c b/trunk/net/rfkill/rfkill-input.c
index d1e9d68f8ba0..e4b051dbed61 100644
--- a/trunk/net/rfkill/rfkill-input.c
+++ b/trunk/net/rfkill/rfkill-input.c
@@ -84,6 +84,7 @@ static void rfkill_schedule_toggle(struct rfkill_task *task)
 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 void rfkill_event(struct input_handle *handle, unsigned int type,
 			unsigned int code, int down)
@@ -99,6 +100,9 @@ static void rfkill_event(struct input_handle *handle, unsigned int type,
 		case KEY_UWB:
 			rfkill_schedule_toggle(&rfkill_uwb);
 			break;
+		case KEY_WIMAX:
+			rfkill_schedule_toggle(&rfkill_wimax);
+			break;
 		default:
 			break;
 		}
@@ -159,6 +163,11 @@ static const struct input_device_id rfkill_ids[] = {
 		.evbit = { BIT_MASK(EV_KEY) },
 		.keybit = { [BIT_WORD(KEY_UWB)] = BIT_MASK(KEY_UWB) },
 	},
+	{
+		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
+		.evbit = { BIT_MASK(EV_KEY) },
+		.keybit = { [BIT_WORD(KEY_WIMAX)] = BIT_MASK(KEY_WIMAX) },
+	},
 	{ }
 };
 
diff --git a/trunk/net/rfkill/rfkill.c b/trunk/net/rfkill/rfkill.c
index d06d338812e9..6562f868e82f 100644
--- a/trunk/net/rfkill/rfkill.c
+++ b/trunk/net/rfkill/rfkill.c
@@ -126,6 +126,9 @@ static ssize_t rfkill_type_show(struct device *dev,
 	case RFKILL_TYPE_UWB:
 		type = "ultrawideband";
 		break;
+	case RFKILL_TYPE_WIMAX:
+		type = "wimax";
+		break;
 	default:
 		BUG();
 	}