staging: vt6656: struct vnt_private replace wCurrentRate with current_rate
Removing type prefix and camel case.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 4424d75..9e095eb 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -349,7 +349,7 @@
u8 ofdm_pwr_tbl[14];
u8 ofdm_a_pwr_tbl[42];
- u16 wCurrentRate;
+ u16 current_rate;
u16 tx_rate_fb0;
u16 tx_rate_fb1;
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 8fb602a..5939f9a 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -718,11 +718,11 @@
if (changed & IEEE80211_CONF_CHANGE_POWER) {
if (priv->bb_type == BB_TYPE_11B)
- priv->wCurrentRate = RATE_1M;
+ priv->current_rate = RATE_1M;
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);
}
@@ -778,7 +778,7 @@
}
if (changed & BSS_CHANGED_TXPOWER)
- vnt_rf_setpower(priv, priv->wCurrentRate,
+ vnt_rf_setpower(priv, priv->current_rate,
conf->chandef.chan->hw_value);
if (changed & BSS_CHANGED_BEACON_ENABLED) {
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 68e479a..0e4b773 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -764,9 +764,9 @@
rate = ieee80211_get_tx_rate(priv->hw, info);
current_rate = rate->hw_value;
- if (priv->wCurrentRate != current_rate &&
+ if (priv->current_rate != current_rate &&
!(priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL)) {
- priv->wCurrentRate = current_rate;
+ priv->current_rate = current_rate;
vnt_schedule_command(priv, WLAN_CMD_SETPOWER);
}
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 304f6d6..a63d0fd 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -139,7 +139,7 @@
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);
break;