diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-25 11:48:12 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-25 10:05:09 -0700 |
| commit | 0dd565069b21ae20f4916cf305b64268bb3f9d3f (patch) | |
| tree | 1d715cabc712363936a110a7a3c4b7db0103e16b /drivers/staging/rtl8192e/rtl_core.c | |
| parent | ac513a88a072b23452ca96a86f18ba8b9c0d85cd (diff) | |
| download | op-kernel-dev-0dd565069b21ae20f4916cf305b64268bb3f9d3f.zip op-kernel-dev-0dd565069b21ae20f4916cf305b64268bb3f9d3f.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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e/rtl_core.c')
| -rw-r--r-- | drivers/staging/rtl8192e/rtl_core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl_core.c index cb1830b9..7d8a15c 100644 --- a/drivers/staging/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl_core.c @@ -2244,13 +2244,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 ) |
