Commit 2b1351a3 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: Simplify loop when setting up channels



Simplify confusing code and get rid of an unnecessary variable.
Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d7e86c32
...@@ -267,7 +267,7 @@ ath5k_setup_channels(struct ath5k_hw *ah, ...@@ -267,7 +267,7 @@ ath5k_setup_channels(struct ath5k_hw *ah,
unsigned int mode, unsigned int mode,
unsigned int max) unsigned int max)
{ {
unsigned int i, count, size, chfreq, freq, ch; unsigned int count, size, chfreq, freq, ch;
enum ieee80211_band band; enum ieee80211_band band;
if (!test_bit(mode, ah->ah_modes)) if (!test_bit(mode, ah->ah_modes))
...@@ -291,8 +291,8 @@ ath5k_setup_channels(struct ath5k_hw *ah, ...@@ -291,8 +291,8 @@ ath5k_setup_channels(struct ath5k_hw *ah,
return 0; return 0;
} }
for (i = 0, count = 0; i < size && max > 0; i++) { count = 0;
ch = i + 1 ; for (ch = 1; ch <= size && count < max; ch++) {
freq = ieee80211_channel_to_frequency(ch, band); freq = ieee80211_channel_to_frequency(ch, band);
if (freq == 0) /* mapping failed - not a standard channel */ if (freq == 0) /* mapping failed - not a standard channel */
...@@ -319,7 +319,6 @@ ath5k_setup_channels(struct ath5k_hw *ah, ...@@ -319,7 +319,6 @@ ath5k_setup_channels(struct ath5k_hw *ah,
} }
count++; count++;
max--;
} }
return count; return count;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment