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: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Acked-by: Ivo 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: John W. Linville <linville@tuxdriver.com>

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 844e961148610ec6bf8ba112ba9fc2152ecfa75a..c0cab7d37828b6e0a28a6b06de4452ee2b73c855 100644 (file)
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -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,
 };
 

diff --git a/net/rfkill/rfkill-input.c b/net/rfkill/rfkill-input.c
index 9d6c9255bf2cfe9ebd8dfc125a37091d4bb4cda0..29c13d308b3104a18bf5bcf28dc556c62b99fe62 100644 (file)
--- a/net/rfkill/rfkill-input.c
+++ b/net/rfkill/rfkill-input.c
@@ -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);

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index 4ae4486c77eaef79cb532b222d72d4b2686a6aac..79f3bbb027ffc4cab50a6cdfe7d4a00c66bdb81d 100644 (file)
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -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();
        }