diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00config.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00config.c b/drivers/net/wireless/rt2x00/rt2x00config.c index 49a63e973934..8cb43f8f3efc 100644 --- a/drivers/net/wireless/rt2x00/rt2x00config.c +++ b/drivers/net/wireless/rt2x00/rt2x00config.c | |||
@@ -184,7 +184,7 @@ static u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev, | |||
184 | /* | 184 | /* |
185 | * Initialize center channel to current channel. | 185 | * Initialize center channel to current channel. |
186 | */ | 186 | */ |
187 | center_channel = spec->channels[conf->channel->hw_value].channel; | 187 | center_channel = spec->channels[conf->chandef.chan->hw_value].channel; |
188 | 188 | ||
189 | /* | 189 | /* |
190 | * Adjust center channel to HT40+ and HT40- operation. | 190 | * Adjust center channel to HT40+ and HT40- operation. |
@@ -199,7 +199,7 @@ static u16 rt2x00ht_center_channel(struct rt2x00_dev *rt2x00dev, | |||
199 | return i; | 199 | return i; |
200 | 200 | ||
201 | WARN_ON(1); | 201 | WARN_ON(1); |
202 | return conf->channel->hw_value; | 202 | return conf->chandef.chan->hw_value; |
203 | } | 203 | } |
204 | 204 | ||
205 | void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, | 205 | void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, |
@@ -227,7 +227,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, | |||
227 | hw_value = rt2x00ht_center_channel(rt2x00dev, conf); | 227 | hw_value = rt2x00ht_center_channel(rt2x00dev, conf); |
228 | } else { | 228 | } else { |
229 | clear_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags); | 229 | clear_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags); |
230 | hw_value = conf->channel->hw_value; | 230 | hw_value = conf->chandef.chan->hw_value; |
231 | } | 231 | } |
232 | 232 | ||
233 | memcpy(&libconf.rf, | 233 | memcpy(&libconf.rf, |
@@ -279,8 +279,8 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, | |||
279 | else | 279 | else |
280 | clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags); | 280 | clear_bit(CONFIG_POWERSAVING, &rt2x00dev->flags); |
281 | 281 | ||
282 | rt2x00dev->curr_band = conf->channel->band; | 282 | rt2x00dev->curr_band = conf->chandef.chan->band; |
283 | rt2x00dev->curr_freq = conf->channel->center_freq; | 283 | rt2x00dev->curr_freq = conf->chandef.chan->center_freq; |
284 | rt2x00dev->tx_power = conf->power_level; | 284 | rt2x00dev->tx_power = conf->power_level; |
285 | rt2x00dev->short_retry = conf->short_frame_max_tx_count; | 285 | rt2x00dev->short_retry = conf->short_frame_max_tx_count; |
286 | rt2x00dev->long_retry = conf->long_frame_max_tx_count; | 286 | rt2x00dev->long_retry = conf->long_frame_max_tx_count; |