diff options
Diffstat (limited to 'net/wimax')
-rw-r--r-- | net/wimax/op-rfkill.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c index 2b75aee04217..870032faece2 100644 --- a/net/wimax/op-rfkill.c +++ b/net/wimax/op-rfkill.c | |||
@@ -113,7 +113,7 @@ void wimax_report_rfkill_hw(struct wimax_dev *wimax_dev, | |||
113 | if (state != wimax_dev->rf_hw) { | 113 | if (state != wimax_dev->rf_hw) { |
114 | wimax_dev->rf_hw = state; | 114 | wimax_dev->rf_hw = state; |
115 | rfkill_state = state == WIMAX_RF_ON ? | 115 | rfkill_state = state == WIMAX_RF_ON ? |
116 | RFKILL_STATE_OFF : RFKILL_STATE_ON; | 116 | RFKILL_STATE_UNBLOCKED : RFKILL_STATE_SOFT_BLOCKED; |
117 | if (wimax_dev->rf_hw == WIMAX_RF_ON | 117 | if (wimax_dev->rf_hw == WIMAX_RF_ON |
118 | && wimax_dev->rf_sw == WIMAX_RF_ON) | 118 | && wimax_dev->rf_sw == WIMAX_RF_ON) |
119 | wimax_state = WIMAX_ST_READY; | 119 | wimax_state = WIMAX_ST_READY; |
@@ -259,10 +259,10 @@ int wimax_rfkill_toggle_radio(void *data, enum rfkill_state state) | |||
259 | 259 | ||
260 | d_fnstart(3, dev, "(wimax_dev %p state %u)\n", wimax_dev, state); | 260 | d_fnstart(3, dev, "(wimax_dev %p state %u)\n", wimax_dev, state); |
261 | switch (state) { | 261 | switch (state) { |
262 | case RFKILL_STATE_ON: | 262 | case RFKILL_STATE_SOFT_BLOCKED: |
263 | rf_state = WIMAX_RF_OFF; | 263 | rf_state = WIMAX_RF_OFF; |
264 | break; | 264 | break; |
265 | case RFKILL_STATE_OFF: | 265 | case RFKILL_STATE_UNBLOCKED: |
266 | rf_state = WIMAX_RF_ON; | 266 | rf_state = WIMAX_RF_ON; |
267 | break; | 267 | break; |
268 | default: | 268 | default: |
@@ -361,7 +361,7 @@ int wimax_rfkill_add(struct wimax_dev *wimax_dev) | |||
361 | wimax_dev->rfkill = rfkill; | 361 | wimax_dev->rfkill = rfkill; |
362 | 362 | ||
363 | rfkill->name = wimax_dev->name; | 363 | rfkill->name = wimax_dev->name; |
364 | rfkill->state = RFKILL_STATE_OFF; | 364 | rfkill->state = RFKILL_STATE_UNBLOCKED; |
365 | rfkill->data = wimax_dev; | 365 | rfkill->data = wimax_dev; |
366 | rfkill->toggle_radio = wimax_rfkill_toggle_radio; | 366 | rfkill->toggle_radio = wimax_rfkill_toggle_radio; |
367 | rfkill->user_claim_unsupported = 1; | 367 | rfkill->user_claim_unsupported = 1; |