2008-06-28 12:20:41

by drago01

Subject: [PATCH] b43/b43legacy: use RFKILL_STATE_UNBLOCKED instead of RFKILL_STATE_ON

This patch removes the usage RFKILL_STATE_ON and uses
RFKILL_STATE_UNBLOCKED instead.

Signed-off-by: Adel Gadllah <[email protected]>

diff --git a/drivers/net/wireless/b43/rfkill.c
b/drivers/net/wireless/b43/rfkill.c
index 4cca203..34ae125 100644
--- a/drivers/net/wireless/b43/rfkill.c
+++ b/drivers/net/wireless/b43/rfkill.c
@@ -135,7 +135,7 @@ void b43_rfkill_init(struct b43_wldev *dev)
snprintf(rfk->name, sizeof(rfk->name),
"b43-%s", wiphy_name(wl->hw->wiphy));
rfk->rfkill->name = rfk->name;
- rfk->rfkill->state = RFKILL_STATE_ON;
+ rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
rfk->rfkill->data = dev;
rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
rfk->rfkill->user_claim_unsupported = 1;
diff --git a/drivers/net/wireless/b43legacy/rfkill.c
b/drivers/net/wireless/b43legacy/rfkill.c
index 8935a30..b32bf6a 100644
--- a/drivers/net/wireless/b43legacy/rfkill.c
+++ b/drivers/net/wireless/b43legacy/rfkill.c
@@ -139,7 +139,7 @@ void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
snprintf(rfk->name, sizeof(rfk->name),
"b43legacy-%s", wiphy_name(wl->hw->wiphy));
rfk->rfkill->name = rfk->name;
- rfk->rfkill->state = RFKILL_STATE_ON;
+ rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
rfk->rfkill->data = dev;
rfk->rfkill->toggle_radio = b43legacy_rfkill_soft_toggle;
rfk->rfkill->user_claim_unsupported = 1;

2008-06-28 17:10:36

by Michael Büsch

Subject: Re: [PATCH] b43/b43legacy: use RFKILL_STATE_UNBLOCKED instead of RFKILL_STATE_ON

On Saturday 28 June 2008 14:20:40 drago01 wrote:
> This patch removes the usage RFKILL_STATE_ON and uses
> RFKILL_STATE_UNBLOCKED instead.
>
> Signed-off-by: Adel Gadllah <[email protected]>

ACK. john, please apply this one.

> diff --git a/drivers/net/wireless/b43/rfkill.c
> b/drivers/net/wireless/b43/rfkill.c
> index 4cca203..34ae125 100644
> --- a/drivers/net/wireless/b43/rfkill.c
> +++ b/drivers/net/wireless/b43/rfkill.c
> @@ -135,7 +135,7 @@ void b43_rfkill_init(struct b43_wldev *dev)
> snprintf(rfk->name, sizeof(rfk->name),
> "b43-%s", wiphy_name(wl->hw->wiphy));
> rfk->rfkill->name = rfk->name;
> - rfk->rfkill->state = RFKILL_STATE_ON;
> + rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
> rfk->rfkill->data = dev;
> rfk->rfkill->toggle_radio = b43_rfkill_soft_toggle;
> rfk->rfkill->user_claim_unsupported = 1;
> diff --git a/drivers/net/wireless/b43legacy/rfkill.c
> b/drivers/net/wireless/b43legacy/rfkill.c
> index 8935a30..b32bf6a 100644
> --- a/drivers/net/wireless/b43legacy/rfkill.c
> +++ b/drivers/net/wireless/b43legacy/rfkill.c
> @@ -139,7 +139,7 @@ void b43legacy_rfkill_init(struct b43legacy_wldev *dev)
> snprintf(rfk->name, sizeof(rfk->name),
> "b43legacy-%s", wiphy_name(wl->hw->wiphy));
> rfk->rfkill->name = rfk->name;
> - rfk->rfkill->state = RFKILL_STATE_ON;
> + rfk->rfkill->state = RFKILL_STATE_UNBLOCKED;
> rfk->rfkill->data = dev;
> rfk->rfkill->toggle_radio = b43legacy_rfkill_soft_toggle;
> rfk->rfkill->user_claim_unsupported = 1;
>
>



--
Greetings Michael.