summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-19 12:30:13 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-21 12:11:57 -0700
commit113f0b915b387debd0bf797f1d527da467984eba (patch)
treeb4d10eb5f2d22547a25ac2e36d460554284a2a95 /drivers
parent35cc8f94e6e4841c6dd2e8d8fd8d49ebddd56859 (diff)
downloadlinux-stable-113f0b915b387debd0bf797f1d527da467984eba.tar.gz
linux-stable-113f0b915b387debd0bf797f1d527da467984eba.tar.bz2
linux-stable-113f0b915b387debd0bf797f1d527da467984eba.zip
staging: vt6656: struct vnt_private rename qwCurrTSF to current_tsf
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vt6656/card.c4
-rw-r--r--drivers/staging/vt6656/device.h2
-rw-r--r--drivers/staging/vt6656/int.c2
-rw-r--r--drivers/staging/vt6656/main_usb.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 3b49ee99c8ea..8820871821b4 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -583,7 +583,7 @@ void vnt_adjust_tsf(struct vnt_private *priv, u8 rx_rate,
bool vnt_get_current_tsf(struct vnt_private *priv, u64 *current_tsf)
{
- *current_tsf = priv->qwCurrTSF;
+ *current_tsf = priv->current_tsf;
return true;
}
@@ -604,7 +604,7 @@ bool vnt_clear_current_tsf(struct vnt_private *priv)
vnt_mac_reg_bits_on(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);
- priv->qwCurrTSF = 0;
+ priv->current_tsf = 0;
return true;
}
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 9f1216df6dad..7697a73bcc56 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -311,7 +311,7 @@ struct vnt_private {
u8 exist_sw_net_addr;
- u64 qwCurrTSF;
+ u64 current_tsf;
/* 802.11 MAC specific */
u32 uCurrRSSI;
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 1ea24330b650..9c5fefc6ab72 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -162,7 +162,7 @@ void vnt_int_process_data(struct vnt_private *priv)
}
#endif
}
- priv->qwCurrTSF = le64_to_cpu(int_data->tsf);
+ priv->current_tsf = le64_to_cpu(int_data->tsf);
low_stats->dot11RTSSuccessCount += int_data->rts_success;
low_stats->dot11RTSFailureCount += int_data->rts_fail;
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 9aaa81631f80..c0951bf33e4d 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -924,7 +924,7 @@ static u64 vnt_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
{
struct vnt_private *priv = hw->priv;
- return priv->qwCurrTSF;
+ return priv->current_tsf;
}
static void vnt_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif,