* [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
@ 2008-06-27 15:12 John W. Linville
2008-06-27 15:34 ` Henrique de Moraes Holschuh
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: John W. Linville @ 2008-06-27 15:12 UTC (permalink / raw)
To: linux-wireless
Cc: Henrique de Moraes Holschuh, Ivo van Doorn, Tomas Winkler, Zhu Yi,
John W. Linville
CC [M] drivers/net/wireless/b43/rfkill.o
drivers/net/wireless/b43/rfkill.c: In function =E2=80=98b43_rfkill_soft=
_toggle=E2=80=99:
drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value =E2=80=
=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
CC [M] drivers/net/wireless/b43legacy/rfkill.o
drivers/net/wireless/b43legacy/rfkill.c: In function =E2=80=98b43legacy=
_rfkill_soft_toggle=E2=80=99:
drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value =
=E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o
drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function =E2=80=98iwl_rfk=
ill_soft_rf_kill=E2=80=99:
drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration valu=
e =E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCK=
ED}
conversion since I'm already here...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
drivers/net/wireless/b43/rfkill.c | 7 +++++--
drivers/net/wireless/b43legacy/rfkill.c | 8 ++++++--
drivers/net/wireless/iwlwifi/iwl-rfkill.c | 7 +++++--
drivers/net/wireless/rt2x00/rt2x00rfkill.c | 7 +++++--
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b=
43/rfkill.c
index 11f53cb..4cca203 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -88,7 +88,7 @@ static int b43_rfkill_soft_toggle(void *data, enum rf=
kill_state state)
goto out_unlock;
err =3D 0;
switch (state) {
- case RFKILL_STATE_ON:
+ case RFKILL_STATE_UNBLOCKED:
if (!dev->radio_hw_enable) {
/* No luck. We can't toggle the hardware RF-kill
* button from software. */
@@ -98,10 +98,13 @@ static int b43_rfkill_soft_toggle(void *data, enum =
rfkill_state state)
if (!dev->phy.radio_on)
b43_radio_turn_on(dev);
break;
- case RFKILL_STATE_OFF:
+ case RFKILL_STATE_SOFT_BLOCKED:
if (dev->phy.radio_on)
b43_radio_turn_off(dev, 0);
break;
+ default:
+ b43warn(wl, "Received unexpected rfkill state %d.\n", state);
+ break;
}
out_unlock:
mutex_unlock(&wl->mutex);
diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wire=
less/b43legacy/rfkill.c
index d178dfb..8935a30 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, e=
num rfkill_state state)
goto out_unlock;
err =3D 0;
switch (state) {
- case RFKILL_STATE_ON:
+ case RFKILL_STATE_UNBLOCKED:
if (!dev->radio_hw_enable) {
/* No luck. We can't toggle the hardware RF-kill
* button from software. */
@@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *dat=
a, enum rfkill_state state)
if (!dev->phy.radio_on)
b43legacy_radio_turn_on(dev);
break;
- case RFKILL_STATE_OFF:
+ case RFKILL_STATE_SOFT_BLOCKED:
if (dev->phy.radio_on)
b43legacy_radio_turn_off(dev, 0);
break;
+ default:
+ b43legacywarn(wl, "Received unexpected rfkill state %d.\n",
+ state);
+ break;
}
=20
out_unlock:
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wi=
reless/iwlwifi/iwl-rfkill.c
index 4624ac7..ffefbb4 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum=
rfkill_state state)
mutex_lock(&priv->mutex);
=20
switch (state) {
- case RFKILL_STATE_ON:
+ case RFKILL_STATE_UNBLOCKED:
iwl_radio_kill_sw_enable_radio(priv);
/* if HW rf-kill is set dont allow ON state */
if (iwl_is_rfkill(priv))
err =3D -EBUSY;
break;
- case RFKILL_STATE_OFF:
+ case RFKILL_STATE_SOFT_BLOCKED:
iwl_radio_kill_sw_disable_radio(priv);
if (!iwl_is_rfkill(priv))
err =3D -EBUSY;
break;
+ default:
+ IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
+ break;
}
mutex_unlock(&priv->mutex);
=20
diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/w=
ireless/rt2x00/rt2x00rfkill.c
index fcef988..207281c 100644
--- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
+++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
@@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, en=
um rfkill_state state)
if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
return 0;
=20
- if (state =3D=3D RFKILL_STATE_ON) {
+ if (state =3D=3D RFKILL_STATE_UNBLOCKED) {
INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
__clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
retval =3D rt2x00lib_enable_radio(rt2x00dev);
- } else if (state =3D=3D RFKILL_STATE_OFF) {
+ } else if (state =3D=3D RFKILL_STATE_SOFT_BLOCKED) {
INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
__set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
rt2x00lib_disable_radio(rt2x00dev);
+ } else {
+ WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n",
+ state);
}
=20
return retval;
--=20
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
2008-06-27 15:12 [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings John W. Linville
@ 2008-06-27 15:34 ` Henrique de Moraes Holschuh
2008-06-27 15:42 ` Michael Buesch
2008-06-27 18:09 ` Ivo van Doorn
2 siblings, 0 replies; 4+ messages in thread
From: Henrique de Moraes Holschuh @ 2008-06-27 15:34 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, Ivo van Doorn, Tomas Winkler, Zhu Yi
On Fri, 27 Jun 2008, John W. Linville wrote:
> CC [M] drivers/net/wireless/b43/rfkill.o
> drivers/net/wireless/b43/rfkill.c: In function ???b43_rfkill_soft_toggle???:
> drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch
>
> CC [M] drivers/net/wireless/b43legacy/rfkill.o
> drivers/net/wireless/b43legacy/rfkill.c: In function ???b43legacy_rfkill_soft_toggle???:
> drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch
>
> CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o
> drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function ???iwl_rfkill_soft_rf_kill???:
> drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration value ???RFKILL_STATE_HARD_BLOCKED??? not handled in switch
>
> Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLOCKED}
> conversion since I'm already here...
>
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
> ---
> drivers/net/wireless/b43/rfkill.c | 7 +++++--
> drivers/net/wireless/b43legacy/rfkill.c | 8 ++++++--
> drivers/net/wireless/iwlwifi/iwl-rfkill.c | 7 +++++--
> drivers/net/wireless/rt2x00/rt2x00rfkill.c | 7 +++++--
> 4 files changed, 21 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless/b43/rfkill.c
> index 11f53cb..4cca203 100644
> --- a/drivers/net/wireless/b43/rfkill.c
> +++ b/drivers/net/wireless/b43/rfkill.c
> @@ -88,7 +88,7 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
> goto out_unlock;
> err = 0;
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> if (!dev->radio_hw_enable) {
> /* No luck. We can't toggle the hardware RF-kill
> * button from software. */
> @@ -98,10 +98,13 @@ static int b43_rfkill_soft_toggle(void *data, enum rfkill_state state)
> if (!dev->phy.radio_on)
> b43_radio_turn_on(dev);
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> if (dev->phy.radio_on)
> b43_radio_turn_off(dev, 0);
> break;
> + default:
> + b43warn(wl, "Received unexpected rfkill state %d.\n", state);
> + break;
> }
> out_unlock:
> mutex_unlock(&wl->mutex);
> diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wireless/b43legacy/rfkill.c
> index d178dfb..8935a30 100644
> --- a/drivers/net/wireless/b43legacy/rfkill.c
> +++ b/drivers/net/wireless/b43legacy/rfkill.c
> @@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
> goto out_unlock;
> err = 0;
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> if (!dev->radio_hw_enable) {
> /* No luck. We can't toggle the hardware RF-kill
> * button from software. */
> @@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *data, enum rfkill_state state)
> if (!dev->phy.radio_on)
> b43legacy_radio_turn_on(dev);
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> if (dev->phy.radio_on)
> b43legacy_radio_turn_off(dev, 0);
> break;
> + default:
> + b43legacywarn(wl, "Received unexpected rfkill state %d.\n",
> + state);
> + break;
> }
>
> out_unlock:
> diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> index 4624ac7..ffefbb4 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> @@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
> mutex_lock(&priv->mutex);
>
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> iwl_radio_kill_sw_enable_radio(priv);
> /* if HW rf-kill is set dont allow ON state */
> if (iwl_is_rfkill(priv))
> err = -EBUSY;
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> iwl_radio_kill_sw_disable_radio(priv);
> if (!iwl_is_rfkill(priv))
> err = -EBUSY;
> break;
> + default:
> + IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
> + break;
> }
> mutex_unlock(&priv->mutex);
>
> diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
> index fcef988..207281c 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
> @@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, enum rfkill_state state)
> if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
> return 0;
>
> - if (state == RFKILL_STATE_ON) {
> + if (state == RFKILL_STATE_UNBLOCKED) {
> INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
> __clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
> retval = rt2x00lib_enable_radio(rt2x00dev);
> - } else if (state == RFKILL_STATE_OFF) {
> + } else if (state == RFKILL_STATE_SOFT_BLOCKED) {
> INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
> __set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
> rt2x00lib_disable_radio(rt2x00dev);
> + } else {
> + WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n",
> + state);
> }
>
> return retval;
--
"One disk to rule them all, One disk to find them. One disk to bring
them all and in the darkness grind them. In the Land of Redmond
where the shadows lie." -- The Silicon Valley Tarot
Henrique Holschuh
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
2008-06-27 15:12 [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings John W. Linville
2008-06-27 15:34 ` Henrique de Moraes Holschuh
@ 2008-06-27 15:42 ` Michael Buesch
2008-06-27 18:09 ` Ivo van Doorn
2 siblings, 0 replies; 4+ messages in thread
From: Michael Buesch @ 2008-06-27 15:42 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless, Henrique de Moraes Holschuh, Ivo van Doorn,
Tomas Winkler, Zhu Yi
On Friday 27 June 2008 17:12:34 John W. Linville wrote:
> CC [M] drivers/net/wireless/b43/rfkill.o
> drivers/net/wireless/b43/rfkill.c: In function =E2=80=98b43_rfkill_so=
ft_toggle=E2=80=99:
> drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value =E2=80=
=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> CC [M] drivers/net/wireless/b43legacy/rfkill.o
> drivers/net/wireless/b43legacy/rfkill.c: In function =E2=80=98b43lega=
cy_rfkill_soft_toggle=E2=80=99:
> drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration valu=
e =E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o
> drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function =E2=80=98iwl_r=
fkill_soft_rf_kill=E2=80=99:
> drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration va=
lue =E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLO=
CKED}
> conversion since I'm already here...
>=20
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
ACK for b43 and b43legacy changes.
> diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/=
wireless/iwlwifi/iwl-rfkill.c
> index 4624ac7..ffefbb4 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> @@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, en=
um rfkill_state state)
> mutex_lock(&priv->mutex);
> =20
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> iwl_radio_kill_sw_enable_radio(priv);
> /* if HW rf-kill is set dont allow ON state */
> if (iwl_is_rfkill(priv))
> err =3D -EBUSY;
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> iwl_radio_kill_sw_disable_radio(priv);
> if (!iwl_is_rfkill(priv))
> err =3D -EBUSY;
> break;
> + default:
> + IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
"recieved" typo.
--=20
Greetings Michael.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings
2008-06-27 15:12 [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings John W. Linville
2008-06-27 15:34 ` Henrique de Moraes Holschuh
2008-06-27 15:42 ` Michael Buesch
@ 2008-06-27 18:09 ` Ivo van Doorn
2 siblings, 0 replies; 4+ messages in thread
From: Ivo van Doorn @ 2008-06-27 18:09 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless, Henrique de Moraes Holschuh, Tomas Winkler,
Zhu Yi
On Friday 27 June 2008, John W. Linville wrote:
> CC [M] drivers/net/wireless/b43/rfkill.o
> drivers/net/wireless/b43/rfkill.c: In function =E2=80=98b43_rfkill_so=
ft_toggle=E2=80=99:
> drivers/net/wireless/b43/rfkill.c:90: warning: enumeration value =E2=80=
=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> CC [M] drivers/net/wireless/b43legacy/rfkill.o
> drivers/net/wireless/b43legacy/rfkill.c: In function =E2=80=98b43lega=
cy_rfkill_soft_toggle=E2=80=99:
> drivers/net/wireless/b43legacy/rfkill.c:92: warning: enumeration valu=
e =E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> CC [M] drivers/net/wireless/iwlwifi/iwl-rfkill.o
> drivers/net/wireless/iwlwifi/iwl-rfkill.c: In function =E2=80=98iwl_r=
fkill_soft_rf_kill=E2=80=99:
> drivers/net/wireless/iwlwifi/iwl-rfkill.c:56: warning: enumeration va=
lue =E2=80=98RFKILL_STATE_HARD_BLOCKED=E2=80=99 not handled in switch
>=20
> Also handle RFKILL_STATE_{ON,OFF} -> RFKILL_STATE_{UNBLOCKED,SOFT_BLO=
CKED}
> conversion since I'm already here...
>=20
> Signed-off-by: John W. Linville <linville@tuxdriver.com>
=46or rt2x00 changes:
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
> ---
> drivers/net/wireless/b43/rfkill.c | 7 +++++--
> drivers/net/wireless/b43legacy/rfkill.c | 8 ++++++--
> drivers/net/wireless/iwlwifi/iwl-rfkill.c | 7 +++++--
> drivers/net/wireless/rt2x00/rt2x00rfkill.c | 7 +++++--
> 4 files changed, 21 insertions(+), 8 deletions(-)
>=20
> diff --git a/drivers/net/wireless/b43/rfkill.c b/drivers/net/wireless=
/b43/rfkill.c
> index 11f53cb..4cca203 100644
> --- a/drivers/net/wireless/b43/rfkill.c
> +++ b/drivers/net/wireless/b43/rfkill.c
> @@ -88,7 +88,7 @@ static int b43_rfkill_soft_toggle(void *data, enum =
rfkill_state state)
> goto out_unlock;
> err =3D 0;
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> if (!dev->radio_hw_enable) {
> /* No luck. We can't toggle the hardware RF-kill
> * button from software. */
> @@ -98,10 +98,13 @@ static int b43_rfkill_soft_toggle(void *data, enu=
m rfkill_state state)
> if (!dev->phy.radio_on)
> b43_radio_turn_on(dev);
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> if (dev->phy.radio_on)
> b43_radio_turn_off(dev, 0);
> break;
> + default:
> + b43warn(wl, "Received unexpected rfkill state %d.\n", state);
> + break;
> }
> out_unlock:
> mutex_unlock(&wl->mutex);
> diff --git a/drivers/net/wireless/b43legacy/rfkill.c b/drivers/net/wi=
reless/b43legacy/rfkill.c
> index d178dfb..8935a30 100644
> --- a/drivers/net/wireless/b43legacy/rfkill.c
> +++ b/drivers/net/wireless/b43legacy/rfkill.c
> @@ -90,7 +90,7 @@ static int b43legacy_rfkill_soft_toggle(void *data,=
enum rfkill_state state)
> goto out_unlock;
> err =3D 0;
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> if (!dev->radio_hw_enable) {
> /* No luck. We can't toggle the hardware RF-kill
> * button from software. */
> @@ -100,10 +100,14 @@ static int b43legacy_rfkill_soft_toggle(void *d=
ata, enum rfkill_state state)
> if (!dev->phy.radio_on)
> b43legacy_radio_turn_on(dev);
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> if (dev->phy.radio_on)
> b43legacy_radio_turn_off(dev, 0);
> break;
> + default:
> + b43legacywarn(wl, "Received unexpected rfkill state %d.\n",
> + state);
> + break;
> }
> =20
> out_unlock:
> diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/=
wireless/iwlwifi/iwl-rfkill.c
> index 4624ac7..ffefbb4 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> +++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
> @@ -54,17 +54,20 @@ static int iwl_rfkill_soft_rf_kill(void *data, en=
um rfkill_state state)
> mutex_lock(&priv->mutex);
> =20
> switch (state) {
> - case RFKILL_STATE_ON:
> + case RFKILL_STATE_UNBLOCKED:
> iwl_radio_kill_sw_enable_radio(priv);
> /* if HW rf-kill is set dont allow ON state */
> if (iwl_is_rfkill(priv))
> err =3D -EBUSY;
> break;
> - case RFKILL_STATE_OFF:
> + case RFKILL_STATE_SOFT_BLOCKED:
> iwl_radio_kill_sw_disable_radio(priv);
> if (!iwl_is_rfkill(priv))
> err =3D -EBUSY;
> break;
> + default:
> + IWL_WARNING("we recieved unexpected RFKILL state %d\n", state);
> + break;
> }
> mutex_unlock(&priv->mutex);
> =20
> diff --git a/drivers/net/wireless/rt2x00/rt2x00rfkill.c b/drivers/net=
/wireless/rt2x00/rt2x00rfkill.c
> index fcef988..207281c 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00rfkill.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00rfkill.c
> @@ -45,14 +45,17 @@ static int rt2x00rfkill_toggle_radio(void *data, =
enum rfkill_state state)
> if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
> return 0;
> =20
> - if (state =3D=3D RFKILL_STATE_ON) {
> + if (state =3D=3D RFKILL_STATE_UNBLOCKED) {
> INFO(rt2x00dev, "Hardware button pressed, enabling radio.\n");
> __clear_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
> retval =3D rt2x00lib_enable_radio(rt2x00dev);
> - } else if (state =3D=3D RFKILL_STATE_OFF) {
> + } else if (state =3D=3D RFKILL_STATE_SOFT_BLOCKED) {
> INFO(rt2x00dev, "Hardware button pressed, disabling radio.\n");
> __set_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags);
> rt2x00lib_disable_radio(rt2x00dev);
> + } else {
> + WARNING(rt2x00dev, "Received unexpected rfkill state %d.\n",
> + state);
> }
> =20
> return retval;
--
To unsubscribe from this list: send the line "unsubscribe linux-wireles=
s" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-06-27 18:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-27 15:12 [PATCH] wireless: remove RFKILL_STATE_HARD_BLOCKED warnings John W. Linville
2008-06-27 15:34 ` Henrique de Moraes Holschuh
2008-06-27 15:42 ` Michael Buesch
2008-06-27 18:09 ` Ivo van Doorn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).