Commit 8b84c1da authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: struct vnt_private replace wCurrentRate with current_rate

Removing type prefix and camel case.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a97491c
...@@ -349,7 +349,7 @@ struct vnt_private { ...@@ -349,7 +349,7 @@ struct vnt_private {
u8 ofdm_pwr_tbl[14]; u8 ofdm_pwr_tbl[14];
u8 ofdm_a_pwr_tbl[42]; u8 ofdm_a_pwr_tbl[42];
u16 wCurrentRate; u16 current_rate;
u16 tx_rate_fb0; u16 tx_rate_fb0;
u16 tx_rate_fb1; u16 tx_rate_fb1;
......
...@@ -718,11 +718,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed) ...@@ -718,11 +718,11 @@ static int vnt_config(struct ieee80211_hw *hw, u32 changed)
if (changed & IEEE80211_CONF_CHANGE_POWER) { if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->bb_type == BB_TYPE_11B) if (priv->bb_type == BB_TYPE_11B)
priv->wCurrentRate = RATE_1M; priv->current_rate = RATE_1M;
else else
priv->wCurrentRate = RATE_54M; priv->current_rate = RATE_54M;
vnt_rf_setpower(priv, priv->wCurrentRate, vnt_rf_setpower(priv, priv->current_rate,
conf->chandef.chan->hw_value); conf->chandef.chan->hw_value);
} }
...@@ -778,7 +778,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, ...@@ -778,7 +778,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw,
} }
if (changed & BSS_CHANGED_TXPOWER) if (changed & BSS_CHANGED_TXPOWER)
vnt_rf_setpower(priv, priv->wCurrentRate, vnt_rf_setpower(priv, priv->current_rate,
conf->chandef.chan->hw_value); conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) { if (changed & BSS_CHANGED_BEACON_ENABLED) {
......
...@@ -764,9 +764,9 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) ...@@ -764,9 +764,9 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb)
rate = ieee80211_get_tx_rate(priv->hw, info); rate = ieee80211_get_tx_rate(priv->hw, info);
current_rate = rate->hw_value; current_rate = rate->hw_value;
if (priv->wCurrentRate != current_rate && if (priv->current_rate != current_rate &&
!(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) { !(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
priv->wCurrentRate = current_rate; priv->current_rate = current_rate;
vnt_schedule_command(priv, WLAN_CMD_SETPOWER); vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
} }
......
...@@ -139,7 +139,7 @@ void vnt_run_command(struct work_struct *work) ...@@ -139,7 +139,7 @@ void vnt_run_command(struct work_struct *work)
case WLAN_CMD_SETPOWER_START: case WLAN_CMD_SETPOWER_START:
vnt_rf_setpower(priv, priv->wCurrentRate, vnt_rf_setpower(priv, priv->current_rate,
priv->hw->conf.chandef.chan->hw_value); priv->hw->conf.chandef.chan->hw_value);
break; break;
......
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