* [PATCH v3] ath5k: Simplify loop when setting up channels
@ 2011-01-21 3:19 Bruno Randolf
2011-01-22 12:16 ` me
0 siblings, 1 reply; 2+ messages in thread
From: Bruno Randolf @ 2011-01-21 3:19 UTC (permalink / raw)
To: linville; +Cc: linux-wireless, ath5k-devel, me
Simplify confusing code and get rid of an unnecessary variable.
Signed-off-by: Bruno Randolf <br1@einfach.org>
---
v3: Bob pointed out another wrong check: count <= max.
The loop really was confusing _me_...
---
drivers/net/wireless/ath/ath5k/base.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 6850112..69ec878 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -261,7 +261,7 @@ ath5k_copy_channels(struct ath5k_hw *ah,
unsigned int mode,
unsigned int max)
{
- unsigned int i, count, size, chfreq, freq, ch;
+ unsigned int count, size, chfreq, freq, ch;
enum ieee80211_band band;
if (!test_bit(mode, ah->ah_modes))
@@ -285,8 +285,8 @@ ath5k_copy_channels(struct ath5k_hw *ah,
return 0;
}
- for (i = 0, count = 0; i < size && max > 0; i++) {
- ch = i + 1 ;
+ count = 0;
+ for (ch = 1; ch <= size && count < max; ch++) {
freq = ieee80211_channel_to_frequency(ch, band);
if (freq == 0) /* mapping failed - not a standard channel */
@@ -312,7 +312,6 @@ ath5k_copy_channels(struct ath5k_hw *ah,
}
count++;
- max--;
}
return count;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] ath5k: Simplify loop when setting up channels
2011-01-21 3:19 [PATCH v3] ath5k: Simplify loop when setting up channels Bruno Randolf
@ 2011-01-22 12:16 ` me
0 siblings, 0 replies; 2+ messages in thread
From: me @ 2011-01-22 12:16 UTC (permalink / raw)
To: Bruno Randolf; +Cc: linville, linux-wireless, ath5k-devel
On Fri, Jan 21, 2011 at 12:19:52PM +0900, Bruno Randolf wrote:
> Simplify confusing code and get rid of an unnecessary variable.
>
> Signed-off-by: Bruno Randolf <br1@einfach.org>
Acked-by: Bob Copeland <me@bobcopeland.com>
Thanks!
--
Bob Copeland %% www.bobcopeland.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-22 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-21 3:19 [PATCH v3] ath5k: Simplify loop when setting up channels Bruno Randolf
2011-01-22 12:16 ` me
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).