Changeset deed208

Timestamp:

05/23/06 10:50:17 (15 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

7d78151

Parents:

fc3dcfa

Message:

Some DAG 2.5 driver fixes

Location:

lib

Files:

• format_erf.c (modified) (2 diffs)
• libtrace_int.h (modified) (1 diff)

lib/format_erf.c

@@ -58 +58 @@
 #       define PATH_MAX 4096
 #  endif
+#  include <sys/ioctl.h>
 #endif
 
@@ -546 +547 @@
         packet->payload = packet->buffer;
         
-        if ((ioctl(INPUT.fd, DAGIOCINFO, &lt_dag_inf) < 0)) {
-                trace_set_err(libtrace, errno,
-                                "Error using DAGIOCINFO");
-                return -1;
-        }
-        if (!IsDUCK(&lt_dag_inf)) {
-                printf("WARNING: %s does not have modern clock support - No DUCK information will be gathered\n", libtrace->uridata);
-                return 0;
-        }
-
+        /* No need to check if we can get DUCK or not - we're modern
+         * enough */
         if ((ioctl(INPUT.fd, DAGIOCDUCK, (duckinf_t *)packet->payload) 
                                 < 0)) {

lib/libtrace_int.h

@@ -104 +104 @@
 #  include "dagnew.h"
 #  include "dagapi.h"
+#       ifndef DAG_VERSION_2_4
+#               include <daginf.h>
+#       endif
 #else
 #  include "dagformat.h"