summaryrefslogtreecommitdiffstats
path: root/drivers/staging/rtl8192e/rtl_core.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-08-01 15:31:00 -0500
committerLarry Finger <Larry.Finger@lwfinger.net>2011-08-25 00:40:31 -0500
commite829d65e7855fb4c98a81dd8c210c5b6d738bde1 (patch)
tree8fcacaefb17ae93c79d70538e976ad24a1ebd3ae /drivers/staging/rtl8192e/rtl_core.c
parent1800925f87040ce26ad0eb178b198bcbf3964f6e (diff)
downloadop-kernel-dev-e829d65e7855fb4c98a81dd8c210c5b6d738bde1.zip
op-kernel-dev-e829d65e7855fb4c98a81dd8c210c5b6d738bde1.tar.gz
staging: rtl8192e: Modify time handling
In several places, the driver keeps times (in jiffies) in two 32-bit quantities. In the rtl8192_hw_to_sleep(), there is an error in the calculation of the difference between two 64-bit quantities. Rather than fix that error, I have converted to a single 64-bit number. That makes the code be much cleaner and clearer. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl_core.c')
-rw-r--r--drivers/staging/rtl8192e/rtl_core.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c
index e633f0b..f585f71 100644
--- a/drivers/staging/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl_core.c
@@ -2243,13 +2243,10 @@ void rtl819x_UpdateRxPktTimeStamp (struct net_device *dev, struct rtllib_rx_stat
{
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
- if (stats->bIsAMPDU && !stats->bFirstMPDU) {
- stats->mac_time[0] = priv->LastRxDescTSFLow;
- stats->mac_time[1] = priv->LastRxDescTSFHigh;
- } else {
- priv->LastRxDescTSFLow = stats->mac_time[0];
- priv->LastRxDescTSFHigh = stats->mac_time[1];
- }
+ if (stats->bIsAMPDU && !stats->bFirstMPDU)
+ stats->mac_time = priv->LastRxDescTSF;
+ else
+ priv->LastRxDescTSF = stats->mac_time;
}
long rtl819x_translate_todbm(struct r8192_priv * priv, u8 signal_strength_index )
OpenPOWER on IntegriCloud