From cab296b27b9df32d7645325762973a39e5ce50c8 Mon Sep 17 00:00:00 2001
From: laforge <laforge>
Date: Sun, 27 Apr 2003 07:43:37 +0000
Subject: real fix for skb receive timestamp problem (Harald Welte), revert
 PCAP workaround

---
 pcap/ulogd_PCAP.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'pcap')

diff --git a/pcap/ulogd_PCAP.c b/pcap/ulogd_PCAP.c
index 178d294..9c554cc 100644
--- a/pcap/ulogd_PCAP.c
+++ b/pcap/ulogd_PCAP.c
@@ -1,4 +1,4 @@
-/* ulogd_PCAP.c, Version $Revision: 1.2 $
+/* ulogd_PCAP.c, Version $Revision: 1.3 $
  *
  * ulogd output target for writing pcap-style files (like tcpdump)
  *
@@ -20,7 +20,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * $Id: ulogd_PCAP.c,v 1.2 2002/12/09 14:42:44 laforge Exp $
+ * $Id: ulogd_PCAP.c,v 1.3 2003/04/27 07:39:07 laforge Exp $
  *
  */
 
@@ -88,8 +88,7 @@ int _output_pcap(ulog_iret_t *res)
 	pchdr.len = GET_VALUE(2).ui32;
 
 	if (GET_FLAGS(3) & ULOGD_RETF_VALID
-	    && GET_FLAGS(4) & ULOGD_RETF_VALID
-	    && GET_VALUE(3).ui32 != 0) {
+	    && GET_FLAGS(4) & ULOGD_RETF_VALID) {
 		pchdr.ts.tv_sec = GET_VALUE(3).ui32;
 		pchdr.ts.tv_usec = GET_VALUE(4).ui32;
 	} else {
-- 
cgit v1.2.3