SOURCES (LINUX_2_6): linux-2.6-nf-time.patch - s/stamp.tv_sec/tsta...
cieciwa
cieciwa at pld-linux.org
Sat Oct 29 00:07:40 CEST 2005
Author: cieciwa Date: Fri Oct 28 22:07:40 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- s/stamp.tv_sec/tstamp.off_sec/g
---- Files affected:
SOURCES:
linux-2.6-nf-time.patch (1.1.2.2 -> 1.1.2.3)
---- Diffs:
================================================================
Index: SOURCES/linux-2.6-nf-time.patch
diff -u SOURCES/linux-2.6-nf-time.patch:1.1.2.2 SOURCES/linux-2.6-nf-time.patch:1.1.2.3
--- SOURCES/linux-2.6-nf-time.patch:1.1.2.2 Fri Oct 28 14:57:11 2005
+++ SOURCES/linux-2.6-nf-time.patch Sat Oct 29 00:07:34 2005
@@ -116,15 +116,15 @@
+ u_int16_t packet_time;
+
+ /* We might not have a timestamp, get one */
-+ if (skb->stamp.tv_sec == 0)
-+ do_gettimeofday((struct timeval *)&skb->stamp);
++ if (skb->tstamp.off_sec == 0) /* mod by SAS for 2.6.14 */
++ do_gettimeofday((struct timeval *)&skb->tstamp);
+
+ /* First we make sure we are in the date start-stop boundaries */
-+ if ((skb->stamp.tv_sec < info->date_start) || (skb->stamp.tv_sec > info->date_stop))
++ if ((skb->tstamp.off_sec < info->date_start) || (skb->tstamp.off_sec > info->date_stop))
+ return 0; /* We are outside the date boundaries */
+
+ /* Transform the timestamp of the packet, in a human readable form */
-+ localtime(&skb->stamp.tv_sec, ¤ttime);
++ localtime(&skb->tstamp.off_sec, ¤ttime);
+
+ /* 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])
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/linux-2.6-nf-time.patch?r1=1.1.2.2&r2=1.1.2.3&f=u
More information about the pld-cvs-commit
mailing list