From 125cfc634403f7715e9fcd0780995d395ab266c5 Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Sat, 19 Jul 2014 12:30:14 +0100 Subject: [PATCH] staging: vt6656: struct vnt_private rename uCurrRSSI to current_rssi Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/device.h | 2 +- drivers/staging/vt6656/dpc.c | 2 +- drivers/staging/vt6656/rf.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 7697a73bcc56..7c8110586da2 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -314,7 +314,7 @@ struct vnt_private { u64 current_tsf; /* 802.11 MAC specific */ - u32 uCurrRSSI; + u32 current_rssi; /* Antenna Diversity */ int bTxRxAntInv; diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 5d4c2c1e6716..f8410ce152d6 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -153,7 +153,7 @@ int vnt_rx_data(struct vnt_private *priv, struct vnt_rcb *ptr_rcb, vnt_rf_rssi_to_dbm(priv, *rssi, &rx_dbm); priv->byBBPreEDRSSI = (u8)rx_dbm + 1; - priv->uCurrRSSI = priv->byBBPreEDRSSI; + priv->current_rssi = priv->byBBPreEDRSSI; frame = skb_data + 8; diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index c98cf60daa2f..3815db92c0ce 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -660,7 +660,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel) static u8 vnt_rf_addpower(struct vnt_private *priv) { - s32 rssi = -priv->uCurrRSSI; + s32 rssi = -priv->current_rssi; if (!rssi) return 7; -- 2.11.0