rfkill: remove deprecated state constants

I only did superficial review, but these constants are stupid
to have and without proper warnings nobody will review the
code anyway, no amount of shouting will help.

Also fix wimax to use correct states.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index f84b78d94c40..d696e5fbc176 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2484,7 +2484,7 @@ static int add_net_device(struct hso_device *hso_dev)
 static int hso_radio_toggle(void *data, enum rfkill_state state)
 {
         struct hso_device *hso_dev = data;
-        int enabled = (state == RFKILL_STATE_ON);
+        int enabled = (state == RFKILL_STATE_UNBLOCKED);
         int rv;
 
         mutex_lock(&hso_dev->mutex);
@@ -2522,7 +2522,7 @@ static void hso_create_rfkill(struct hso_device *hso_dev,
         snprintf(rfkn, 20, "hso-%d",
                  interface->altsetting->desc.bInterfaceNumber);
         hso_net->rfkill->name = rfkn;
-        hso_net->rfkill->state = RFKILL_STATE_ON;
+        hso_net->rfkill->state = RFKILL_STATE_UNBLOCKED;
         hso_net->rfkill->data = hso_dev;
         hso_net->rfkill->toggle_radio = hso_radio_toggle;
         if (rfkill_register(hso_net->rfkill) < 0) {