diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /fs/smbfs | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'fs/smbfs')
| -rw-r--r-- | fs/smbfs/proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c index 5597c2e6d..2334ff729 100644 --- a/fs/smbfs/proc.c +++ b/fs/smbfs/proc.c @@ -179,13 +179,13 @@ extern struct timezone sys_tz; static time_t utc2local(time_t time) { - return time - sys_tz.tz_minuteswest * 60; + return time - sys_tz.tz_minuteswest * 60 - (sys_tz.tz_dsttime ? 3600 :0); } static time_t local2utc(time_t time) { - return time + sys_tz.tz_minuteswest * 60; + return time + sys_tz.tz_minuteswest * 60 + (sys_tz.tz_dsttime ? 3600 : 0); } /* Convert a MS-DOS time/date pair to a UNIX date (seconds since 1 1 70). */ |