diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index 9e5f060f3784e96dafe76683cb3876e77683f5e3..c51eba94230d6b1cc6005d023301bbd0f5e934ff 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -165,7 +165,7 @@ struct vnt_private { unsigned char abyCurrentNetAddr[ETH_ALEN]; __aligned(2) bool bLinkPass; /* link status: OK or fail */ - unsigned int uCurrRSSI; + unsigned int current_rssi; unsigned char byCurrSQ; unsigned long dwTxAntennaSel; diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 6c5140e29f6bfbf5b8c037fc328b64fd7966d87b..897d70cf32b80aaa4e9f556710d36bc3b3ec76b9 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -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]) { diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index a7d1d35de5d46f23c6a0efcff43fd73cb607be5f..c6ed3537f4392edcef500b05d6c8b1936ec3df14 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -80,7 +80,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struct sk_buff *skb, RFvRSSITodBm(priv, *rssi, &rx_dbm); priv->byBBPreEDRSSI = (u8)rx_dbm + 1; - priv->uCurrRSSI = *rssi; + priv->current_rssi = *rssi; skb_pull(skb, 4); skb_trim(skb, frame_size);