diff options
author | Christian Lamparter <chunkeey@googlemail.com> | 2011-02-12 16:14:38 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-02-14 15:51:21 -0500 |
commit | a3162eed04ae76be710d895978478aa6d849de41 (patch) | |
tree | 29f1731edc5b181c59bb77c9e2b8cc796c0763f7 /drivers/net/wireless/p54 | |
parent | 192abece7565ab37048dfd5eced966cfb2fda6f5 (diff) |
p54: p54_generate_band cleanup
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r-- | drivers/net/wireless/p54/eeprom.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c index ec7d4b86bf06..360bc7810f93 100644 --- a/drivers/net/wireless/p54/eeprom.c +++ b/drivers/net/wireless/p54/eeprom.c | |||
@@ -145,25 +145,26 @@ static int p54_generate_band(struct ieee80211_hw *dev, | |||
145 | 145 | ||
146 | for (i = 0, j = 0; (j < list->band_channel_num[band]) && | 146 | for (i = 0, j = 0; (j < list->band_channel_num[band]) && |
147 | (i < list->entries); i++) { | 147 | (i < list->entries); i++) { |
148 | struct p54_channel_entry *chan = &list->channels[i]; | ||
148 | 149 | ||
149 | if (list->channels[i].band != band) | 150 | if (chan->band != band) |
150 | continue; | 151 | continue; |
151 | 152 | ||
152 | if (list->channels[i].data != CHAN_HAS_ALL) { | 153 | if (chan->data != CHAN_HAS_ALL) { |
153 | wiphy_err(dev->wiphy, | 154 | wiphy_err(dev->wiphy, "%s%s%s is/are missing for " |
154 | "%s%s%s is/are missing for channel:%d [%d MHz].\n", | 155 | "channel:%d [%d MHz].\n", |
155 | (list->channels[i].data & CHAN_HAS_CAL ? "" : | 156 | (chan->data & CHAN_HAS_CAL ? "" : |
156 | " [iqauto calibration data]"), | 157 | " [iqauto calibration data]"), |
157 | (list->channels[i].data & CHAN_HAS_LIMIT ? "" : | 158 | (chan->data & CHAN_HAS_LIMIT ? "" : |
158 | " [output power limits]"), | 159 | " [output power limits]"), |
159 | (list->channels[i].data & CHAN_HAS_CURVE ? "" : | 160 | (chan->data & CHAN_HAS_CURVE ? "" : |
160 | " [curve data]"), | 161 | " [curve data]"), |
161 | list->channels[i].index, list->channels[i].freq); | 162 | chan->index, chan->freq); |
162 | continue; | 163 | continue; |
163 | } | 164 | } |
164 | 165 | ||
165 | tmp->channels[j].band = list->channels[i].band; | 166 | tmp->channels[j].band = chan->band; |
166 | tmp->channels[j].center_freq = list->channels[i].freq; | 167 | tmp->channels[j].center_freq = chan->freq; |
167 | j++; | 168 | j++; |
168 | } | 169 | } |
169 | 170 | ||