diff options
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 212d2a287b2c..897d70cf32b8 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -369,11 +369,11 @@ static void device_init_registers(struct vnt_private *priv) /* Set Short Slot Time, xIFS, and RSPINF. */ priv->wCurrentRate = RATE_54M; - priv->bRadioOff = false; + priv->radio_off = false; priv->byRadioCtl = SROMbyReadEmbedded(priv->port_offset, EEP_OFS_RADIOCTL); - priv->bHWRadioOff = false; + priv->hw_radio_off = false; if (priv->byRadioCtl & EEP_RADIOCTL_ENABLE) { /* Get GPIO */ @@ -383,10 +383,10 @@ static void device_init_registers(struct vnt_private *priv) !(priv->byRadioCtl & EEP_RADIOCTL_INV)) || (!(priv->byGPIO & GPIO0_DATA) && (priv->byRadioCtl & EEP_RADIOCTL_INV))) - priv->bHWRadioOff = true; + priv->hw_radio_off = true; } - if (priv->bHWRadioOff || priv->bRadioControlOff) + if (priv->hw_radio_off || priv->bRadioControlOff) CARDbRadioPowerOff(priv); /* get Permanent network address */ @@ -980,10 +980,10 @@ static void vnt_check_bb_vga(struct vnt_private *priv) if (priv->hw->conf.flags & IEEE80211_CONF_OFFCHANNEL) return; - if (!(priv->vif->bss_conf.assoc && priv->uCurrRSSI)) + if (!(priv->vif->bss_conf.assoc && priv->current_rssi)) return; - RFvRSSITodBm(priv, (u8)priv->uCurrRSSI, &dbm); + RFvRSSITodBm(priv, (u8)priv->current_rssi, &dbm); for (i = 0; i < BB_VGA_LEVEL; i++) { if (dbm < priv->dbm_threshold[i]) { |