SOURCES (LINUX_2_6): linux-2.6-nf-time.patch - previous fix fixed.

[pluto]

Author: pluto                        Date: Sun Oct 30 13:21:16 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- previous fix fixed.

---- Files affected:
SOURCES:
   linux-2.6-nf-time.patch (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-nf-time.patch
diff -u SOURCES/linux-2.6-nf-time.patch:1.1.2.3 SOURCES/linux-2.6-nf-time.patch:1.1.2.4
--- SOURCES/linux-2.6-nf-time.patch:1.1.2.3	Sat Oct 29 00:07:34 2005
+++ SOURCES/linux-2.6-nf-time.patch	Sun Oct 30 14:21:11 2005
@@ -100,7 +100,7 @@
 +};
 +
 +void
-+localtime(const time_t *timepr, struct tm *r);
++localtime(const struct skb_timeval *stime, struct tm *r);
 +
 +static int
 +match(const struct sk_buff *skb,
@@ -124,7 +124,7 @@
 +		return 0; /* We are outside the date boundaries */
 +
 +	/* Transform the timestamp of the packet, in a human readable form */
-+	localtime(&skb->tstamp.off_sec, &currenttime);
++	localtime(&skb->tstamp, &currenttime);
 +
 +	/* check if we match this timestamp, we start by the days... */
 +	if ((days_of_week[currenttime.tm_wday] & info->days_match) != days_of_week[currenttime.tm_wday])
@@ -199,7 +199,7 @@
 +#define SPD 24*60*60
 +
 +void
-+localtime(const time_t *timepr, struct tm *r) {
++localtime(const struct skb_timeval *stime, struct tm *r) {
 +	time_t i;
 +	time_t timep;
 +	extern struct timezone sys_tz;
@@ -219,7 +219,7 @@
 +		};
 +	register time_t work;
 +
-+	timep = (*timepr) - (sys_tz.tz_minuteswest * 60);
++	timep = (time_t)(stime->off_sec) - (sys_tz.tz_minuteswest * 60);
 +	work=timep%(SPD);
 +	r->tm_sec=work%60; work/=60;
 +	r->tm_min=work%60; r->tm_hour=work/60;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-time.patch?r1=1.1.2.3&r2=1.1.2.4&f=u