* [PATCH] mac80211: fix an oops in ieee80211_scan_state_set_channel
@ 2009-07-25 15:25 Helmut Schaa
2009-07-25 16:17 ` Larry Finger
0 siblings, 1 reply; 2+ messages in thread
From: Helmut Schaa @ 2009-07-25 15:25 UTC (permalink / raw)
To: John Linville; +Cc: Johannes Berg, Pavel Roskin, linux-wireless, Larry Finger
Fix an oops in ieee80211_scan_state_set_channel which was triggered
if the last scanned channel was skipped (for example due to regulatory
restrictions) by returning to the decision state after each skipped
channel.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
---
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index b376775..147772a 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -605,8 +605,11 @@ static void ieee80211_scan_state_set_channel(struct ieee80211_local *local,
/* advance state machine to next channel/band */
local->scan_channel_idx++;
- if (skip)
+ if (skip) {
+ /* if we skip this channel return to the decision state */
+ local->next_scan_state = SCAN_DECISION;
return;
+ }
/*
* Probe delay is used to update the NAV, cf. 11.1.3.2.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mac80211: fix an oops in ieee80211_scan_state_set_channel
2009-07-25 15:25 [PATCH] mac80211: fix an oops in ieee80211_scan_state_set_channel Helmut Schaa
@ 2009-07-25 16:17 ` Larry Finger
0 siblings, 0 replies; 2+ messages in thread
From: Larry Finger @ 2009-07-25 16:17 UTC (permalink / raw)
To: Helmut Schaa; +Cc: John Linville, Johannes Berg, Pavel Roskin, linux-wireless
Helmut Schaa wrote:
> Fix an oops in ieee80211_scan_state_set_channel which was triggered
> if the last scanned channel was skipped (for example due to regulatory
> restrictions) by returning to the decision state after each skipped
> channel.
>
> Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
> ---
Better late than never, but this patch does fix the problem for me.
Larry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-25 16:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-25 15:25 [PATCH] mac80211: fix an oops in ieee80211_scan_state_set_channel Helmut Schaa
2009-07-25 16:17 ` Larry Finger
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).