Changeset deed208


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/format_erf.c

    rcd7eec7 rdeed208  
    5858#       define PATH_MAX 4096
    5959#  endif
     60#  include <sys/ioctl.h>
    6061#endif
    6162
     
    546547        packet->payload = packet->buffer;
    547548       
    548         if ((ioctl(INPUT.fd, DAGIOCINFO, &lt_dag_inf) < 0)) {
    549                 trace_set_err(libtrace, errno,
    550                                 "Error using DAGIOCINFO");
    551                 return -1;
    552         }
    553         if (!IsDUCK(&lt_dag_inf)) {
    554                 printf("WARNING: %s does not have modern clock support - No DUCK information will be gathered\n", libtrace->uridata);
    555                 return 0;
    556         }
    557 
     549        /* No need to check if we can get DUCK or not - we're modern
     550         * enough */
    558551        if ((ioctl(INPUT.fd, DAGIOCDUCK, (duckinf_t *)packet->payload)
    559552                                < 0)) {
  • lib/libtrace_int.h

    r431548c5 rdeed208  
    104104#  include "dagnew.h"
    105105#  include "dagapi.h"
     106#       ifndef DAG_VERSION_2_4
     107#               include <daginf.h>
     108#       endif
    106109#else
    107110#  include "dagformat.h"
Note: See TracChangeset for help on using the changeset viewer.