Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219678
b: refs/heads/master
c: 2a8a4b7
h: refs/heads/master
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Aug 31, 2010
1 parent 178776c commit 3f70eec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f22f99e101c078101db200f329c1ebdcf59e0da9
refs/heads/master: 2a8a4b75307c2ce9f893183b895b0b279621b67e
16 changes: 8 additions & 8 deletions trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -527,16 +527,16 @@ void ieee80211_softmac_scan_wq(struct work_struct *work)
do{
ieee->current_network.channel =
(ieee->current_network.channel + 1) % MAX_CHANNEL_NUMBER;
if (watchdog++ > MAX_CHANNEL_NUMBER)
{
//if current channel is not in channel map, set to default channel.
#ifdef ENABLE_DOT11D
if (!channel_map[ieee->current_network.channel]);
#else
if (!ieee->channel_map[ieee->current_network.channel]);
#endif
if (watchdog++ > MAX_CHANNEL_NUMBER) {
/* if current channel is not in channel map, set to default channel. */
#ifdef ENABLE_DOT11D
if (!channel_map[ieee->current_network.channel]) {
#else
if (!ieee->channel_map[ieee->current_network.channel]) {
#endif
ieee->current_network.channel = 6;
goto out; /* no good chans */
}
}
#ifdef ENABLE_DOT11D
}while(!channel_map[ieee->current_network.channel]);
Expand Down

0 comments on commit 3f70eec

Please sign in to comment.