* [PATCH] rfkill: fix rfkill_set_states() to set the hw state
@ 2009-07-12 16:03 Alan Jenkins
2009-07-13 11:30 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Alan Jenkins @ 2009-07-12 16:03 UTC (permalink / raw)
To: alan-jenkins, johannes; +Cc: linux-wireless
The point of this function is to set the software and hardware state at
the same time. When I tried to use it, I found it was only setting the
software state.
Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
---
net/rfkill/core.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 79693fe..db9948e 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -549,6 +549,10 @@ void rfkill_set_states(struct rfkill *rfkill, bool
sw, bool hw)
swprev = !!(rfkill->state & RFKILL_BLOCK_SW);
hwprev = !!(rfkill->state & RFKILL_BLOCK_HW);
__rfkill_set_sw_state(rfkill, sw);
+ if (hw)
+ rfkill->state |= RFKILL_BLOCK_HW;
+ else
+ rfkill->state &= ~RFKILL_BLOCK_HW;
spin_unlock_irqrestore(&rfkill->lock, flags);
--
1.5.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] rfkill: fix rfkill_set_states() to set the hw state
2009-07-12 16:03 [PATCH] rfkill: fix rfkill_set_states() to set the hw state Alan Jenkins
@ 2009-07-13 11:30 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2009-07-13 11:30 UTC (permalink / raw)
To: Alan Jenkins; +Cc: linux-wireless
[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]
On Sun, 2009-07-12 at 17:03 +0100, Alan Jenkins wrote:
> The point of this function is to set the software and hardware state at
> the same time. When I tried to use it, I found it was only setting the
> software state.
Oops, thanks.
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
This is for 2.6.31, obviously.
> Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
> ---
> net/rfkill/core.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/net/rfkill/core.c b/net/rfkill/core.c
> index 79693fe..db9948e 100644
> --- a/net/rfkill/core.c
> +++ b/net/rfkill/core.c
> @@ -549,6 +549,10 @@ void rfkill_set_states(struct rfkill *rfkill, bool
> sw, bool hw)
> swprev = !!(rfkill->state & RFKILL_BLOCK_SW);
> hwprev = !!(rfkill->state & RFKILL_BLOCK_HW);
> __rfkill_set_sw_state(rfkill, sw);
> + if (hw)
> + rfkill->state |= RFKILL_BLOCK_HW;
> + else
> + rfkill->state &= ~RFKILL_BLOCK_HW;
>
> spin_unlock_irqrestore(&rfkill->lock, flags);
>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-13 11:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-12 16:03 [PATCH] rfkill: fix rfkill_set_states() to set the hw state Alan Jenkins
2009-07-13 11:30 ` Johannes Berg
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).