Commit 146c3b0c authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800: pass channel pointer to rt2800_config_txpower



Preparation for use regulatory max channel power in TX power delta
calculations.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d9bceaeb
...@@ -2566,13 +2566,14 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b, ...@@ -2566,13 +2566,14 @@ static u8 rt2800_compensate_txpower(struct rt2x00_dev *rt2x00dev, int is_rate_b,
} }
static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev, static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
enum ieee80211_band band, struct ieee80211_channel *chan,
int power_level) int power_level)
{ {
u8 txpower, r1; u8 txpower, r1;
u16 eeprom; u16 eeprom;
u32 reg, offset; u32 reg, offset;
int i, is_rate_b, delta, power_ctrl; int i, is_rate_b, delta, power_ctrl;
enum ieee80211_band band = chan->band;
/* /*
* Calculate HT40 compensation delta * Calculate HT40 compensation delta
...@@ -2720,7 +2721,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev, ...@@ -2720,7 +2721,7 @@ static void rt2800_config_txpower(struct rt2x00_dev *rt2x00dev,
void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev) void rt2800_gain_calibration(struct rt2x00_dev *rt2x00dev)
{ {
rt2800_config_txpower(rt2x00dev, rt2x00dev->curr_band, rt2800_config_txpower(rt2x00dev, rt2x00dev->hw->conf.channel,
rt2x00dev->tx_power); rt2x00dev->tx_power);
} }
EXPORT_SYMBOL_GPL(rt2800_gain_calibration); EXPORT_SYMBOL_GPL(rt2800_gain_calibration);
...@@ -2855,11 +2856,11 @@ void rt2800_config(struct rt2x00_dev *rt2x00dev, ...@@ -2855,11 +2856,11 @@ void rt2800_config(struct rt2x00_dev *rt2x00dev,
if (flags & IEEE80211_CONF_CHANGE_CHANNEL) { if (flags & IEEE80211_CONF_CHANGE_CHANNEL) {
rt2800_config_channel(rt2x00dev, libconf->conf, rt2800_config_channel(rt2x00dev, libconf->conf,
&libconf->rf, &libconf->channel); &libconf->rf, &libconf->channel);
rt2800_config_txpower(rt2x00dev, libconf->conf->channel->band, rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
libconf->conf->power_level); libconf->conf->power_level);
} }
if (flags & IEEE80211_CONF_CHANGE_POWER) if (flags & IEEE80211_CONF_CHANGE_POWER)
rt2800_config_txpower(rt2x00dev, libconf->conf->channel->band, rt2800_config_txpower(rt2x00dev, libconf->conf->channel,
libconf->conf->power_level); libconf->conf->power_level);
if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS) if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS)
rt2800_config_retry_limit(rt2x00dev, libconf); rt2800_config_retry_limit(rt2x00dev, libconf);
......
Supports Markdown
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